Merge remote-tracking branch 'upstream/master' into develop

17 files changed, 702 insertions, 297 deletions

diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index 0935e1bee1..d960287937 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -1,70 +1,70 @@
-/* Copyright 2021 BB-66

- *

- * 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       0x4D52

-#define PRODUCT_ID      0x0001

-#define DEVICE_VER      0x0001

-#define MANUFACTURER    BB-66

-#define PRODUCT         Minshara Marauder

-

-/* key matrix size */

-#define MATRIX_ROWS 12

-#define MATRIX_COLS 9

-

-/*

- * Keyboard Matrix Assignments

- *

- * Change this to how you wired your keyboard

- * 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 { D0, D4, C6, D7, E6, B4, B5, B7, D5, C7, F1, F0 }

-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 }

-

-#define DIODE_DIRECTION COL2ROW

-

-#define RGB_DI_PIN D1

-#ifdef RGB_DI_PIN

-    #define RGBLED_NUM 20

-    #define RGBLIGHT_HUE_STEP 8

-    #define RGBLIGHT_SAT_STEP 8

-    #define RGBLIGHT_VAL_STEP 8

-    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */

-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */

-/*== all animations enable ==*/

-    #define RGBLIGHT_ANIMATIONS

-// /*== or choose animations ==*/

-//     #define RGBLIGHT_EFFECT_BREATHING

-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD

-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL

-//     #define RGBLIGHT_EFFECT_SNAKE

-//     #define RGBLIGHT_EFFECT_KNIGHT

-//     #define RGBLIGHT_EFFECT_CHRISTMAS

-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT

-//     #define RGBLIGHT_EFFECT_RGB_TEST

-//     #define RGBLIGHT_EFFECT_ALTERNATING

-#endif

-

-// generated by KBFirmware JSON to QMK Parser

-// https://noroadsleft.github.io/kbf_qmk_converter/

