From 6a78eece3c0935143e1831f08a0459334e721dec Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Tue, 15 Sep 2020 15:37:02 +0900
Subject: [PATCH 01/22] Adding duckboard to QMK

Adding duckboard support to QMK
---
 keyboards/duckboard/config.h                 |  45 ++++++++
 keyboards/duckboard/kb.c                     |   1 +
 keyboards/duckboard/kb.h                     |  20 ++++
 keyboards/duckboard/keymaps/default/keymap.c | 107 +++++++++++++++++++
 keyboards/duckboard/rules.mk                 |  31 ++++++
 5 files changed, 204 insertions(+)
 create mode 100644 keyboards/duckboard/config.h
 create mode 100644 keyboards/duckboard/kb.c
 create mode 100644 keyboards/duckboard/kb.h
 create mode 100644 keyboards/duckboard/keymaps/default/keymap.c
 create mode 100644 keyboards/duckboard/rules.mk

diff --git a/keyboards/duckboard/config.h b/keyboards/duckboard/config.h
new file mode 100644
index 000000000000..0650091a405a
--- /dev/null
+++ b/keyboards/duckboard/config.h
@@ -0,0 +1,45 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    doodboard
+#define PRODUCT         duckboard
+#define DESCRIPTION     18 key numpad with rotary encoder and OLED support
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 5
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
+#define UNUSED_PINS
+
+#define ENCODERS_PAD_A { F5 }
+#define ENCODERS_PAD_B { F6 }
+#define ENCODER_RESOLUTION 2
+
+/* media key slowdown for windows */
+#define TAP_CODE_DELAY 20
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D3
+
+#ifdef RGBLIGHT_ENABLE
+#define RGBLED_NUM 8    // Number of LEDs
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCING_DELAY 5
+
+#endif
diff --git a/keyboards/duckboard/kb.c b/keyboards/duckboard/kb.c
new file mode 100644
index 000000000000..e5e00a329624
--- /dev/null
+++ b/keyboards/duckboard/kb.c
@@ -0,0 +1 @@
+#include "kb.h"
diff --git a/keyboards/duckboard/kb.h b/keyboards/duckboard/kb.h
new file mode 100644
index 000000000000..0dd7921aafcf
--- /dev/null
+++ b/keyboards/duckboard/kb.h
@@ -0,0 +1,20 @@
+#ifndef KB_H
+#define KB_H
+
+#include "quantum.h"
+
+#define KEYMAP( \
+	     K01, K02, K03, K04, \
+	     K11, K12, K13,      \
+	     K21, K22, K23, K24, \
+	     K31, K32, K33,      \
+	K40, K41, K42, K43, K44  \
+) { \
+	{ KC_NO, K01,   K02,   K03,   K04 }, \
+	{ KC_NO, K11,   K12,   K13,   KC_NO }, \
+	{ KC_NO, K21,   K22,   K23,   K24 }, \
+	{ KC_NO, K31,   K32,   K33,   KC_NO }, \
+	{ K40,   K41,   K42,   K43,   K44 }  \
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/duckboard/keymaps/default/keymap.c b/keyboards/duckboard/keymaps/default/keymap.c
new file mode 100644
index 000000000000..de67bc02eb2e
--- /dev/null
+++ b/keyboards/duckboard/keymaps/default/keymap.c
@@ -0,0 +1,107 @@
+#include "kb.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	KEYMAP(
+		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),
+
+	KEYMAP(
+		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),
+
+	KEYMAP(
+		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) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+}
+}
+
+
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
+
+
+// WPM-responsive animation stuff here
+#define IDLE_FRAMES 2
+#define IDLE_SPEED 40 // below this wpm value your animation will idle
+
+#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
+// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
+#define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+uint32_t anim_timer = 0;
+uint32_t anim_sleep = 0;
+uint8_t current_idle_frame = 0;
+
+// Credit to u/Pop-X- for the initial code. You can find his commit here https://github.com/qmk/qmk_firmware/pull/9264/files#diff-303f6e3a7a5ee54be0a9a13630842956R196-R333.
+static void render_anim(void) {
+    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
+        {
+        0,  0,192,192,192,192,192,192,192,248,248, 30, 30,254,254,248,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  3,  3,  3,  3,255,255,255,255,255,255,255,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,127,127,255,255,255,255,255,159,159,135,135,129,129,129, 97, 97, 25, 25,  7,  7,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1, 97, 97,127,  1,  1, 97, 97,127,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0
+        },
+        {
+        0,  0,128,128,128,128,128,128,128,240,240, 60, 60,252,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  7,  7,  7,  7,  7,255,255,254,254,255,255,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,255,255, 63, 63, 15, 15,  3,  3,  3,195,195, 51, 51, 15, 15,  3,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  3, 99, 99,127,  3,  3, 99, 99,127,  3,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0
+        }
+    };
+
+    //assumes 1 frame prep stage
+    void animation_phase(void) {
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
+    }
+
+        if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+    }
+
+void oled_task_user(void) {
+        render_anim();
+        oled_set_cursor(0,6);
+        oled_write_P(PSTR("DUCK\nBOARD\n"), false);
+    oled_write_P(PSTR("-----\n"), false);
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("MODE\n"), false);
+    oled_write_P(PSTR("\n"), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("BASE\n"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("FUNC\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("RGB\n"), false);
+            break;
+    }
+}
+#endif
+
+void keyboard_post_init_user(void) {
+  //Customise these values to debug
+  //debug_enable=true;
+  //debug_matrix=true;
+  //debug_keyboard=true;
+  //debug_mouse=true;
+}
diff --git a/keyboards/duckboard/rules.mk b/keyboards/duckboard/rules.mk
new file mode 100644
index 000000000000..92e377ee72d1
--- /dev/null
+++ b/keyboards/duckboard/rules.mk
@@ -0,0 +1,31 @@
+# MCU name
+MCU = atmega32u4
+BOOTLOADER = caterina
+F_CPU = 16000000
+ARCH = AVR8
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+SRC += ssd1306.c
+
+# Boot Section Size in *bytes*
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE ?= no	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE ?= no	# Mouse keys(+4700)
+EXTRAKEY_ENABLE ?= yes	# Audio control and System control(+450)
+CONSOLE_ENABLE ?= yes	# Console for debug(+400)
+COMMAND_ENABLE ?= no    # Commands for debug and configuration
+SLEEP_LED_ENABLE ?= no  # Breathing sleep LED during USB suspend
+NKRO_ENABLE ?= yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE ?= no  # Enable keyboard backlight functionality
+AUDIO_ENABLE ?= no
+RGBLIGHT_ENABLE ?= yes
+
+ENCODER_ENABLE = yes
+OLED_DRIVER_ENABLE = yes

From d01d5093cb4fa5409422c3594377f9936c73b355 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Tue, 15 Sep 2020 15:48:32 +0900
Subject: [PATCH 02/22] added duckboard under doodboard

---
 keyboards/{ => doodboard}/duckboard/config.h                 | 0
 keyboards/{ => doodboard}/duckboard/kb.c                     | 0
 keyboards/{ => doodboard}/duckboard/kb.h                     | 0
 keyboards/{ => doodboard}/duckboard/keymaps/default/keymap.c | 0
 keyboards/{ => doodboard}/duckboard/rules.mk                 | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename keyboards/{ => doodboard}/duckboard/config.h (100%)
 rename keyboards/{ => doodboard}/duckboard/kb.c (100%)
 rename keyboards/{ => doodboard}/duckboard/kb.h (100%)
 rename keyboards/{ => doodboard}/duckboard/keymaps/default/keymap.c (100%)
 rename keyboards/{ => doodboard}/duckboard/rules.mk (100%)

diff --git a/keyboards/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
similarity index 100%
rename from keyboards/duckboard/config.h
rename to keyboards/doodboard/duckboard/config.h
diff --git a/keyboards/duckboard/kb.c b/keyboards/doodboard/duckboard/kb.c
similarity index 100%
rename from keyboards/duckboard/kb.c
rename to keyboards/doodboard/duckboard/kb.c
diff --git a/keyboards/duckboard/kb.h b/keyboards/doodboard/duckboard/kb.h
similarity index 100%
rename from keyboards/duckboard/kb.h
rename to keyboards/doodboard/duckboard/kb.h
diff --git a/keyboards/duckboard/keymaps/default/keymap.c b/keyboards/doodboard/duckboard/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/duckboard/keymaps/default/keymap.c
rename to keyboards/doodboard/duckboard/keymaps/default/keymap.c
diff --git a/keyboards/duckboard/rules.mk b/keyboards/doodboard/duckboard/rules.mk
similarity index 100%
rename from keyboards/duckboard/rules.mk
rename to keyboards/doodboard/duckboard/rules.mk

From 1de48924f798559e1dcd1d8bb717f58f1e197a90 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Tue, 15 Sep 2020 15:52:03 +0900
Subject: [PATCH 03/22] changed debouncing delay to debounce

---
 keyboards/doodboard/duckboard/config.h         | 18 +++++++++++++++++-
 keyboards/doodboard/duckboard/kb.c             | 16 ++++++++++++++++
 keyboards/doodboard/duckboard/kb.h             | 18 +++++++++++++++++-
 .../duckboard/keymaps/default/keymap.c         | 16 ++++++++++++++++
 keyboards/doodboard/duckboard/readme.md        | 17 +++++++++++++++++
 5 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/doodboard/duckboard/readme.md

diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index 0650091a405a..6f56f69f0557 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef CONFIG_H
 #define CONFIG_H
 
@@ -40,6 +56,6 @@
 #endif
 
 /* Set 0 if debouncing isn't needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 
 #endif
diff --git a/keyboards/doodboard/duckboard/kb.c b/keyboards/doodboard/duckboard/kb.c
index e5e00a329624..e5979b76df7f 100644
--- a/keyboards/doodboard/duckboard/kb.c
+++ b/keyboards/doodboard/duckboard/kb.c
@@ -1 +1,17 @@
+/* Copyright 2020 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "kb.h"
diff --git a/keyboards/doodboard/duckboard/kb.h b/keyboards/doodboard/duckboard/kb.h
index 0dd7921aafcf..b39e56f68b62 100644
--- a/keyboards/doodboard/duckboard/kb.h
+++ b/keyboards/doodboard/duckboard/kb.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef KB_H
 #define KB_H
 
@@ -17,4 +33,4 @@
 	{ K40,   K41,   K42,   K43,   K44 }  \
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/doodboard/duckboard/keymaps/default/keymap.c b/keyboards/doodboard/duckboard/keymaps/default/keymap.c
index de67bc02eb2e..8fa88c5f6dc5 100644
--- a/keyboards/doodboard/duckboard/keymaps/default/keymap.c
+++ b/keyboards/doodboard/duckboard/keymaps/default/keymap.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "kb.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/doodboard/duckboard/readme.md b/keyboards/doodboard/duckboard/readme.md
new file mode 100644
index 000000000000..4f9eb17032a0
--- /dev/null
+++ b/keyboards/doodboard/duckboard/readme.md
@@ -0,0 +1,17 @@
+# duckboard
+
+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]
+
+Make example for this keyboard (after setting up your build environment):
+
+    make doodboard/duckboard:default
+
+Flashing example for this keyboard:
+
+    make doodboard/duckboard:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file

From 88434df084b76d11ee2ac68c35a21e74f9aef226 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 09:48:43 +0900
Subject: [PATCH 04/22] Update keyboards/doodboard/duckboard/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/doodboard/duckboard/config.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index 6f56f69f0557..6a8b135308e9 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 

From 61b4018f3aaeec438be4f72587f412753fc9728e Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 09:48:56 +0900
Subject: [PATCH 05/22] Update keyboards/doodboard/duckboard/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/doodboard/duckboard/config.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index 6a8b135308e9..2f9f0d1b4319 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -56,5 +56,3 @@
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
-
-#endif

From c1f7430eb87d82b7773c3a14a911670060c2a53b Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 09:49:03 +0900
Subject: [PATCH 06/22] Update keyboards/doodboard/duckboard/kb.h

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/doodboard/duckboard/kb.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/keyboards/doodboard/duckboard/kb.h b/keyboards/doodboard/duckboard/kb.h
index b39e56f68b62..f1b259d0749b 100644
--- a/keyboards/doodboard/duckboard/kb.h
+++ b/keyboards/doodboard/duckboard/kb.h
@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KB_H
-#define KB_H
+#pragma once
 
 #include "quantum.h"
 

From a4375e99f7d313228af2a6d4dbcffa6667b1b3a6 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 09:49:09 +0900
Subject: [PATCH 07/22] Update
 keyboards/doodboard/duckboard/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../duckboard/keymaps/default/keymap.c        | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/keyboards/doodboard/duckboard/keymaps/default/keymap.c b/keyboards/doodboard/duckboard/keymaps/default/keymap.c
index 8fa88c5f6dc5..4a4d887f946b 100644
--- a/keyboards/doodboard/duckboard/keymaps/default/keymap.c
+++ b/keyboards/doodboard/duckboard/keymaps/default/keymap.c
@@ -14,30 +14,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	KEYMAP(
-		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),
-
-	KEYMAP(
-		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),
-
-	KEYMAP(
-		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),
+    [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),
 
 };
 

From 9eedbe344e8abed20b69de014abc827b83a6ffeb Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 09:49:17 +0900
Subject: [PATCH 08/22] Update keyboards/doodboard/duckboard/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/doodboard/duckboard/rules.mk | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/keyboards/doodboard/duckboard/rules.mk b/keyboards/doodboard/duckboard/rules.mk
index 92e377ee72d1..07b81cdf44dc 100644
--- a/keyboards/doodboard/duckboard/rules.mk
+++ b/keyboards/doodboard/duckboard/rules.mk
@@ -1,17 +1,6 @@
 # MCU name
 MCU = atmega32u4
 BOOTLOADER = caterina
-F_CPU = 16000000
-ARCH = AVR8
-F_USB = $(F_CPU)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-SRC += ssd1306.c
-
-# Boot Section Size in *bytes*
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Build Options
 #   comment out to disable the options.

From 674db257dd278e0fbcc6aba9e5ba2541e7bbbfd6 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 09:49:22 +0900
Subject: [PATCH 09/22] Update keyboards/doodboard/duckboard/kb.h

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/doodboard/duckboard/kb.h | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/keyboards/doodboard/duckboard/kb.h b/keyboards/doodboard/duckboard/kb.h
index f1b259d0749b..b903f68fe17a 100644
--- a/keyboards/doodboard/duckboard/kb.h
+++ b/keyboards/doodboard/duckboard/kb.h
@@ -18,18 +18,16 @@
 
 #include "quantum.h"
 
-#define KEYMAP( \
-	     K01, K02, K03, K04, \
-	     K11, K12, K13,      \
-	     K21, K22, K23, K24, \
-	     K31, K32, K33,      \
-	K40, K41, K42, K43, K44  \
+#define LAYOUT( \
+         K01, K02, K03, K04, \
+         K11, K12, K13,      \
+         K21, K22, K23, K24, \
+         K31, K32, K33,      \
+    K40, K41, K42, K43, K44  \
 ) { \
-	{ KC_NO, K01,   K02,   K03,   K04 }, \
-	{ KC_NO, K11,   K12,   K13,   KC_NO }, \
-	{ KC_NO, K21,   K22,   K23,   K24 }, \
-	{ KC_NO, K31,   K32,   K33,   KC_NO }, \
-	{ K40,   K41,   K42,   K43,   K44 }  \
+    { KC_NO, K01,   K02,   K03,   K04 },   \
+    { KC_NO, K11,   K12,   K13,   KC_NO }, \
+    { KC_NO, K21,   K22,   K23,   K24 },   \
+    { KC_NO, K31,   K32,   K33,   KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44 }    \
 }
-
-#endif

From 9a85cea5135673e5e7e32db030f5855a98059380 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 09:49:32 +0900
Subject: [PATCH 10/22] Update keyboards/doodboard/duckboard/kb.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/doodboard/duckboard/kb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/doodboard/duckboard/kb.c b/keyboards/doodboard/duckboard/kb.c
index e5979b76df7f..af0cb24beb55 100644
--- a/keyboards/doodboard/duckboard/kb.c
+++ b/keyboards/doodboard/duckboard/kb.c
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb.h"
+#include "duckboard.h"

From c124c94c6c75a32b774861e69487ace3fbaa175f Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 09:59:34 +0900
Subject: [PATCH 11/22] Update code per review

Update code per review
---
 .../{duckboard => duckboard2}/config.h        |  3 --
 .../kb.c => duckboard2/duckboard.c}           |  2 +-
 .../kb.h => duckboard2/duckboard.h}           | 25 +++++------
 .../keymaps/default/keymap.c                  | 43 ++++++++-----------
 .../{duckboard => duckboard2}/readme.md       |  0
 .../{duckboard => duckboard2}/rules.mk        |  0
 6 files changed, 31 insertions(+), 42 deletions(-)
 rename keyboards/doodboard/{duckboard => duckboard2}/config.h (98%)
 rename keyboards/doodboard/{duckboard/kb.c => duckboard2/duckboard.c} (96%)
 rename keyboards/doodboard/{duckboard/kb.h => duckboard2/duckboard.h} (64%)
 rename keyboards/doodboard/{duckboard => duckboard2}/keymaps/default/keymap.c (84%)
 rename keyboards/doodboard/{duckboard => duckboard2}/readme.md (100%)
 rename keyboards/doodboard/{duckboard => duckboard2}/rules.mk (100%)

diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard2/config.h
similarity index 98%
rename from keyboards/doodboard/duckboard/config.h
rename to keyboards/doodboard/duckboard2/config.h
index 6f56f69f0557..cfbd1af3669a 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard2/config.h
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CONFIG_H
 #define CONFIG_H
 
 #include "config_common.h"
@@ -57,5 +56,3 @@
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
-
-#endif
diff --git a/keyboards/doodboard/duckboard/kb.c b/keyboards/doodboard/duckboard2/duckboard.c
similarity index 96%
rename from keyboards/doodboard/duckboard/kb.c
rename to keyboards/doodboard/duckboard2/duckboard.c
index e5979b76df7f..af0cb24beb55 100644
--- a/keyboards/doodboard/duckboard/kb.c
+++ b/keyboards/doodboard/duckboard2/duckboard.c
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb.h"
+#include "duckboard.h"
diff --git a/keyboards/doodboard/duckboard/kb.h b/keyboards/doodboard/duckboard2/duckboard.h
similarity index 64%
rename from keyboards/doodboard/duckboard/kb.h
rename to keyboards/doodboard/duckboard2/duckboard.h
index b39e56f68b62..7cac321f5aa2 100644
--- a/keyboards/doodboard/duckboard/kb.h
+++ b/keyboards/doodboard/duckboard2/duckboard.h
@@ -14,23 +14,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KB_H
 #define KB_H
 
 #include "quantum.h"
 
-#define KEYMAP( \
-	     K01, K02, K03, K04, \
-	     K11, K12, K13,      \
-	     K21, K22, K23, K24, \
-	     K31, K32, K33,      \
-	K40, K41, K42, K43, K44  \
+#define LAYOUT( \
+         K01, K02, K03, K04, \
+         K11, K12, K13,      \
+         K21, K22, K23, K24, \
+         K31, K32, K33,      \
+    K40, K41, K42, K43, K44  \
 ) { \
-	{ KC_NO, K01,   K02,   K03,   K04 }, \
-	{ KC_NO, K11,   K12,   K13,   KC_NO }, \
-	{ KC_NO, K21,   K22,   K23,   K24 }, \
-	{ KC_NO, K31,   K32,   K33,   KC_NO }, \
-	{ K40,   K41,   K42,   K43,   K44 }  \
+    { KC_NO, K01,   K02,   K03,   K04 },   \
+    { KC_NO, K11,   K12,   K13,   KC_NO }, \
+    { KC_NO, K21,   K22,   K23,   K24 },   \
+    { KC_NO, K31,   K32,   K33,   KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44 }    \
 }
-
-#endif
diff --git a/keyboards/doodboard/duckboard/keymaps/default/keymap.c b/keyboards/doodboard/duckboard2/keymaps/default/keymap.c
similarity index 84%
rename from keyboards/doodboard/duckboard/keymaps/default/keymap.c
rename to keyboards/doodboard/duckboard2/keymaps/default/keymap.c
index 8fa88c5f6dc5..6684e9863394 100644
--- a/keyboards/doodboard/duckboard/keymaps/default/keymap.c
+++ b/keyboards/doodboard/duckboard2/keymaps/default/keymap.c
@@ -14,31 +14,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "kb.h"
-
+#include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	KEYMAP(
-		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),
-
-	KEYMAP(
-		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),
-
-	KEYMAP(
-		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),
-
+    [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),
 };
 
 void encoder_update_user(uint8_t index, bool clockwise) {
diff --git a/keyboards/doodboard/duckboard/readme.md b/keyboards/doodboard/duckboard2/readme.md
similarity index 100%
rename from keyboards/doodboard/duckboard/readme.md
rename to keyboards/doodboard/duckboard2/readme.md
diff --git a/keyboards/doodboard/duckboard/rules.mk b/keyboards/doodboard/duckboard2/rules.mk
similarity index 100%
rename from keyboards/doodboard/duckboard/rules.mk
rename to keyboards/doodboard/duckboard2/rules.mk

From 9ac382bddd299444305aff7b220e31234ce14f72 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 10:03:25 +0900
Subject: [PATCH 12/22] folder name errod

folder name errod
---
 keyboards/doodboard/{duckboard2 => duckboard}/config.h            | 0
 keyboards/doodboard/{duckboard2 => duckboard}/duckboard.c         | 0
 keyboards/doodboard/{duckboard2 => duckboard}/duckboard.h         | 0
 .../doodboard/{duckboard2 => duckboard}/keymaps/default/keymap.c  | 0
 keyboards/doodboard/{duckboard2 => duckboard}/readme.md           | 0
 keyboards/doodboard/{duckboard2 => duckboard}/rules.mk            | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename keyboards/doodboard/{duckboard2 => duckboard}/config.h (100%)
 rename keyboards/doodboard/{duckboard2 => duckboard}/duckboard.c (100%)
 rename keyboards/doodboard/{duckboard2 => duckboard}/duckboard.h (100%)
 rename keyboards/doodboard/{duckboard2 => duckboard}/keymaps/default/keymap.c (100%)
 rename keyboards/doodboard/{duckboard2 => duckboard}/readme.md (100%)
 rename keyboards/doodboard/{duckboard2 => duckboard}/rules.mk (100%)

diff --git a/keyboards/doodboard/duckboard2/config.h b/keyboards/doodboard/duckboard/config.h
similarity index 100%
rename from keyboards/doodboard/duckboard2/config.h
rename to keyboards/doodboard/duckboard/config.h
diff --git a/keyboards/doodboard/duckboard2/duckboard.c b/keyboards/doodboard/duckboard/duckboard.c
similarity index 100%
rename from keyboards/doodboard/duckboard2/duckboard.c
rename to keyboards/doodboard/duckboard/duckboard.c
diff --git a/keyboards/doodboard/duckboard2/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h
similarity index 100%
rename from keyboards/doodboard/duckboard2/duckboard.h
rename to keyboards/doodboard/duckboard/duckboard.h
diff --git a/keyboards/doodboard/duckboard2/keymaps/default/keymap.c b/keyboards/doodboard/duckboard/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/doodboard/duckboard2/keymaps/default/keymap.c
rename to keyboards/doodboard/duckboard/keymaps/default/keymap.c
diff --git a/keyboards/doodboard/duckboard2/readme.md b/keyboards/doodboard/duckboard/readme.md
similarity index 100%
rename from keyboards/doodboard/duckboard2/readme.md
rename to keyboards/doodboard/duckboard/readme.md
diff --git a/keyboards/doodboard/duckboard2/rules.mk b/keyboards/doodboard/duckboard/rules.mk
similarity index 100%
rename from keyboards/doodboard/duckboard2/rules.mk
rename to keyboards/doodboard/duckboard/rules.mk

From b15d06ad12243038317b5e14cf1196fe7ec1f3cb Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 16:47:24 +0900
Subject: [PATCH 13/22] Update keyboards/doodboard/duckboard/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/doodboard/duckboard/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index 2f9f0d1b4319..d58c675577b0 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -20,7 +20,7 @@
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
+#define PRODUCT_ID      0xFF44
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    doodboard
 #define PRODUCT         duckboard

From 1f9a682ad084b5de4bbfad5cbe5a9fb5a287c34e Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 16:47:33 +0900
Subject: [PATCH 14/22] Update keyboards/doodboard/duckboard/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/doodboard/duckboard/rules.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keyboards/doodboard/duckboard/rules.mk b/keyboards/doodboard/duckboard/rules.mk
index 07b81cdf44dc..ef52054aab2a 100644
--- a/keyboards/doodboard/duckboard/rules.mk
+++ b/keyboards/doodboard/duckboard/rules.mk
@@ -1,5 +1,7 @@
 # MCU name
 MCU = atmega32u4
+
+# Bootloader selection
 BOOTLOADER = caterina
 
 # Build Options

From fa9a59793f47de9eff2681b0f0d4525b0baec3cf Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 16:47:45 +0900
Subject: [PATCH 15/22] Update keyboards/doodboard/duckboard/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/doodboard/duckboard/rules.mk | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/keyboards/doodboard/duckboard/rules.mk b/keyboards/doodboard/duckboard/rules.mk
index ef52054aab2a..09a60d8a7956 100644
--- a/keyboards/doodboard/duckboard/rules.mk
+++ b/keyboards/doodboard/duckboard/rules.mk
@@ -5,18 +5,21 @@ MCU = atmega32u4
 BOOTLOADER = caterina
 
 # Build Options
-#   comment out to disable the options.
+#   change yes to no to disable
 #
-BOOTMAGIC_ENABLE ?= no	# Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= no	# Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes	# Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes	# Console for debug(+400)
-COMMAND_ENABLE ?= no    # Commands for debug and configuration
-SLEEP_LED_ENABLE ?= no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE ?= yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE ?= no  # Enable keyboard backlight functionality
-AUDIO_ENABLE ?= no
-RGBLIGHT_ENABLE ?= yes
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 
 ENCODER_ENABLE = yes
 OLED_DRIVER_ENABLE = yes

From b0303d633d771ba37caf11eb7bfa061ded244f22 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 17:04:05 +0900
Subject: [PATCH 16/22] Update keyboards/doodboard/duckboard/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/doodboard/duckboard/config.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/doodboard/duckboard/config.h b/keyboards/doodboard/duckboard/config.h
index d58c675577b0..ea8a8ae5ddad 100644
--- a/keyboards/doodboard/duckboard/config.h
+++ b/keyboards/doodboard/duckboard/config.h
@@ -24,7 +24,6 @@
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    doodboard
 #define PRODUCT         duckboard
-#define DESCRIPTION     18 key numpad with rotary encoder and OLED support
 
 /* key matrix size */
 #define MATRIX_ROWS 5

From 879751910c2d85d7033a83069cb6753c131641e1 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 17:04:16 +0900
Subject: [PATCH 17/22] Create info.json

---
 keyboards/doodboard/duckboard/info.json | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 keyboards/doodboard/duckboard/info.json

diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
new file mode 100644
index 000000000000..ea8b520e7369
--- /dev/null
+++ b/keyboards/doodboard/duckboard/info.json
@@ -0,0 +1,17 @@
+{
+    "keyboard_name": "duckboard",
+    "url": "",
+    "maintainer": "doodboard",
+    "width": 5,
+    "height": 5,
+    "layouts": {
+      "LAYOUT_default": {
+        "layout": [                 {"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":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
+                                    {"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":4},
+                  ]
+      }
+    }
+  }

From c20929f70b863f330a7be06686f5c02fd62031f3 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 17:22:29 +0900
Subject: [PATCH 18/22] Update keyboards/doodboard/duckboard/duckboard.h

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/doodboard/duckboard/duckboard.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/doodboard/duckboard/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h
index cd95d32dfd4a..5a3707cfb9c4 100644
--- a/keyboards/doodboard/duckboard/duckboard.h
+++ b/keyboards/doodboard/duckboard/duckboard.h
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define KB_H
 
 #pragma once
 

From f926bbc049d3dc97a90e03eb5bc6050ef70e7d1c Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 17:28:38 +0900
Subject: [PATCH 19/22] Update keyboards/doodboard/duckboard/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/doodboard/duckboard/info.json | 37 +++++++++++++++++++------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index ea8b520e7369..d3e50575dc14 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -5,13 +5,32 @@
     "width": 5,
     "height": 5,
     "layouts": {
-      "LAYOUT_default": {
-        "layout": [                 {"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":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
-                                    {"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":4},
-                  ]
-      }
+        "LAYOUT_default": {
+            "layout": [
+                {"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": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+
+                {"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": 4}
+            ]
+        }
     }
-  }
+}

From 2d374f3b292e683693a0c9c2de539a1b2092b218 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 17:32:33 +0900
Subject: [PATCH 20/22] Update keyboards/doodboard/duckboard/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/doodboard/duckboard/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index d3e50575dc14..ff043779f662 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -5,7 +5,7 @@
     "width": 5,
     "height": 5,
     "layouts": {
-        "LAYOUT_default": {
+        "LAYOUT": {
             "layout": [
                 {"x": 1, "y": 0},
                 {"x": 2, "y": 0},

From e70260c2d39b378168afe695e1c82f2c8853b847 Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Mon, 21 Sep 2020 17:44:17 +0900
Subject: [PATCH 21/22] Update keyboards/doodboard/duckboard/duckboard.h

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/doodboard/duckboard/duckboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keyboards/doodboard/duckboard/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h
index 5a3707cfb9c4..0e753d445ef8 100644
--- a/keyboards/doodboard/duckboard/duckboard.h
+++ b/keyboards/doodboard/duckboard/duckboard.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "quantum.h"
+
 #define LAYOUT( \
          K01, K02, K03, K04, \
          K11, K12, K13,      \

From 208d0f2f21393635aec8eb58c54234831bb8ba3b Mon Sep 17 00:00:00 2001
From: doodboard <doodboard@gmail.com>
Date: Thu, 24 Sep 2020 21:39:42 +0900
Subject: [PATCH 22/22] Update keyboards/doodboard/duckboard/readme.md

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/doodboard/duckboard/readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/doodboard/duckboard/readme.md b/keyboards/doodboard/duckboard/readme.md
index 4f9eb17032a0..d2b799ab61bc 100644
--- a/keyboards/doodboard/duckboard/readme.md
+++ b/keyboards/doodboard/duckboard/readme.md
@@ -4,7 +4,7 @@ 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]
+* Hardware Availability: Private Group Buy
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -14,4 +14,4 @@ Flashing example for this keyboard:
 
     make doodboard/duckboard:default:flash
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).