Add VIA support to doodboard/duckboard_r2 (#12028)

* Update R1 keymap and config

* Add duckboard R2

* Add VIA support for duckboard R2

* Set bootmagic lite row and column

* Update config.h

* Update keyboards/doodboard/duckboard/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

6 files changed, 50 insertions, 49 deletions

diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index ea8a8ae5dd..80c9411165 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 doodboard
+/* Copyright 2020-2021 doodboard
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4442
 #define PRODUCT_ID      0xFF44
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    doodboard
diff --git a/keyboards/doodboard/duckboard/duckboard.c b/keyboards/doodboard/duckboard/duckboard.c
index af0cb24beb..853e105ceb 100644
--- a/keyboards/doodboard/duckboard/duckboard.c
+++ b/keyboards/doodboard/duckboard/duckboard.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 doodboard
+/* Copyright 2020-2021 doodboard
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/doodboard/duckboard/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h
index 0e753d445e..c98c9a703a 100644
--- a/keyboards/doodboard/duckboard/duckboard.h
+++ b/keyboards/doodboard/duckboard/duckboard.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 doodboard
+/* Copyright 2020-2021 doodboard
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #pragma once
 
 #include "quantum.h"
diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index d5193e61eb..074f5c88ad 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -1,35 +1,35 @@
 {
     "keyboard_name": "duckboard",
-    "url": "",
+    "url": "https://doodboard.xyz/",
     "maintainer": "doodboard",
     "width": 5,
     "height": 5,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
 
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                { "x": 1, "y": 1 },
+                { "x": 2, "y": 1 },
+                { "x": 3, "y": 1 },
 
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 1, "h": 2},
+                { "x": 1, "y": 2 },
+                { "x": 2, "y": 2 },
+                { "x": 3, "y": 2 },
+                { "x": 4, "y": 1, "h": 2 },
 
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
+                { "x": 1, "y": 3 },
+                { "x": 2, "y": 3 },
+                { "x": 3, "y": 3 },
 
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 3, "h": 2}
+                { "x": 0, "y": 4 },
+                { "x": 1, "y": 4 },
+                { "x": 2, "y": 4 },
+                { "x": 3, "y": 4 },
+                { "x": 4, "y": 3, "h": 2 }
             ]
         }
     }
diff --git a/keyboards/doodboard/duckboard/keymaps/default/keymap.c b/keyboards/doodboard/duckboard/keymaps/default/keymap.c
index 6684e98633..0dd9c40678 100644
--- a/keyboards/doodboard/duckboard/keymaps/default/keymap.c
+++ b/keyboards/doodboard/duckboard/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 doodboard
+/* Copyright 2020-2021 doodboard
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,22 +18,24 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
                  TG(1),   KC_PSLS, KC_PAST, KC_PMNS,
-                 KC_P7,   KC_P8,   KC_P9,
-                 KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-                 KC_P1,   KC_P2,   KC_P3,
-        KC_BSPC, KC_MUTE, KC_P0,   KC_PDOT, KC_PENT),
-	[1] = LAYOUT(
-		         TG(1),   KC_TRNS, KC_TRNS, KC_TRNS,
-		         KC_HOME, KC_UP,   KC_PGUP,
-		         KC_LEFT, KC_TRNS, KC_RGHT, KC_TRNS,
-		         KC_END,  KC_DOWN, KC_PGDN,
-		TG(2),   KC_TRNS, KC_INS,  KC_DEL,  KC_TRNS),
-	[2] = LAYOUT(
-		         KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
-		         RGB_HUI, RGB_SAI, RGB_VAI,
-		         RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
-		         KC_TRNS, KC_TRNS, KC_TRNS,
-		TG(2),   RESET,   KC_TRNS, KC_TRNS, KC_TRNS),
+                 KC_7,    KC_8,    KC_9,
+                 KC_4,    KC_5,    KC_6,    KC_PPLS,
+                 KC_1,    KC_2,    KC_3,
+        KC_BSPC, KC_0,    KC_0,    KC_DOT,  KC_ENT),
+
+    [1] = LAYOUT(
+                 TG(1),   KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_HOME, KC_UP,   KC_PGUP,
+                 KC_LEFT, KC_TRNS, KC_RGHT, KC_TRNS,
+                 KC_END,  KC_DOWN, KC_PGDN,
+        TG(2),   KC_TRNS, KC_INS,  KC_DEL,  KC_TRNS),
+
+    [2] = LAYOUT(
+                 KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
+                 RGB_HUI, RGB_SAI, RGB_VAI,
+                 RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS,
+        TG(2),   RESET,   KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
 void encoder_update_user(uint8_t index, bool clockwise) {
@@ -111,8 +113,8 @@ void oled_task_user(void) {
 
 void keyboard_post_init_user(void) {
   //Customise these values to debug
-  //debug_enable=true;
-  //debug_matrix=true;
+  debug_enable=true;
+  debug_matrix=true;
   //debug_keyboard=true;
   //debug_mouse=true;
 }
diff --git a/keyboards/doodboard/duckboard/readme.md b/keyboards/doodboard/duckboard/readme.md
index d2b799ab61..866a7d4b9e 100644
--- a/keyboards/doodboard/duckboard/readme.md
+++ b/keyboards/doodboard/duckboard/readme.md
@@ -1,10 +1,10 @@
-# duckboard
+# duckboard R1
 
-An 18-key numpad with rotary encoder and OLED support. 
+An 18-key numpad with rotary encoder and OLED support.
 
-* Keyboard Maintainer: [doodboard](https://github.com/doodboard)
-* Hardware Supported: duckboard PCB
-* Hardware Availability: Private Group Buy
+-   Keyboard Maintainer: [doodboard](https://doodboard.xyz/)
+-   Hardware Supported: duckboard PCB
+-   Hardware Availability: Private Group Buy
 
 Make example for this keyboard (after setting up your build environment):