From 5c010d3de5618f337a852b2408e0bfc8db9de96e Mon Sep 17 00:00:00 2001
From: Florian Scheibeck <info@floookay.de>
Date: Tue, 25 May 2021 16:36:42 +0200
Subject: [PATCH 01/13] added pluckey

---
 keyboards/pluckey/config.h                  |  88 +++++++++++++
 keyboards/pluckey/info.json                 |  19 +++
 keyboards/pluckey/keymaps/default/keymap.c  | 130 ++++++++++++++++++++
 keyboards/pluckey/keymaps/default/readme.md |   1 +
 keyboards/pluckey/pluckey.c                 |  17 +++
 keyboards/pluckey/pluckey.h                 |  46 +++++++
 keyboards/pluckey/readme.md                 |  20 +++
 keyboards/pluckey/rules.mk                  |  22 ++++
 8 files changed, 343 insertions(+)
 create mode 100644 keyboards/pluckey/config.h
 create mode 100644 keyboards/pluckey/info.json
 create mode 100644 keyboards/pluckey/keymaps/default/keymap.c
 create mode 100644 keyboards/pluckey/keymaps/default/readme.md
 create mode 100644 keyboards/pluckey/pluckey.c
 create mode 100644 keyboards/pluckey/pluckey.h
 create mode 100644 keyboards/pluckey/readme.md
 create mode 100644 keyboards/pluckey/rules.mk

diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h
new file mode 100644
index 000000000000..3af460120229
--- /dev/null
+++ b/keyboards/pluckey/config.h
@@ -0,0 +1,88 @@
+/*
+Copyright 2021 floookay
+
+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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xF100
+#define PRODUCT_ID   0x91CE
+#define DEVICE_VER   0x0001
+#define MANUFACTURER floookay
+#define PRODUCT      pluckey
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B4, F5, F6, B6, B5 }
+#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, F7 }
+#define UNUSED_PINS { F4, B1 }
+#define DIODE_DIRECTION COL2ROW
+
+/* encoder support */
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B2 }
+#define ENCODER_RESOLUTION 2
+
+/* communication between sides */
+#define USE_SERIAL
+#define SERIAL_USE_MULTI_TRANSACTION
+#define SOFT_SERIAL_PIN D2
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
new file mode 100644
index 000000000000..3a744b24aee7
--- /dev/null
+++ b/keyboards/pluckey/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "pluckey",
+    "url": "https://github.com/floookay/pluckey",
+    "maintainer": "floookay",
+    "width": 3,
+    "height": 2,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1, "y": 0},
+                {"label": "k02", "x": 2, "y": 0},
+
+                {"label": "k10", "x": 0, "y": 1, "w": 1.5},
+                {"label": "k12", "x": 1.5, "y": 1, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
new file mode 100644
index 000000000000..7683406cc47b
--- /dev/null
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -0,0 +1,130 @@
+/* Copyright 2021 floookay
+ *
+ * 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 QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    M_ARROW,
+    M_DTHIS,
+    QMKBEST = SAFE_RANGE,
+    QMKURL
+};
+
+#define MO_LOW MO(_LOWER)
+#define MO_RAIS MO(_RAISE)
+#define MO_ADJU MO(_ADJUST)
+#define MO_CURR _______
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                        KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  \
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                        KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LBRC,                        KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR, KC_HOME,      KC_END,  M_DTHIS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
+                          KC_LGUI, KC_LALT, MO_LOW,      KC_SPC,    KC_BSPC,            KC_ENT,    KC_SPC,      MO_RAIS, KC_RALT, KC_MEH                     \
+    ),
+    [_LOWER] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                         KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PSCR, \
+        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN,                        KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
+        _______, _______, _______, _______, KC_PIPE, KC_UNDS, KC_LPRN,                        KC_RPRN, KC_PLUS, KC_PIPE, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, M_DTHIS, _______, _______, _______, _______, _______, _______, \
+                          _______, _______, MO_CURR,     _______,   KC_DEL,             _______,   _______,     MO_ADJU, _______, _______                    \
+    ),
+    [_RAISE] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, KC_PGUP, _______, _______, _______, \
+        _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN,                        KC_RPRN, _______, KC_BTN4, KC_UP,   KC_BTN5, _______, _______, \
+        _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LPRN,                        KC_RPRN, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______,  \
+        _______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, M_DTHIS, _______, _______, KC_PGDN, _______, _______, _______, \
+                          _______, _______, MO_ADJU,     _______,   KC_DEL,             _______,   _______,     MO_CURR, _______, _______                    \
+    ),
+    [_ADJUST] = LAYOUT(
+        KC_SLEP, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, KC_WH_U, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, \
+                          _______, _______, _______,     _______,   KC_CLR,            _______,   _______,     _______, _______, _______                    \
+    )
+    /*
+    [_TEMPLATE] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, \
+                          _______, _______, _______,     _______,   _______,            _______,   _______,     _______, _______, _______                    \
+    )
+    */
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        // PHP Macros
+        case M_ARROW:
+            if (record->event.pressed) {
+                SEND_STRING("->");
+            }
+            break;
+        case M_DTHIS:
+            if (record->event.pressed) {
+                SEND_STRING("$this->");
+            }
+            break;
+        // general
+        case QMKBEST:
+            if (record->event.pressed) {
+                // when keycode QMKBEST is pressed
+                SEND_STRING("QMK is the best thing ever!");
+            }
+            break;
+        case QMKURL:
+            if (record->event.pressed) {
+                // when keycode QMKURL is pressed
+                SEND_STRING("https://qmk.fm/\n");
+            } else {
+                // when keycode QMKURL is released
+            }
+            break;
+    }
+    return true;
+}
+
+#ifdef ENCODER_ENABLE
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_DOWN);
+        } else {
+            tap_code(KC_UP);
+        }
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/pluckey/keymaps/default/readme.md b/keyboards/pluckey/keymaps/default/readme.md
new file mode 100644
index 000000000000..7a8804f7eecc
--- /dev/null
+++ b/keyboards/pluckey/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for pluckey
diff --git a/keyboards/pluckey/pluckey.c b/keyboards/pluckey/pluckey.c
new file mode 100644
index 000000000000..1d2cd06f134a
--- /dev/null
+++ b/keyboards/pluckey/pluckey.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 floookay
+ *
+ * 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 "pluckey.h"
diff --git a/keyboards/pluckey/pluckey.h b/keyboards/pluckey/pluckey.h
new file mode 100644
index 000000000000..628a89baa9a1
--- /dev/null
+++ b/keyboards/pluckey/pluckey.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 floookay
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    l00, l01, l02, l03, l04, l05, l06,               r00, r01, r02, r03, r04, r05, r06, \
+    l10, l11, l12, l13, l14, l15, l16,               r10, r11, r12, r13, r14, r15, r16, \
+    l20, l21, l22, l23, l24, l25, l26,               r20, r21, r22, r23, r24, r25, r26, \
+    l30, l31, l32, l33, l34, l35, l36, l41,     r45, r30, r31, r32, r33, r34, r35, r36, \
+              l42, l43, l44,   l45,   l46,       r40,   r41,   r42, r43, r44            \
+){ \
+    { l00,   l01,   l02,   l03,   l04,   l05,   l06 },   \
+    { l10,   l11,   l12,   l13,   l14,   l15,   l16 },   \
+    { l20,   l21,   l22,   l23,   l24,   l25,   l26 },   \
+    { l30,   l31,   l32,   l33,   l34,   l35,   l36 },   \
+    { KC_NO, l41,   l42,   l43,   l44,   l45,   l46 },   \
+    { r06,   r05,   r04,   r03,   r02,   r01,   r00 },   \
+    { r16,   r15,   r14,   r13,   r12,   r11,   r10 },   \
+    { r26,   r25,   r24,   r23,   r22,   r21,   r20 },   \
+    { r36,   r35,   r34,   r33,   r32,   r31,   r30 },   \
+    { KC_NO, r45,   r44,   r43,   r42,   r41,   r40 }  \
+}
diff --git a/keyboards/pluckey/readme.md b/keyboards/pluckey/readme.md
new file mode 100644
index 000000000000..0876ed2bb3a1
--- /dev/null
+++ b/keyboards/pluckey/readme.md
@@ -0,0 +1,20 @@
+# Pluckey
+
+![pluckey](imgur.com image replace me!)
+
+The plucky is an ergodox like split keyboard with a more extreme columnal stagger.  
+I took inspiration from splitkb's Kyria and the Ergodox design.
+
+* Keyboard Maintainer: [floookay](https://github.com/floookay)
+* Hardware Supported: pluckey pcbs with pro micro controllers
+* Hardware Availability: [pcb &amp; case](https://github.com/floookay/pluckey)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pluckey:default
+
+Flashing example for this keyboard:
+
+    make pluckey: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).
diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk
new file mode 100644
index 000000000000..eddeb3abe7fe
--- /dev/null
+++ b/keyboards/pluckey/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+ENCODER_ENABLE = yes		# Encoder support
+SPLIT_KEYBOARD = yes		# Split keyboard
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # 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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output

From ea572d314b09dd1385b7155013d91af8a8f232e0 Mon Sep 17 00:00:00 2001
From: Florian Scheibeck <info@floookay.de>
Date: Sun, 30 May 2021 13:21:18 +0200
Subject: [PATCH 02/13] updated keymap

---
 keyboards/pluckey/keymaps/default/keymap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
index 7683406cc47b..2ca4290feb4c 100644
--- a/keyboards/pluckey/keymaps/default/keymap.c
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -41,14 +41,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                        KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  \
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                        KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LBRC,                        KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR, KC_HOME,      KC_END,  M_DTHIS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                        KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR, KC_HOME,      KC_END,  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
                           KC_LGUI, KC_LALT, MO_LOW,      KC_SPC,    KC_BSPC,            KC_ENT,    KC_SPC,      MO_RAIS, KC_RALT, KC_MEH                     \
     ),
     [_LOWER] = LAYOUT(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                         KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PSCR, \
-        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN,                        KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
         _______, _______, _______, _______, KC_PIPE, KC_UNDS, KC_LPRN,                        KC_RPRN, KC_PLUS, KC_PIPE, _______, _______, _______, _______, \
+        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN,                        KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
         _______, _______, _______, _______, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, M_DTHIS, _______, _______, _______, _______, _______, _______, \
                           _______, _______, MO_CURR,     _______,   KC_DEL,             _______,   _______,     MO_ADJU, _______, _______                    \
     ),