+/* Copyright 2021 BB-66
+ *
+ * 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       0x4D52
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    BB-66
+#define PRODUCT         Minshara Marauder
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 9
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * 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 { D0, D4, C6, D7, E6, B4, B5, B7, D5, C7, F1, F0 }
+#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN D1
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 20
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+    #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//     #define RGBLIGHT_EFFECT_BREATHING
+//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//     #define RGBLIGHT_EFFECT_SNAKE
+//     #define RGBLIGHT_EFFECT_KNIGHT
+//     #define RGBLIGHT_EFFECT_CHRISTMAS
+//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//     #define RGBLIGHT_EFFECT_RGB_TEST
+//     #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json
index cfdad5c8dc..f8a0429b2f 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/info.json
@@ -1,108 +1,108 @@
-{

-    "keyboard_name": "Minshara Marauder",

-    "url": "https://imgur.com/a/TvsXpq5",

-    "maintainer": "BB-66",

-    "width": 19.25,

-    "height": 6.5,

-    "layouts": {

-        "LAYOUT": {

-            "layout": [

-                {"label":"K00 (D0,B6)", "x":0, "y":0},

-                {"label":"K01 (D0,B2)", "x":2, "y":0},

-                {"label":"K02 (D0,B3)", "x":3, "y":0},

-                {"label":"K03 (D0,B1)", "x":4, "y":0},

-                {"label":"K04 (D0,F7)", "x":5, "y":0},

-                {"label":"K05 (D0,F6)", "x":6.5, "y":0},

-                {"label":"K06 (D0,F5)", "x":7.5, "y":0},

-                {"label":"K07 (D0,F4)", "x":8.5, "y":0},

-                {"label":"K08 (D0,B0)", "x":9.5, "y":0},

-                {"label":"K68 (B5,B0)", "x":11, "y":0},

-                {"label":"K67 (B5,F4)", "x":12, "y":0},

-                {"label":"K66 (B5,F5)", "x":13, "y":0},

-                {"label":"K65 (B5,F6)", "x":14, "y":0},

-                {"label":"K63 (B5,B1)", "x":15.25, "y":0},

-                {"label":"K62 (B5,B3)", "x":16.25, "y":0},

-                {"label":"K61 (B5,B2)", "x":17.25, "y":0},

-                {"label":"K60 (B5,B6)", "x":18.25, "y":0},

-                {"label":"K10 (D4,B6)", "x":0, "y":1.5},

-                {"label":"K11 (D4,B2)", "x":1, "y":1.5},

-                {"label":"K12 (D4,B3)", "x":2, "y":1.5},

-                {"label":"K13 (D4,B1)", "x":3, "y":1.5},

-                {"label":"K14 (D4,F7)", "x":4, "y":1.5},

-                {"label":"K15 (D4,F6)", "x":5, "y":1.5},

-                {"label":"K16 (D4,F5)", "x":6, "y":1.5},

-                {"label":"K17 (D4,F4)", "x":7, "y":1.5},

-                {"label":"K18 (D4,B0)", "x":8, "y":1.5},

-                {"label":"K78 (B7,B0)", "x":9, "y":1.5},

-                {"label":"K77 (B7,F4)", "x":10, "y":1.5},

-                {"label":"K76 (B7,F5)", "x":11, "y":1.5},

-                {"label":"K75 (B7,F6)", "x":12, "y":1.5},

-                {"label":"K74 (B7,F7)", "x":13, "y":1.5, "w":2},

-                {"label":"K73 (B7,B1)", "x":15.25, "y":1.5},

-                {"label":"K72 (B7,B3)", "x":16.25, "y":1.5},

-                {"label":"K71 (B7,B2)", "x":17.25, "y":1.5},

-                {"label":"K70 (B7,B6)", "x":18.25, "y":1.5},

-                {"label":"K20 (C6,B6)", "x":0, "y":2.5, "w":1.5},

-                {"label":"K21 (C6,B2)", "x":1.5, "y":2.5},

-                {"label":"K22 (C6,B3)", "x":2.5, "y":2.5},

-                {"label":"K23 (C6,B1)", "x":3.5, "y":2.5},

-                {"label":"K24 (C6,F7)", "x":4.5, "y":2.5},

-                {"label":"K25 (C6,F6)", "x":5.5, "y":2.5},

-                {"label":"K26 (C6,F5)", "x":6.5, "y":2.5},

-                {"label":"K27 (C6,F4)", "x":7.5, "y":2.5},

-                {"label":"K28 (C6,B0)", "x":8.5, "y":2.5},

-                {"label":"K88 (D5,B0)", "x":9.5, "y":2.5},

-                {"label":"K87 (D5,F4)", "x":10.5, "y":2.5},

-                {"label":"K86 (D5,F5)", "x":11.5, "y":2.5},

-                {"label":"K85 (D5,F6)", "x":12.5, "y":2.5},

-                {"label":"K84 (D5,F7)", "x":13.5, "y":2.5, "w":1.5},

-                {"label":"K83 (D5,B1)", "x":15.25, "y":2.5},

-                {"label":"K82 (D5,B3)", "x":16.25, "y":2.5},

-                {"label":"K81 (D5,B2)", "x":17.25, "y":2.5},

-                {"label":"K80 (D5,B6)", "x":18.25, "y":2.5, "h":2},

-                {"label":"K30 (D7,B6)", "x":0, "y":3.5, "w":1.75},

-                {"label":"K31 (D7,B2)", "x":1.75, "y":3.5},

-                {"label":"K32 (D7,B3)", "x":2.75, "y":3.5},

-                {"label":"K33 (D7,B1)", "x":3.75, "y":3.5},

-                {"label":"K34 (D7,F7)", "x":4.75, "y":3.5},

-                {"label":"K35 (D7,F6)", "x":5.75, "y":3.5},

-                {"label":"K36 (D7,F5)", "x":6.75, "y":3.5},

-                {"label":"K37 (D7,F4)", "x":7.75, "y":3.5},

-                {"label":"K38 (D7,B0)", "x":8.75, "y":3.5},

-                {"label":"K98 (C7,B0)", "x":9.75, "y":3.5},

-                {"label":"K97 (C7,F4)", "x":10.75, "y":3.5},

-                {"label":"K96 (C7,F5)", "x":11.75, "y":3.5},

-                {"label":"K95 (C7,F6)", "x":12.75, "y":3.5, "w":2.25},

-                {"label":"K93 (C7,B1)", "x":15.25, "y":3.5},

-                {"label":"K92 (C7,B3)", "x":16.25, "y":3.5},

-                {"label":"K91 (C7,B2)", "x":17.25, "y":3.5},

-                {"label":"K40 (E6,B6)", "x":0, "y":4.5, "w":2.25},

-                {"label":"K41 (E6,B2)", "x":2.25, "y":4.5},

-                {"label":"K42 (E6,B3)", "x":3.25, "y":4.5},

-                {"label":"K43 (E6,B1)", "x":4.25, "y":4.5},

-                {"label":"K44 (E6,F7)", "x":5.25, "y":4.5},

-                {"label":"K45 (E6,F6)", "x":6.25, "y":4.5},

-                {"label":"K46 (E6,F5)", "x":7.25, "y":4.5},

-                {"label":"K47 (E6,F4)", "x":8.25, "y":4.5},

-                {"label":"K48 (E6,B0)", "x":9.25, "y":4.5},

-                {"label":"KA8 (F1,B0)", "x":10.25, "y":4.5},

-                {"label":"KA7 (F1,F4)", "x":11.25, "y":4.5},

-                {"label":"KA6 (F1,F5)", "x":12.25, "y":4.5, "w":2.75},

-                {"label":"KA3 (F1,B1)", "x":15.25, "y":4.5},

-                {"label":"KA2 (F1,B3)", "x":16.25, "y":4.5},

-                {"label":"KA1 (F1,B2)", "x":17.25, "y":4.5},

-                {"label":"KA0 (F1,B6)", "x":18.25, "y":4.5, "h":2},

-                {"label":"K50 (B4,B6)", "x":0, "y":5.5, "w":1.5},

-                {"label":"K51 (B4,B2)", "x":1.5, "y":5.5},

-                {"label":"K52 (B4,B3)", "x":2.5, "y":5.5, "w":1.5},

-                {"label":"K56 (B4,F5)", "x":4, "y":5.5, "w":7},

-                {"label":"KB7 (F0,F4)", "x":11, "y":5.5, "w":1.5},

-                {"label":"KB6 (F0,F5)", "x":12.5, "y":5.5},

-                {"label":"KB4 (F0,F7)", "x":13.5, "y":5.5, "w":1.5},

-                {"label":"KB3 (F0,B1)", "x":15.25, "y":5.5, "w":2},

-                {"label":"KB1 (F0,B2)", "x":17.25, "y":5.5}

-            ]

-        }

-    }

-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"

-}

+{
+    "keyboard_name": "Minshara Marauder",
+    "url": "https://imgur.com/a/TvsXpq5",
+    "maintainer": "BB-66",
+    "width": 19.25,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D0,B6)", "x":0, "y":0},
+                {"label":"K01 (D0,B2)", "x":2, "y":0},
+                {"label":"K02 (D0,B3)", "x":3, "y":0},
+                {"label":"K03 (D0,B1)", "x":4, "y":0},
+                {"label":"K04 (D0,F7)", "x":5, "y":0},
+                {"label":"K05 (D0,F6)", "x":6.5, "y":0},
+                {"label":"K06 (D0,F5)", "x":7.5, "y":0},
+                {"label":"K07 (D0,F4)", "x":8.5, "y":0},
+                {"label":"K08 (D0,B0)", "x":9.5, "y":0},
+                {"label":"K68 (B5,B0)", "x":11, "y":0},
+                {"label":"K67 (B5,F4)", "x":12, "y":0},
+                {"label":"K66 (B5,F5)", "x":13, "y":0},
+                {"label":"K65 (B5,F6)", "x":14, "y":0},
+                {"label":"K63 (B5,B1)", "x":15.25, "y":0},
+                {"label":"K62 (B5,B3)", "x":16.25, "y":0},
+                {"label":"K61 (B5,B2)", "x":17.25, "y":0},
+                {"label":"K60 (B5,B6)", "x":18.25, "y":0},
+                {"label":"K10 (D4,B6)", "x":0, "y":1.5},
+                {"label":"K11 (D4,B2)", "x":1, "y":1.5},
+                {"label":"K12 (D4,B3)", "x":2, "y":1.5},
+                {"label":"K13 (D4,B1)", "x":3, "y":1.5},
+                {"label":"K14 (D4,F7)", "x":4, "y":1.5},
+                {"label":"K15 (D4,F6)", "x":5, "y":1.5},
+                {"label":"K16 (D4,F5)", "x":6, "y":1.5},
+                {"label":"K17 (D4,F4)", "x":7, "y":1.5},
+                {"label":"K18 (D4,B0)", "x":8, "y":1.5},
+                {"label":"K78 (B7,B0)", "x":9, "y":1.5},
+                {"label":"K77 (B7,F4)", "x":10, "y":1.5},
+                {"label":"K76 (B7,F5)", "x":11, "y":1.5},
+                {"label":"K75 (B7,F6)", "x":12, "y":1.5},
+                {"label":"K74 (B7,F7)", "x":13, "y":1.5, "w":2},
+                {"label":"K73 (B7,B1)", "x":15.25, "y":1.5},
+                {"label":"K72 (B7,B3)", "x":16.25, "y":1.5},
+                {"label":"K71 (B7,B2)", "x":17.25, "y":1.5},
+                {"label":"K70 (B7,B6)", "x":18.25, "y":1.5},
+                {"label":"K20 (C6,B6)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (C6,B2)", "x":1.5, "y":2.5},
+                {"label":"K22 (C6,B3)", "x":2.5, "y":2.5},
+                {"label":"K23 (C6,B1)", "x":3.5, "y":2.5},
+                {"label":"K24 (C6,F7)", "x":4.5, "y":2.5},
+                {"label":"K25 (C6,F6)", "x":5.5, "y":2.5},
+                {"label":"K26 (C6,F5)", "x":6.5, "y":2.5},
+                {"label":"K27 (C6,F4)", "x":7.5, "y":2.5},
+                {"label":"K28 (C6,B0)", "x":8.5, "y":2.5},
+                {"label":"K88 (D5,B0)", "x":9.5, "y":2.5},
+                {"label":"K87 (D5,F4)", "x":10.5, "y":2.5},
+                {"label":"K86 (D5,F5)", "x":11.5, "y":2.5},
+                {"label":"K85 (D5,F6)", "x":12.5, "y":2.5},
+                {"label":"K84 (D5,F7)", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"K83 (D5,B1)", "x":15.25, "y":2.5},
+                {"label":"K82 (D5,B3)", "x":16.25, "y":2.5},
+                {"label":"K81 (D5,B2)", "x":17.25, "y":2.5},
+                {"label":"K80 (D5,B6)", "x":18.25, "y":2.5, "h":2},
+                {"label":"K30 (D7,B6)", "x":0, "y":3.5, "w":1.75},
+                {"label":"K31 (D7,B2)", "x":1.75, "y":3.5},
+                {"label":"K32 (D7,B3)", "x":2.75, "y":3.5},
+                {"label":"K33 (D7,B1)", "x":3.75, "y":3.5},
+                {"label":"K34 (D7,F7)", "x":4.75, "y":3.5},
+                {"label":"K35 (D7,F6)", "x":5.75, "y":3.5},
+                {"label":"K36 (D7,F5)", "x":6.75, "y":3.5},
+                {"label":"K37 (D7,F4)", "x":7.75, "y":3.5},
+                {"label":"K38 (D7,B0)", "x":8.75, "y":3.5},
+                {"label":"K98 (C7,B0)", "x":9.75, "y":3.5},
+                {"label":"K97 (C7,F4)", "x":10.75, "y":3.5},
+                {"label":"K96 (C7,F5)", "x":11.75, "y":3.5},
+                {"label":"K95 (C7,F6)", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"K93 (C7,B1)", "x":15.25, "y":3.5},
+                {"label":"K92 (C7,B3)", "x":16.25, "y":3.5},
+                {"label":"K91 (C7,B2)", "x":17.25, "y":3.5},
+                {"label":"K40 (E6,B6)", "x":0, "y":4.5, "w":2.25},
+                {"label":"K41 (E6,B2)", "x":2.25, "y":4.5},
+                {"label":"K42 (E6,B3)", "x":3.25, "y":4.5},
+                {"label":"K43 (E6,B1)", "x":4.25, "y":4.5},
+                {"label":"K44 (E6,F7)", "x":5.25, "y":4.5},
+                {"label":"K45 (E6,F6)", "x":6.25, "y":4.5},
+                {"label":"K46 (E6,F5)", "x":7.25, "y":4.5},
+                {"label":"K47 (E6,F4)", "x":8.25, "y":4.5},
+                {"label":"K48 (E6,B0)", "x":9.25, "y":4.5},
+                {"label":"KA8 (F1,B0)", "x":10.25, "y":4.5},
+                {"label":"KA7 (F1,F4)", "x":11.25, "y":4.5},
+                {"label":"KA6 (F1,F5)", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"KA3 (F1,B1)", "x":15.25, "y":4.5},
+                {"label":"KA2 (F1,B3)", "x":16.25, "y":4.5},
+                {"label":"KA1 (F1,B2)", "x":17.25, "y":4.5},
+                {"label":"KA0 (F1,B6)", "x":18.25, "y":4.5, "h":2},
+                {"label":"K50 (B4,B6)", "x":0, "y":5.5, "w":1.5},
+                {"label":"K51 (B4,B2)", "x":1.5, "y":5.5},
+                {"label":"K52 (B4,B3)", "x":2.5, "y":5.5, "w":1.5},
+                {"label":"K56 (B4,F5)", "x":4, "y":5.5, "w":7},
+                {"label":"KB7 (F0,F4)", "x":11, "y":5.5, "w":1.5},
+                {"label":"KB6 (F0,F5)", "x":12.5, "y":5.5},
+                {"label":"KB4 (F0,F7)", "x":13.5, "y":5.5, "w":1.5},
+                {"label":"KB3 (F0,B1)", "x":15.25, "y":5.5, "w":2},
+                {"label":"KB1 (F0,B2)", "x":17.25, "y":5.5}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/handwired/marauder/keymaps/default/keymap.c b/keyboards/handwired/marauder/keymaps/default/keymap.c
index f4a3cbfc22..932138e27c 100644
--- a/keyboards/handwired/marauder/keymaps/default/keymap.c
+++ b/keyboards/handwired/marauder/keymaps/default/keymap.c
@@ -1,29 +1,29 @@
-/* Copyright 2021 BB-66

- *

- * 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

-

-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-    [0] = LAYOUT(

-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PAUS, KC_PSCR, KC_SLCK, KC_ESC,

-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_NLCK, KC_KP_SLSH, KC__KP_ASTR, KC_KP_MINS,

-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,

-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_KP_4, KC_KP_5, KC_CP_6,

-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_KP_1, KC_KP_2, KC_KP_3, KC__PENT,

-        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_KP_0,          KC_KP_DOT

-    ),

-

-};

+/* Copyright 2021 BB-66
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PAUS, KC_PSCR, KC_SLCK, KC_ESC,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_P0,            KC_PDOT
+    ),
+
+};
diff --git a/keyboards/handwired/marauder/marauder.c b/keyboards/handwired/marauder/marauder.c
index dcfe75fd3c..2b2039f105 100644
--- a/keyboards/handwired/marauder/marauder.c
+++ b/keyboards/handwired/marauder/marauder.c
@@ -1,20 +1,20 @@
-/* Copyright 2021 BB-66

- *

- * 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 "marauder.h"

-

-// generated by KBFirmware JSON to QMK Parser

-// https://noroadsleft.github.io/kbf_qmk_converter/

+/* Copyright 2021 BB-66
+ *
+ * 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 "marauder.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/marauder/marauder.h b/keyboards/handwired/marauder/marauder.h
index ee098dd5cb..fc97b1d642 100644
--- a/keyboards/handwired/marauder/marauder.h
+++ b/keyboards/handwired/marauder/marauder.h
@@ -1,44 +1,44 @@
-/* Copyright 2021 BB-66

- *

- * 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"

-

-#define LAYOUT( \

-    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K68, K67, K66, K65,  K63, K62, K61, K60,  \

-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K76, K75, K74,       K73, K72, K71, K70,  \

-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K86, K85, K84,     K83, K82, K81, K80,  \

-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K96, K95,         K93, K92, K91,       \

-    K40,       K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA6,           KA3, KA2, KA1, KA0,  \

-    K50,   K51, K52,                  K56,                 KB7,   KB6, KB4,     KB3,      KB1        \

-) { \

-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \

-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \

-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \

-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \

-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \

-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO }, \

-    { K60,   K61,   K62,   K63,   KC_NO, K65,   K66,   K67,   K68   }, \

-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77,   K78   }, \

-    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \

-    { KC_NO, K91,   K92,   K93,   KC_NO, K95,   K96,   K97,   K98   }, \

-    { KA0,   KA1,   KA2,   KA3,   KC_NO, KC_NO, KA6,   KA7,   KA8   }, \

-    { KC_NO, KB1,   KC_NO, KB3,   KB4,   KC_NO, KB6,   KB7,   KC_NO }, \

-}

-

-// generated by KBFirmware JSON to QMK Parser

-// https://noroadsleft.github.io/kbf_qmk_converter/

+/* Copyright 2021 BB-66
+ *
+ * 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"
+
+#define LAYOUT( \
+    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K68, K67, K66, K65,  K63, K62, K61, K60,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K76, K75, K74,       K73, K72, K71, K70,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K86, K85, K84,     K83, K82, K81, K80,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K96, K95,         K93, K92, K91,       \
+    K40,       K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA6,           KA3, KA2, KA1, KA0,  \
+    K50,   K51, K52,                  K56,                 KB7,   KB6, KB4,     KB3,      KB1        \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO }, \
+    { K60,   K61,   K62,   K63,   KC_NO, K65,   K66,   K67,   K68   }, \
+    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77,   K78   }, \
+    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
+    { KC_NO, K91,   K92,   K93,   KC_NO, K95,   K96,   K97,   K98   }, \
+    { KA0,   KA1,   KA2,   KA3,   KC_NO, KC_NO, KA6,   KA7,   KA8   }, \
+    { KC_NO, KB1,   KC_NO, KB3,   KB4,   KC_NO, KB6,   KB7,   KC_NO }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/marauder/readme.md b/keyboards/handwired/marauder/readme.md
new file mode 100644
index 0000000000..1a0150159f
--- /dev/null
+++ b/keyboards/handwired/marauder/readme.md
@@ -0,0 +1,18 @@
+# Marauder
+
+90% hand-wired mechanical keyboard in an old Razer case; built around an Elite-C v3.1 controller.
+
+[Build Log](https://imgur.com/a/TvsXpq5)
+
+* Keyboard Maintainer: [%YOUR_NAME%](https://github.com/BB-66)
+* Hardware Supported: Elite-C, Razer Marauder
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/marauder:default
+
+Flashing example for this keyboard:
+
+    make handwired/marauder: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/handwired/marauder/rules.mk b/keyboards/handwired/marauder/rules.mk
index 44b2935192..1619f95374 100644
--- a/keyboards/handwired/marauder/rules.mk
+++ b/keyboards/handwired/marauder/rules.mk
@@ -1,26 +1,26 @@
-# MCU name

-MCU = atmega32u4

-

-# Bootloader selection

-BOOTLOADER = atmel-dfu

-

-# Build Options

-#   change yes to no to disable

-#

-BOOTMAGIC_ENABLE = lite     # 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 = yes        # 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

-LTO_ENABLE = yes            # Link Time Optimization, shrinks the output slightly

-

-# generated by KBFirmware JSON to QMK Parser

-# https://noroadsleft.github.io/kbf_qmk_converter/

+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # 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 = yes        # 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
+LTO_ENABLE = yes            # Link Time Optimization, shrinks the output slightly
+
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/neopad/config.h b/keyboards/neopad/config.h
new file mode 100755
index 0000000000..79798b1d66
--- /dev/null
+++ b/keyboards/neopad/config.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2021 rookiebwoy
+
+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       0xFEED
+#define PRODUCT_ID      0x0913
+#define MANUFACTURER    rookiebwoy
+#define PRODUCT         neopad
+
+/* Column/Row IO definitions */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Reduce tapdance required taps from 5 to 2 */
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/neopad/readme.md b/keyboards/neopad/readme.md
new file mode 100644
index 0000000000..9e83e9bb6d
--- /dev/null
+++ b/keyboards/neopad/readme.md
@@ -0,0 +1,25 @@
+# Neopad
+
+Neopad is a little macropad with four switches and two rotary encoders, made by through hole components only.
+_Actually the number of switches is six, because even the encoder are allowed to click._
+
+![Neopad](https://i.imgur.com/TgOkj2Fh.jpg "Neopad first proto")
+
+The Neopad in the photo above is the first prototype. See the project repository for revision 1 update and KiCad files.
+
+* Keyboard maintainer: [rookiebwoy](https://github.com/rookiebwoy)
+* Hardware supported: ProMicro, _Elite-C (not tested)_
+* Project repository: [Neopad on github](https://github.com/rookiebwoy/neopad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make neopad/rev1:default
+
+Flashing example for this keyboard:
+
+    make neopad/rev1:default:flash
+
+When asked by the terminal, press the dedicated `RESET` button (the one above the 2 LEDs) to enter the bootloader and let the OS detects the device.
+
+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 [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
diff --git a/keyboards/neopad/rev1/config.h b/keyboards/neopad/rev1/config.h
new file mode 100755
index 0000000000..92d3392715
--- /dev/null
+++ b/keyboards/neopad/rev1/config.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2021 rookiebwoy
+
+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 DEVICE_VER      0x0010
+
+/* Column/Row IO definitions */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 3
+#define MATRIX_ROW_PINS { F4, F5 }
+#define MATRIX_COL_PINS { B3, B2, B6 }
+#define UNUSED_PINS
+
+/* Dual rotary encoders */
+#define ENCODERS_PAD_A { D1, D4 }
+#define ENCODERS_PAD_B { D0, C6 }
+
+/* Onboard LEDs */
+#define LED_00 F6
+#define LED_01 F7
+
+/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json
new file mode 100755
index 0000000000..44d5babe44
--- /dev/null
+++ b/keyboards/neopad/rev1/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "neopad",
+    "keyboard_folder": "neopad/rev1",
+    "url": "https://github.com/rookiebwoy/neopad)",
+    "maintainer": "rookiebwoy",
+    "width": 3,
+    "height": 2,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
+                                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/neopad/rev1/keymaps/default/keymap.c b/keyboards/neopad/rev1/keymaps/default/keymap.c
new file mode 100755
index 0000000000..061e26d43e
--- /dev/null
+++ b/keyboards/neopad/rev1/keymaps/default/keymap.c
@@ -0,0 +1,153 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+            LAYER 0 - MUSIC
+    /-----------------------------`
+    |  TO(1)  |  stop   |   mute  |	L ENC: prev/next song
+    |---------|---------|---------|
+    |   prev  |  play   |   next  |	R ENC: vol up/down
+    \-----------------------------'
+    */
+    [0] = LAYOUT(
+                TO(1),     KC_MSTP,  KC_MUTE,
+    		    KC_MPRV,   KC_MPLY,  KC_MNXT
+    ),
+
+    /*
+            LAYER 1 - MOVEMENT IN WINDOWS
+    /---------------------------------------`
+    |    TO(2)    | maximize | show desktop | L ENC: change desktop
+    |-------------|----------|--------------|
+    | move window | minimize | move window  | R ENC: change browser tab + change explorer window
+    \---------------------------------------'
+    */
+    [1] = LAYOUT(
+				TO(2),     		LGUI(KC_UP),    LGUI(KC_D),
+				LGUI(KC_LEFT),	LGUI(KC_DOWN),  LGUI(KC_RIGHT)
+    ),
+
+    /*
+            LAYER 2 - SHORTCUT
+    /------------------------------`
+    |  TO(3)  |   esc   | task man | L ENC: redo/undo
+    |---------|---------|----------|
+    |   cut   |   copy  |   paste  | R ENC: mouse wheel up/down
+    \------------------------------'
+    */
+    [2] = LAYOUT(
+                TO(3),     		KC_ESC,    		LCTL(LSFT(KC_ESC)),
+    		    LCTL(KC_X),		LCTL(KC_C),     LCTL(KC_V)
+    ),
+
+    /*
+            LAYER 3 - AUDACITY
+    /-----------------------------`
+    |  TO(0)  |   REC   |   canc  |	L ENC: pan right/left
+    |---------|---------|---------|
+    |   ctrl  |   play  |  pause  |	R ENC: mouse wheel up/down
+    \-----------------------------'
+    */
+    [3] = LAYOUT(
+                TO(0),     	LSFT(KC_R),    	KC_DEL,
+    		    KC_LCTL,	KC_SPC,         KC_P
+    ),
+
+};
+
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {											/* LEFT ENCODER */
+        switch (get_highest_layer(layer_state)) {
+            case 0:
+                // layer 0 - next song (CW) and previous (CCW)
+                if (clockwise) {
+                    tap_code(KC_MNXT);
+                } else {
+                    tap_code(KC_MPRV);
+                }
+                break;
+
+            case 1:
+                // layer 1 - change desktop right (CW) and left (CCW)
+                if (clockwise) {
+                    tap_code16(LCTL(LGUI(KC_RIGHT)));
+                } else {
+                    tap_code16(LCTL(LGUI(KC_LEFT)));
+                }
+                break;
+
+            case 2:
+                // layer 2 - redo (CW) and undo (CCW)
+                if (clockwise) {
+                    tap_code16(LCTL(KC_Y));
+                } else {
+                    tap_code16(LCTL(KC_Z));
+                }
+                break;
+
+	    case 3:
+                // layer 3 - pan right (CW) and left (CCW)
+                if (clockwise) {
+                    tap_code(KC_WH_R);
+                } else {
+                    tap_code(KC_WH_L);
+                }
+                break;
+        }
+
+    } else if (index == 1) {									/* RIGHT ENCODER */
+        switch (get_highest_layer(layer_state)) {
+            case 0:
+                // layer 0 - volume up (CW) and down (CCW)
+                if (clockwise) {
+                    tap_code(KC_VOLU);
+                } else {
+                    tap_code(KC_VOLD);
+                }
+                break;
+
+            case 1:
+                // layer 1 - change browser tab (CW) and change explorer window (CCW)
+                if (clockwise) {
+                    tap_code16(LCTL(KC_TAB));
+                } else {
+                    tap_code16(LALT(LSFT(KC_TAB)));
+                }
+                break;
+
+            case 2:
+                // layer 2 - wheel up (CW) and down (CCW)
+                if (clockwise) {
+                    tap_code(KC_WH_U);
+                } else {
+                    tap_code(KC_WH_D);
+                }
+                break;
+
+            case 3:
+                // layer 3 - wheel up (CW) and down (CCW)
+                if (clockwise) {
+                    tap_code(KC_WH_U);
+                } else {
+                    tap_code(KC_WH_D);
+                }
+                break;
+        }
+    }
+}
diff --git a/keyboards/neopad/rev1/readme.md b/keyboards/neopad/rev1/readme.md
new file mode 100644
index 0000000000..1265922722
--- /dev/null
+++ b/keyboards/neopad/rev1/readme.md
@@ -0,0 +1,5 @@
+# Neopad rev1
+
+Final revision of the Neopad macropad. For in depth look please go to [project repository](https://github.com/rookiebwoy/neopad).
+
+
diff --git a/keyboards/neopad/rev1/rev1.c b/keyboards/neopad/rev1/rev1.c
new file mode 100755
index 0000000000..20e2c4d055
--- /dev/null
+++ b/keyboards/neopad/rev1/rev1.c
@@ -0,0 +1,61 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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 "rev1.h"
+
+void keyboard_pre_init_kb(void) {
+    // Set LED IO as outputs
+    setPinOutput(LED_00);
+    setPinOutput(LED_01);
+    keyboard_pre_init_user();
+}
+
+void shutdown_user() {
+    // Shutdown LEDs
+    writePinLow(LED_00);
+    writePinLow(LED_01);
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+
+    // Layer LEDs act as binary indication of current layer
+    uint8_t layer = get_highest_layer(state);
+    writePin(LED_00, layer & 0b1);
+    writePin(LED_01, (layer >> 1) & 0b1);
+    return state;
+}
+
+// Optional override functions below.
+// You can leave any or all of these undefined.
+// These are only required if you want to perform custom actions.
+
+void matrix_init_kb(void) {
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+    uint8_t led_delay_ms = 80;
+    for (int i = 0; i < 2; i++) {
+        writePinHigh(LED_00);
+        writePinHigh(LED_01);
+        wait_ms(led_delay_ms);
+        writePinLow(LED_00);
+        writePinLow(LED_01);
+        if (i < 1) {
+            wait_ms(led_delay_ms);
+        }
+    }
+
+    matrix_init_user();
+}
diff --git a/keyboards/neopad/rev1/rev1.h b/keyboards/neopad/rev1/rev1.h
new file mode 100755
index 0000000000..87b9405bb1
--- /dev/null
+++ b/keyboards/neopad/rev1/rev1.h
@@ -0,0 +1,26 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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"
+
+#define LAYOUT( \
+	       k00, k01, k02, \
+	       k10, k11, k12  \
+) \
+{ \
+    { k00, k01, k02 }, \
+    { k10, k11, k12 }  \
+}
diff --git a/keyboards/neopad/rev1/rules.mk b/keyboards/neopad/rev1/rules.mk
new file mode 100755
index 0000000000..309e3d48c0
--- /dev/null
+++ b/keyboards/neopad/rev1/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # 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 = 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
+
+ENCODER_ENABLE = yes
+KEY_LOCK_ENABLE = yes
diff --git a/keyboards/neopad/rules.mk b/keyboards/neopad/rules.mk
new file mode 100755
index 0000000000..8fc1afe955
--- /dev/null
+++ b/keyboards/neopad/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = neopad/rev1