From 507af1fe5662ca82b86a996b93d371e2a6e6bcf6 Mon Sep 17 00:00:00 2001
From: floookay <info@floookay.de>
Date: Sat, 26 Jun 2021 15:39:09 +0200
Subject: [PATCH 03/13] updated encoder code

---
 keyboards/pluckey/config.h                 |  3 +
 keyboards/pluckey/keymaps/default/keymap.c | 65 ++++++++++++----------
 keyboards/pluckey/readme.md                |  7 +--
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h
index 3af460120229..4eede5fe15cb 100644
--- a/keyboards/pluckey/config.h
+++ b/keyboards/pluckey/config.h
@@ -49,6 +49,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_A { B3 }
 #define ENCODERS_PAD_B { B2 }
 #define ENCODER_RESOLUTION 2
+#define ENCODERS_PAD_A_RIGHT { B2 }
+#define ENCODERS_PAD_B_RIGHT { B3 }
+#define ENCODER_RESOLUTION_RIGHT 2
 
 /* communication between sides */
 #define USE_SERIAL
diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
index 2ca4290feb4c..2abdd263493b 100644
--- a/keyboards/pluckey/keymaps/default/keymap.c
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -26,9 +26,7 @@ enum layer_names {
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
     M_ARROW,
-    M_DTHIS,
-    QMKBEST = SAFE_RANGE,
-    QMKURL
+    M_DTHIS
 };
 
 #define MO_LOW MO(_LOWER)
@@ -90,41 +88,48 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 SEND_STRING("$this->");
             }
             break;
-        // general
-        case QMKBEST:
-            if (record->event.pressed) {
-                // when keycode QMKBEST is pressed
-                SEND_STRING("QMK is the best thing ever!");
-            }
-            break;
-        case QMKURL:
-            if (record->event.pressed) {
-                // when keycode QMKURL is pressed
-                SEND_STRING("https://qmk.fm/\n");
-            } else {
-                // when keycode QMKURL is released
-            }
-            break;
     }
     return true;
 }
 
 #ifdef ENCODER_ENABLE
 
-void encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_DOWN);
-        } else {
-            tap_code(KC_UP);
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0 || index == 1) {
+        switch (layer_state) {
+            case _BASE:
+                if (clockwise) {
+                    tap_code(KC_VOLU);
+                } else {
+                    tap_code(KC_VOLD);
+                }
+                break;
+            case _LOWER:
+                if (clockwise) {
+                    tap_code16(LCTL(KC_Y));
+                } else {
+                    tap_code16(LCTL(KC_Z));
+                }
+                break;
+            case _RAISE:
+                if (clockwise) {
+                    tap_code(KC_WH_U);
+                } else {
+                    tap_code(KC_WH_D);
+                }
+                break;
+            case _ADJUST:
+                if (clockwise) {
+                    tap_code(KC_LEFT);
+                } else {
+                    tap_code(KC_RGHT);
+                }
+                break;
+            default:
+                break;
         }
     }
+    return true;
 }
 
 #endif
\ No newline at end of file
diff --git a/keyboards/pluckey/readme.md b/keyboards/pluckey/readme.md
index 0876ed2bb3a1..bf3673f762da 100644
--- a/keyboards/pluckey/readme.md
+++ b/keyboards/pluckey/readme.md
@@ -1,13 +1,12 @@
 # Pluckey
 
-![pluckey](imgur.com image replace me!)
+![pluckey](https://gist.githubusercontent.com/floookay/ea7313862e407c9b5aaea3d6ed3ce233/raw/4c37d31cb414b9a7709810434a3b68f4b9b9c0dc/skeleton%2520sunshine.jpg)
 
-The plucky is an ergodox like split keyboard with a more extreme columnal stagger.  
-I took inspiration from splitkb's Kyria and the Ergodox design.
+The plucky is an ergodox like split keyboard with moderate columnal stagger and a horizontal space key.
 
 * Keyboard Maintainer: [floookay](https://github.com/floookay)
 * Hardware Supported: pluckey pcbs with pro micro controllers
-* Hardware Availability: [pcb &amp; case](https://github.com/floookay/pluckey)
+* Hardware Availability: [pcb &amp; case files](https://github.com/floookay/pluckey)
 
 Make example for this keyboard (after setting up your build environment):
 

From ae0d68d29ed27e44f8ea39b93c77395dac6e67fc Mon Sep 17 00:00:00 2001
From: floookay <info@floookay.de>
Date: Sat, 24 Jul 2021 08:36:23 +0200
Subject: [PATCH 04/13] fixed typo

---
 keyboards/pluckey/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/pluckey/readme.md b/keyboards/pluckey/readme.md
index bf3673f762da..e459071da6d1 100644
--- a/keyboards/pluckey/readme.md
+++ b/keyboards/pluckey/readme.md
@@ -2,7 +2,7 @@
 
 ![pluckey](https://gist.githubusercontent.com/floookay/ea7313862e407c9b5aaea3d6ed3ce233/raw/4c37d31cb414b9a7709810434a3b68f4b9b9c0dc/skeleton%2520sunshine.jpg)
 
-The plucky is an ergodox like split keyboard with moderate columnal stagger and a horizontal space key.
+The pluckey is an ergodox like split keyboard with moderate columnal stagger and a horizontal space key.
 
 * Keyboard Maintainer: [floookay](https://github.com/floookay)
 * Hardware Supported: pluckey pcbs with pro micro controllers

From dde2c38a0ae6dea308b4524c8098214f3a9be4f6 Mon Sep 17 00:00:00 2001
From: floookay <info@floookay.de>
Date: Sat, 2 Oct 2021 17:35:12 +0200
Subject: [PATCH 05/13] simplified default keymap

---
 keyboards/pluckey/keymaps/default/keymap.c | 73 ++++++----------------
 keyboards/pluckey/readme.md                |  2 +-
 2 files changed, 19 insertions(+), 56 deletions(-)

diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
index 2abdd263493b..9c15d9061835 100644
--- a/keyboards/pluckey/keymaps/default/keymap.c
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -25,8 +25,7 @@ enum layer_names {
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-    M_ARROW,
-    M_DTHIS
+    M_ARROW
 };
 
 #define MO_LOW MO(_LOWER)
@@ -47,14 +46,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                         KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PSCR, \
         _______, _______, _______, _______, KC_PIPE, KC_UNDS, KC_LPRN,                        KC_RPRN, KC_PLUS, KC_PIPE, _______, _______, _______, _______, \
         _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN,                        KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
-        _______, _______, _______, _______, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, M_DTHIS, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, _______, _______, _______, _______, _______, _______, _______, \
                           _______, _______, MO_CURR,     _______,   KC_DEL,             _______,   _______,     MO_ADJU, _______, _______                    \
     ),
     [_RAISE] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, KC_PGUP, _______, _______, _______, \
         _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN,                        KC_RPRN, _______, KC_BTN4, KC_UP,   KC_BTN5, _______, _______, \
-        _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LPRN,                        KC_RPRN, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______,  \
-        _______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, M_DTHIS, _______, _______, KC_PGDN, _______, _______, _______, \
+        _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LPRN,                        KC_RPRN, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______, \
+        _______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, _______, _______, _______, KC_PGDN, _______, _______, _______, \
                           _______, _______, MO_ADJU,     _______,   KC_DEL,             _______,   _______,     MO_CURR, _______, _______                    \
     ),
     [_ADJUST] = LAYOUT(
@@ -62,74 +61,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, KC_WH_U, _______, _______, _______, \
         _______, _______, _______, _______, _______, _______, _______,                        _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______, \
         _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, \
-                          _______, _______, _______,     _______,   KC_CLR,            _______,   _______,     _______, _______, _______                    \
+                          _______, _______, _______,     _______,   KC_CLR,            _______,   _______,     _______, _______, _______                     \
     )
-    /*
-    [_TEMPLATE] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, \
-                          _______, _______, _______,     _______,   _______,            _______,   _______,     _______, _______, _______                    \
-    )
-    */
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        // PHP Macros
         case M_ARROW:
             if (record->event.pressed) {
                 SEND_STRING("->");
             }
             break;
-        case M_DTHIS:
-            if (record->event.pressed) {
-                SEND_STRING("$this->");
-            }
-            break;
     }
     return true;
 }
 
 #ifdef ENCODER_ENABLE
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0 || index == 1) {
-        switch (layer_state) {
-            case _BASE:
-                if (clockwise) {
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-                }
-                break;
-            case _LOWER:
-                if (clockwise) {
-                    tap_code16(LCTL(KC_Y));
-                } else {
-                    tap_code16(LCTL(KC_Z));
-                }
-                break;
-            case _RAISE:
-                if (clockwise) {
-                    tap_code(KC_WH_U);
-                } else {
-                    tap_code(KC_WH_D);
-                }
-                break;
-            case _ADJUST:
-                if (clockwise) {
-                    tap_code(KC_LEFT);
-                } else {
-                    tap_code(KC_RGHT);
-                }
-                break;
-            default:
-                break;
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_WH_U);
+        } else {
+            tap_code(KC_WH_D);
         }
     }
-    return true;
 }
 
 #endif
\ No newline at end of file
diff --git a/keyboards/pluckey/readme.md b/keyboards/pluckey/readme.md
index e459071da6d1..b0a1af99b88a 100644
--- a/keyboards/pluckey/readme.md
+++ b/keyboards/pluckey/readme.md
@@ -1,6 +1,6 @@
 # Pluckey
 
-![pluckey](https://gist.githubusercontent.com/floookay/ea7313862e407c9b5aaea3d6ed3ce233/raw/4c37d31cb414b9a7709810434a3b68f4b9b9c0dc/skeleton%2520sunshine.jpg)
+![pluckey](https://gist.githubusercontent.com/floookay/ea7313862e407c9b5aaea3d6ed3ce233/raw/1757078b1adf7ac4d51d74f445107bdb46e013a3/sandwich%2520angle.jpg)
 
 The pluckey is an ergodox like split keyboard with moderate columnal stagger and a horizontal space key.
 

From 1837ad446e8999ce7f7aa1525389ac1087a2a7a1 Mon Sep 17 00:00:00 2001
From: floookay <info@floookay.de>
Date: Sat, 2 Oct 2021 18:02:06 +0200
Subject: [PATCH 06/13] fixed layout of info.json

---
 keyboards/pluckey/info.json | 74 +++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
index 3a744b24aee7..668b76329e0e 100644
--- a/keyboards/pluckey/info.json
+++ b/keyboards/pluckey/info.json
@@ -2,17 +2,75 @@
     "keyboard_name": "pluckey",
     "url": "https://github.com/floookay/pluckey",
     "maintainer": "floookay",
-    "width": 3,
-    "height": 2,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
-
-                {"label": "k10", "x": 0, "y": 1, "w": 1.5},
-                {"label": "k12", "x": 1.5, "y": 1, "w": 1.5}
+                {"x":3.5, "y":0},
+                {"x":15, "y":0},
+                {"x":2.5, "y":0.125},
+                {"x":4.5, "y":0.125},
+                {"x":14, "y":0.125},
+                {"x":16, "y":0.125},
+                {"x":5.5, "y":0.25},
+                {"x":6.5, "y":0.25},
+                {"x":12, "y":0.25},
+                {"x":13, "y":0.25},
+                {"x":0, "y":0.625, "w":1.5},
+                {"x":1.5, "y":0.625},
+                {"x":17, "y":0.625},
+                {"x":18, "y":0.625, "w":1.5},
+                {"x":3.5, "y":1.0},
+                {"x":15, "y":1.0},
+                {"x":2.5, "y":1.125},
+                {"x":4.5, "y":1.125},
+                {"x":14, "y":1.125},
+                {"x":16, "y":1.125},
+                {"x":5.5, "y":1.25},
+                {"x":6.5, "y":1.25, "h":1.5},
+                {"x":12, "y":1.25, "h":1.5},
+                {"x":13, "y":1.25},
+                {"x":0, "y":1.625, "w":1.5},
+                {"x":1.5, "y":1.625},
+                {"x":17, "y":1.625},
+                {"x":18, "y":1.625, "w":1.5},
+                {"x":3.5, "y":2},
+                {"x":15, "y":2},
+                {"x":2.5, "y":2.125},
+                {"x":4.5, "y":2.125},
+                {"x":14, "y":2.125},
+                {"x":16, "y":2.125},
+                {"x":5.5, "y":2.25},
+                {"x":13, "y":2.25},
+                {"x":0, "y":2.625, "w":1.5},
+                {"x":1.5, "y":2.625},
+                {"x":17, "y":2.625},
+                {"x":18, "y":2.625, "w":1.5},
+                {"x":6.5, "y":2.75, "h":1.5},
+                {"x":12, "y":2.75, "h":1.5},
+                {"x":3.5, "y":3},
+                {"x":15, "y":3},
+                {"x":2.5, "y":3.125},
+                {"x":4.5, "y":3.125},
+                {"x":14, "y":3.125},
+                {"x":16, "y":3.125},
+                {"x":5.5, "y":3.25},
+                {"x":13, "y":3.25},
+                {"x":0, "y":3.625, "w":1.5},
+                {"x":1.5, "y":3.625},
+                {"x":17, "y":3.625},
+                {"x":18, "y":3.625, "w":1.5},
+                {"x":7.5, "y":3.75},
+                {"x":11, "y":3.75},
+                {"x":3.5, "y":4},
+                {"x":15, "y":4},
+                {"x":2.5, "y":4.125},
+                {"x":4.5, "y":4.125},
+                {"x":14, "y":4.125},
+                {"x":16, "y":4.125},
+                {"x":5.75, "y":4.5, "w":1.5},
+                {"x":12.25, "y":4.5, "w":1.5},
+                {"x":7.25, "y":4.75},
+                {"x":11.25, "y":4.75}
             ]
         }
     }

From 03360befe0ba944d7b01664a7c1b96da5dd62311 Mon Sep 17 00:00:00 2001
From: floookay <info@floookay.de>
Date: Sat, 2 Oct 2021 18:02:36 +0200
Subject: [PATCH 07/13] added layout with extra 7th column key

---
 keyboards/pluckey/info.json | 72 +++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
index 668b76329e0e..93e03de24e99 100644
--- a/keyboards/pluckey/info.json
+++ b/keyboards/pluckey/info.json
@@ -72,6 +72,78 @@
                 {"x":7.25, "y":4.75},
                 {"x":11.25, "y":4.75}
             ]
+        },
+        "LAYOUT_extra": {
+            "layout": [
+                {"x":3.5, "y":0},
+                {"x":15, "y":0},
+                {"x":2.5, "y":0.125},
+                {"x":4.5, "y":0.125},
+                {"x":14, "y":0.125},
+                {"x":16, "y":0.125},
+                {"x":5.5, "y":0.25},
+                {"x":6.5, "y":0.25},
+                {"x":12, "y":0.25},
+                {"x":13, "y":0.25},
+                {"x":0, "y":0.625, "w":1.5},
+                {"x":1.5, "y":0.625},
+                {"x":17, "y":0.625},
+                {"x":18, "y":0.625, "w":1.5},
+                {"x":3.5, "y":1.0},
+                {"x":15, "y":1.0},
+                {"x":2.5, "y":1.125},
+                {"x":4.5, "y":1.125},
+                {"x":14, "y":1.125},
+                {"x":16, "y":1.125},
+                {"x":5.5, "y":1.25},
+                {"x":6.5, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":0, "y":1.625, "w":1.5},
+                {"x":1.5, "y":1.625},
+                {"x":17, "y":1.625},
+                {"x":18, "y":1.625, "w":1.5},
+                {"x":3.5, "y":2},
+                {"x":15, "y":2},
+                {"x":2.5, "y":2.125},
+                {"x":4.5, "y":2.125},
+                {"x":14, "y":2.125},
+                {"x":16, "y":2.125},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":12, "y":2.25},
+                {"x":13, "y":2.25},
+                {"x":0, "y":2.625, "w":1.5},
+                {"x":1.5, "y":2.625},
+                {"x":17, "y":2.625},
+                {"x":18, "y":2.625, "w":1.5},
+                {"x":6.5, "y":3.25},
+                {"x":12, "y":3.25},
+                {"x":3.5, "y":3},
+                {"x":15, "y":3},
+                {"x":2.5, "y":3.125},
+                {"x":4.5, "y":3.125},
+                {"x":14, "y":3.125},
+                {"x":16, "y":3.125},
+                {"x":5.5, "y":3.25},
+                {"x":13, "y":3.25},
+                {"x":0, "y":3.625, "w":1.5},
+                {"x":1.5, "y":3.625},
+                {"x":17, "y":3.625},
+                {"x":18, "y":3.625, "w":1.5},
+                {"x":7.5, "y":3.75},
+                {"x":11, "y":3.75},
+                {"x":3.5, "y":4},
+                {"x":15, "y":4},
+                {"x":2.5, "y":4.125},
+                {"x":4.5, "y":4.125},
+                {"x":14, "y":4.125},
+                {"x":16, "y":4.125},
+                {"x":5.75, "y":4.5, "w":1.5},
+                {"x":12.25, "y":4.5, "w":1.5},
+                {"x":7.25, "y":4.75},
+                {"x":11.25, "y":4.75}
+            ]
         }
     }
 }

From 02ee516c613fa5e229c5da081a1c57a25bc005db Mon Sep 17 00:00:00 2001
From: floookay <info@floookay.de>
Date: Sat, 2 Oct 2021 18:20:33 +0200
Subject: [PATCH 08/13] fixed issues after rebase and restructured info.json

---
 keyboards/pluckey/info.json                 | 22 ++++++++++-----------
 keyboards/pluckey/keymaps/default/keymap.c  |  3 ++-
 keyboards/pluckey/keymaps/default/readme.md |  5 ++++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/keyboards/pluckey/info.json b/keyboards/pluckey/info.json
index 93e03de24e99..0a6bd1832dfd 100644
--- a/keyboards/pluckey/info.json
+++ b/keyboards/pluckey/info.json
@@ -26,8 +26,8 @@
                 {"x":14, "y":1.125},
                 {"x":16, "y":1.125},
                 {"x":5.5, "y":1.25},
-                {"x":6.5, "y":1.25, "h":1.5},
-                {"x":12, "y":1.25, "h":1.5},
+                {"x":6.5, "y":1.25},
+                {"x":12, "y":1.25},
                 {"x":13, "y":1.25},
                 {"x":0, "y":1.625, "w":1.5},
                 {"x":1.5, "y":1.625},
@@ -40,13 +40,15 @@
                 {"x":14, "y":2.125},
                 {"x":16, "y":2.125},
                 {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":12, "y":2.25},
                 {"x":13, "y":2.25},
                 {"x":0, "y":2.625, "w":1.5},
                 {"x":1.5, "y":2.625},
                 {"x":17, "y":2.625},
                 {"x":18, "y":2.625, "w":1.5},
-                {"x":6.5, "y":2.75, "h":1.5},
-                {"x":12, "y":2.75, "h":1.5},
+                {"x":6.5, "y":3.25},
+                {"x":12, "y":3.25},
                 {"x":3.5, "y":3},
                 {"x":15, "y":3},
                 {"x":2.5, "y":3.125},
@@ -73,7 +75,7 @@
                 {"x":11.25, "y":4.75}
             ]
         },
-        "LAYOUT_extra": {
+        "LAYOUT_ergo": {
             "layout": [
                 {"x":3.5, "y":0},
                 {"x":15, "y":0},
@@ -96,8 +98,8 @@
                 {"x":14, "y":1.125},
                 {"x":16, "y":1.125},
                 {"x":5.5, "y":1.25},
-                {"x":6.5, "y":1.25},
-                {"x":12, "y":1.25},
+                {"x":6.5, "y":1.25, "h":1.5},
+                {"x":12, "y":1.25, "h":1.5},
                 {"x":13, "y":1.25},
                 {"x":0, "y":1.625, "w":1.5},
                 {"x":1.5, "y":1.625},
@@ -110,15 +112,13 @@
                 {"x":14, "y":2.125},
                 {"x":16, "y":2.125},
                 {"x":5.5, "y":2.25},
-                {"x":6.5, "y":2.25},
-                {"x":12, "y":2.25},
                 {"x":13, "y":2.25},
                 {"x":0, "y":2.625, "w":1.5},
                 {"x":1.5, "y":2.625},
                 {"x":17, "y":2.625},
                 {"x":18, "y":2.625, "w":1.5},
-                {"x":6.5, "y":3.25},
-                {"x":12, "y":3.25},
+                {"x":6.5, "y":2.75, "h":1.5},
+                {"x":12, "y":2.75, "h":1.5},
                 {"x":3.5, "y":3},
                 {"x":15, "y":3},
                 {"x":2.5, "y":3.125},
diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
index 9c15d9061835..939a9e6d601f 100644
--- a/keyboards/pluckey/keymaps/default/keymap.c
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -78,7 +78,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 #ifdef ENCODER_ENABLE
 
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
         if (clockwise) {
             tap_code(KC_VOLU);
@@ -93,6 +93,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_WH_D);
         }
     }
+    return true;
 }
 
 #endif
\ No newline at end of file
diff --git a/keyboards/pluckey/keymaps/default/readme.md b/keyboards/pluckey/keymaps/default/readme.md
index 7a8804f7eecc..d94d03e5887b 100644
--- a/keyboards/pluckey/keymaps/default/readme.md
+++ b/keyboards/pluckey/keymaps/default/readme.md
@@ -1 +1,4 @@
-# The default keymap for pluckey
+# Default keymap
+
+![keymap](https://gist.githubusercontent.com/floookay/ea7313862e407c9b5aaea3d6ed3ce233/raw/0a37fe682f76bbaa55cbc56527e4666bedbf5761/layout.png)  
+[Keyboard-Layout-Editor](http://www.keyboard-layout-editor.com/#/gists/13c9d00bd0c0c9e3fe3b3d8d98672ef9) [(raw)](https://gist.github.com/floookay/13c9d00bd0c0c9e3fe3b3d8d98672ef9)

From daa60042e9c7e3cb23ab6551227daf4fdb46f184 Mon Sep 17 00:00:00 2001
From: floookay <33830863+floookay@users.noreply.github.com>
Date: Tue, 5 Oct 2021 19:09:58 +0200
Subject: [PATCH 09/13] Apply suggestions from code review

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

diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk
index eddeb3abe7fe..aeb15cbdd199 100644
--- a/keyboards/pluckey/rules.mk
+++ b/keyboards/pluckey/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
 # Build Options
 ENCODER_ENABLE = yes		# Encoder support
 SPLIT_KEYBOARD = yes		# Split keyboard
-BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
@@ -18,5 +18,4 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output

From 435b359c98632b14e643a741604d3c26e22112f6 Mon Sep 17 00:00:00 2001
From: floookay <33830863+floookay@users.noreply.github.com>
Date: Mon, 11 Oct 2021 18:37:14 +0200
Subject: [PATCH 10/13] Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/pluckey/config.h                 |  1 -
 keyboards/pluckey/keymaps/default/keymap.c | 22 ----------------------
 keyboards/pluckey/pluckey.c                | 21 +++++++++++++++++++++
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h
index 4eede5fe15cb..295fe93a8536 100644
--- a/keyboards/pluckey/config.h
+++ b/keyboards/pluckey/config.h
@@ -55,7 +55,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* communication between sides */
 #define USE_SERIAL
-#define SERIAL_USE_MULTI_TRANSACTION
 #define SOFT_SERIAL_PIN D2
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
index 939a9e6d601f..6cede6e88f78 100644
--- a/keyboards/pluckey/keymaps/default/keymap.c
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -75,25 +75,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 }
-
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_WH_U);
-        } else {
-            tap_code(KC_WH_D);
-        }
-    }
-    return true;
-}
-
-#endif
\ No newline at end of file
diff --git a/keyboards/pluckey/pluckey.c b/keyboards/pluckey/pluckey.c
index 1d2cd06f134a..2cfe3422dadb 100644
--- a/keyboards/pluckey/pluckey.c
+++ b/keyboards/pluckey/pluckey.c
@@ -15,3 +15,24 @@
  */
 
 #include "pluckey.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_WH_U);
+        } else {
+            tap_code(KC_WH_D);
+        }
+    }
+    return true;
+}
+#endif

From 1daedd43653ed05ad872a486569c0b826b06ef55 Mon Sep 17 00:00:00 2001
From: floookay <33830863+floookay@users.noreply.github.com>
Date: Tue, 12 Oct 2021 19:13:45 +0200
Subject: [PATCH 11/13] Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/pluckey/pluckey.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/pluckey/pluckey.c b/keyboards/pluckey/pluckey.c
index 2cfe3422dadb..d9025726fd59 100644
--- a/keyboards/pluckey/pluckey.c
+++ b/keyboards/pluckey/pluckey.c
@@ -21,9 +21,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
         if (clockwise) {
-            tap_code(KC_VOLU);
+            tap_code_delay(KC_VOLU, 10);
         } else {
-            tap_code(KC_VOLD);
+            tap_code_delay(KC_VOLD, 10);
         }
     }
     else if (index == 1) {

From 97e010b83af08e34db765a0c23e2bdf0285cd4e0 Mon Sep 17 00:00:00 2001
From: floookay <33830863+floookay@users.noreply.github.com>
Date: Wed, 13 Oct 2021 22:23:06 +0200
Subject: [PATCH 12/13] Apply suggestions from code review

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

diff --git a/keyboards/pluckey/rules.mk b/keyboards/pluckey/rules.mk
index aeb15cbdd199..4f4954434b29 100644
--- a/keyboards/pluckey/rules.mk
+++ b/keyboards/pluckey/rules.mk
@@ -5,8 +5,8 @@ MCU = atmega32u4
 BOOTLOADER = atmel-dfu
 
 # Build Options
-ENCODER_ENABLE = yes		# Encoder support
-SPLIT_KEYBOARD = yes		# Split keyboard
+#   change yes to no to disable
+#
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
@@ -19,3 +19,5 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+SPLIT_KEYBOARD = yes

From af037b5b37d87f8fe0148f9755ef884472420dc9 Mon Sep 17 00:00:00 2001
From: floookay <33830863+floookay@users.noreply.github.com>
Date: Fri, 15 Oct 2021 15:14:35 +0200
Subject: [PATCH 13/13] Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/pluckey/keymaps/default/keymap.c | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
index 6cede6e88f78..31042fc6925c 100644
--- a/keyboards/pluckey/keymaps/default/keymap.c
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -36,32 +36,32 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                        KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  \
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                        KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                        KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR, KC_HOME,      KC_END,  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
-                          KC_LGUI, KC_LALT, MO_LOW,      KC_SPC,    KC_BSPC,            KC_ENT,    KC_SPC,      MO_RAIS, KC_RALT, KC_MEH                     \
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                        KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                        KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                        KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR, KC_HOME,      KC_END,  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+                          KC_LGUI, KC_LALT, MO_LOW,      KC_SPC,    KC_BSPC,            KC_ENT,    KC_SPC,      MO_RAIS, KC_RALT, KC_MEH
     ),
     [_LOWER] = LAYOUT(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                         KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PSCR, \
-        _______, _______, _______, _______, KC_PIPE, KC_UNDS, KC_LPRN,                        KC_RPRN, KC_PLUS, KC_PIPE, _______, _______, _______, _______, \
-        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN,                        KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
-        _______, _______, _______, _______, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, _______, _______, _______, _______, _______, _______, _______, \
-                          _______, _______, MO_CURR,     _______,   KC_DEL,             _______,   _______,     MO_ADJU, _______, _______                    \
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                         KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_PSCR,
+        _______, _______, _______, _______, KC_PIPE, KC_UNDS, KC_LPRN,                        KC_RPRN, KC_PLUS, KC_PIPE, _______, _______, _______, _______,
+        _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LPRN,                        KC_RPRN, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+        _______, _______, _______, _______, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, _______, _______, _______, _______, _______, _______, _______,
+                          _______, _______, MO_CURR,     _______,   KC_DEL,             _______,   _______,     MO_ADJU, _______, _______
     ),
     [_RAISE] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, KC_PGUP, _______, _______, _______, \
-        _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN,                        KC_RPRN, _______, KC_BTN4, KC_UP,   KC_BTN5, _______, _______, \
-        _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LPRN,                        KC_RPRN, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______, \
-        _______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, _______, _______, _______, KC_PGDN, _______, _______, _______, \
-                          _______, _______, MO_ADJU,     _______,   KC_DEL,             _______,   _______,     MO_CURR, _______, _______                    \
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, KC_PGUP, _______, _______, _______,
+        _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN,                        KC_RPRN, _______, KC_BTN4, KC_UP,   KC_BTN5, _______, _______,
+        _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LPRN,                        KC_RPRN, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______,
+        _______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP,      KC_PGDN, _______, _______, _______, KC_PGDN, _______, _______, _______,
+                          _______, _______, MO_ADJU,     _______,   KC_DEL,             _______,   _______,     MO_CURR, _______, _______
     ),
     [_ADJUST] = LAYOUT(
-        KC_SLEP, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, KC_WH_U, _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______, \
-                          _______, _______, _______,     _______,   KC_CLR,            _______,   _______,     _______, _______, _______                     \
+        KC_SLEP, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, KC_WH_U, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                        _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______, _______,
+                          _______, _______, _______,     _______,   KC_CLR,            _______,   _______,     _______, _______, _______
     )
 };