diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
index 75b7fef89b59..36b81a4e8e0f 100644
--- a/docs/feature_advanced_keycodes.md
+++ b/docs/feature_advanced_keycodes.md
@@ -2,24 +2,27 @@
These allow you to combine a modifier with a keycode. When pressed, the keydown event for the modifier, then `kc` will be sent. On release, the keyup event for `kc`, then the modifier will be sent.
-|Key |Aliases |Description |
-|----------|-------------------------------|------------------------------------------------------|
-|`LCTL(kc)`|`C(kc)` |Hold Left Control and press `kc` |
-|`LSFT(kc)`|`S(kc)` |Hold Left Shift and press `kc` |
-|`LALT(kc)`|`A(kc)`, `LOPT(kc)` |Hold Left Alt and press `kc` |
-|`LGUI(kc)`|`G(kc)`, `LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc` |
-|`RCTL(kc)`| |Hold Right Control and press `kc` |
-|`RSFT(kc)`| |Hold Right Shift and press `kc` |
-|`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)` |Hold Right Alt and press `kc` |
-|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)` |Hold Right GUI and press `kc` |
-|`SGUI(kc)`|`SCMD(kc)`, `SWIN(kc)` |Hold Left Shift and GUI and press `kc` |
-|`LCA(kc)` | |Hold Left Control and Alt and press `kc` |
-|`LSA(kc)` | |Hold Left Shift and Left Alt and press `kc` |
-|`RSA(kc)` |`SAGR(kc)` |Hold Right Shift and Right Alt (AltGr) and press `kc` |
-|`RCS(kc)` | |Hold Right Control and Right Shift and press `kc` |
-|`LCAG(kc)`| |Hold Left Control, Alt and GUI and press `kc` |
-|`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` |
-|`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc` |
+|Key |Aliases |Description |
+|----------|----------------------------------|------------------------------------------------------|
+|`LCTL(kc)`|`C(kc)` |Hold Left Control and press `kc` |
+|`LSFT(kc)`|`S(kc)` |Hold Left Shift and press `kc` |
+|`LALT(kc)`|`A(kc)`, `LOPT(kc)` |Hold Left Alt and press `kc` |
+|`LGUI(kc)`|`G(kc)`, `LCMD(kc)`, `LWIN(kc)` |Hold Left GUI and press `kc` |
+|`RCTL(kc)`| |Hold Right Control and press `kc` |
+|`RSFT(kc)`| |Hold Right Shift and press `kc` |
+|`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)` |Hold Right Alt and press `kc` |
+|`RGUI(kc)`|`RCMD(kc)`, `LWIN(kc)` |Hold Right GUI and press `kc` |
+|`LSG(kc)` |`SGUI(kc)`, `SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and GUI and press `kc` |
+|`LAG(kc)` | |Hold Left Alt and Left GUI and press `kc` |
+|`RSG(kc)` | |Hold Right Shift and Right GUI and press `kc` |
+|`RAG(kc)` | |Hold Right Alt and Right GUI and press `kc` |
+|`LCA(kc)` | |Hold Left Control and Alt and press `kc` |
+|`LSA(kc)` | |Hold Left Shift and Left Alt and press `kc` |
+|`RSA(kc)` |`SAGR(kc)` |Hold Right Shift and Right Alt (AltGr) and press `kc` |
+|`RCS(kc)` | |Hold Right Control and Right Shift and press `kc` |
+|`LCAG(kc)`| |Hold Left Control, Alt and GUI and press `kc` |
+|`MEH(kc)` | |Hold Left Control, Shift and Alt and press `kc` |
+|`HYPR(kc)`| |Hold Left Control, Shift, Alt and GUI and press `kc` |
You can also chain them, for example `LCTL(LALT(KC_DEL))` or `C(A(KC_DEL))` makes a key that sends Control+Alt+Delete with a single keypress.
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 58df153031df..9bfa79403d66 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -68,7 +68,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
- bare minimum required code for a board to boot into QMK should be present
- initialisation code for the matrix and critical devices
- mirroring existing functionality of a commercial board (like custom keycodes and special animations etc.) should be handled through non-`default` keymaps
- - VIAL-related files or changes will not be accepted, as they are not used by QMK firmware (no VIAL-specific core code has been submitted or merged)
+ - Vial-related files or changes will not be accepted, as they are not used by QMK firmware (no Vial-specific core code has been submitted or merged)
- `keyboard.c`
- empty `xxxx_xxxx_kb()` or other weak-defined default implemented functions removed
- commented-out functions removed too
diff --git a/keyboards/4pplet/eagle_viper_rep/info.json b/keyboards/4pplet/eagle_viper_rep/info.json
new file mode 100644
index 000000000000..dced671bcad0
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/info.json
@@ -0,0 +1,77 @@
+{
+ "keyboard_name": "Eagle/Viper Rep",
+ "url": "https://github.com/4pplet/eagle_viper_rep",
+ "maintainer": "4pplet",
+ "width": 15,
+ "height": 5,
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ { "label": "Esc", "x": 0, "y": 0 },
+ { "label": "!", "x": 1, "y": 0 },
+ { "label": "@", "x": 2, "y": 0 },
+ { "label": "#", "x": 3, "y": 0 },
+ { "label": "$", "x": 4, "y": 0 },
+ { "label": "%", "x": 5, "y": 0 },
+ { "label": "^", "x": 6, "y": 0 },
+ { "label": "&", "x": 7, "y": 0 },
+ { "label": "*", "x": 8, "y": 0 },
+ { "label": "(", "x": 9, "y": 0 },
+ { "label": ")", "x": 10, "y": 0 },
+ { "label": "_", "x": 11, "y": 0 },
+ { "label": "+", "x": 12, "y": 0 },
+ { "label": "|", "x": 13, "y": 0 },
+ { "label": "~", "x": 14, "y": 0 },
+ { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
+ { "label": "Q", "x": 1.5, "y": 1 },
+ { "label": "W", "x": 2.5, "y": 1 },
+ { "label": "E", "x": 3.5, "y": 1 },
+ { "label": "R", "x": 4.5, "y": 1 },
+ { "label": "T", "x": 5.5, "y": 1 },
+ { "label": "Y", "x": 6.5, "y": 1 },
+ { "label": "U", "x": 7.5, "y": 1 },
+ { "label": "I", "x": 8.5, "y": 1 },
+ { "label": "O", "x": 9.5, "y": 1 },
+ { "label": "P", "x": 10.5, "y": 1 },
+ { "label": "{", "x": 11.5, "y": 1 },
+ { "label": "}", "x": 12.5, "y": 1 },
+ { "label": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 },
+ { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
+ { "label": "A", "x": 1.75, "y": 2 },
+ { "label": "S", "x": 2.75, "y": 2 },
+ { "label": "D", "x": 3.75, "y": 2 },
+ { "label": "F", "x": 4.75, "y": 2 },
+ { "label": "G", "x": 5.75, "y": 2 },
+ { "label": "H", "x": 6.75, "y": 2 },
+ { "label": "J", "x": 7.75, "y": 2 },
+ { "label": "K", "x": 8.75, "y": 2 },
+ { "label": "L", "x": 9.75, "y": 2 },
+ { "label": ":", "x": 10.75, "y": 2 },
+ { "label": "\"", "x": 11.75, "y": 2 },
+ { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
+ { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
+ { "label": "|", "x": 1.25, "y": 3 },
+ { "label": "Z", "x": 2.25, "y": 3 },
+ { "label": "X", "x": 3.25, "y": 3 },
+ { "label": "C", "x": 4.25, "y": 3 },
+ { "label": "V", "x": 5.25, "y": 3 },
+ { "label": "B", "x": 6.25, "y": 3 },
+ { "label": "N", "x": 7.25, "y": 3 },
+ { "label": "M", "x": 8.25, "y": 3 },
+ { "label": "<", "x": 9.25, "y": 3 },
+ { "label": ">", "x": 10.25, "y": 3 },
+ { "label": "?", "x": 11.25, "y": 3 },
+ { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
+ { "label": "Fn", "x": 14, "y": 3, "w": 1 },
+ { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
+ { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
+ { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
+ { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 },
+ { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
+ { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 },
+ { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 },
+ { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c b/keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c
new file mode 100644
index 000000000000..addf690e4a61
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2021 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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 .
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT_all(
+ KC_ESC, 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_BSLS, KC_GRV,
+ 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_BSPC,
+ KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT, KC_RGUI, MO(1)),
+ // basic function layer
+[1] = LAYOUT_all(
+ RESET, 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_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/4pplet/eagle_viper_rep/keymaps/via/keymap.c b/keyboards/4pplet/eagle_viper_rep/keymaps/via/keymap.c
new file mode 100644
index 000000000000..70e55ceb7e02
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/*
+Copyright 2021 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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 .
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT_all(
+ KC_ESC, 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_BSLS, KC_GRV,
+ 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_BSPC,
+ KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT, KC_RGUI, MO(1)),
+// basic function layer
+[1] = LAYOUT_all(
+ RESET, 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_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+// extra layer for VIA
+[2] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+// extra layer for VIA
+[3] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+// extra layer for VIA
+[4] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/4pplet/eagle_viper_rep/keymaps/via/rules.mk b/keyboards/4pplet/eagle_viper_rep/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/4pplet/eagle_viper_rep/readme.md b/keyboards/4pplet/eagle_viper_rep/readme.md
new file mode 100644
index 000000000000..76415fd6c0b4
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/readme.md
@@ -0,0 +1,19 @@
+# Viper/Eagle REP Rev A
+
+A alternative PCB for Viper and Eagle V2 and V3
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: Viper/Eagle REP Rev A
+
+Make example for this keyboard (after setting up your build environment):
+
+ make 4pplet/eagle_viper_rep/rev_a:default
+
+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).
+
+How to enter bootloader (DFU):
+* Press and hold the button on the keyboard (the small one on the same side as the MCU) for more than 1 second. The keyboard will then enter bootloader (DFU) mode and it's ready to flash the firmware.
+* Note: If holding the button a shorter time, the keyboard will just reset. If you want to exit bootloader mode without flashing a firmware, dissconnect the keyboard from your PC and reconnect it.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. Bootmagic lite is enabled by default.
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/chconf.h b/keyboards/4pplet/eagle_viper_rep/rev_a/chconf.h
new file mode 100644
index 000000000000..9e81d8c4a072
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/chconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2020 QMK
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_ST_RESOLUTION 16
+
+#include_next
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
new file mode 100644
index 000000000000..4edb4754e91d
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@@ -0,0 +1,72 @@
+/*
+Copyright 2021 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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 .
+*/
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x4444
+#define PRODUCT_ID 0x0007
+#define DEVICE_VER 0x0001
+#define MANUFACTURER 4pplet
+#define PRODUCT Eagle Viper REP Rev A
+
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+#define MATRIX_COL_PINS { A0, B1, B0, A4, B5, B4, B3 }
+#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13}
+#define DIODE_DIRECTION COL2ROW
+
+/* In switch leds */
+#define BACKLIGHT_PIN A3
+#define BACKLIGHT_PWM_DRIVER PWMD2
+#define BACKLIGHT_PWM_CHANNEL 4
+#define BACKLIGHT_PAL_MODE 2
+#define BACKLIGHT_ON_STATE 1
+#define BACKLIGHT_LEVELS 10
+#define BACKLIGHT_BREATHING TRUE
+
+/* Underglow */
+#define RGB_DI_PIN A7
+#define WS2812_SPI SPID1
+#define WS2812_SPI_MOSI_PAL_MODE 0
+#define WS2812_SPI_SCK_PIN A5
+#define WS2812_SPI_SCK_PAL_MODE 0
+#define RGBLED_NUM 16
+#define RGBLIGHT_ANIMATIONS
+
+/* 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
+
+/* Indicator leds */
+#define LOCK_LIGHTS TRUE
+#define DISPLAY_LAYERS TRUE
+#define CAPS_PIN B2
+#define NUM_PIN B12
+#define SCROLL_PIN B13
+#define LAYER_1 B14
+#define LAYER_2 B15
+#define LAYER_3 A8
+#define LAYER_4 A9
+#define LAYER_5 B9
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Added extra layer for use of layer leds */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 5
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/halconf.h b/keyboards/4pplet/eagle_viper_rep/rev_a/halconf.h
new file mode 100644
index 000000000000..b0dad8d4a4d7
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/halconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define HAL_USE_I2C FALSE
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI TRUE
+
+#include_next
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/mcuconf.h b/keyboards/4pplet/eagle_viper_rep/rev_a/mcuconf.h
new file mode 100644
index 000000000000..ffa97b392cfe
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/mcuconf.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 QMK
+ *
+ * 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 .
+ */
+
+/*
+ * This file was auto-generated by:
+ * `qmk chibios-confmigrate -i keyboards/cannonkeys/db60/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+/* Reallocate the SysTick timer from TIM2 to TIM3, TIM2 is used for in switch leds */
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 3
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/readme.md b/keyboards/4pplet/eagle_viper_rep/rev_a/readme.md
new file mode 100644
index 000000000000..76415fd6c0b4
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/readme.md
@@ -0,0 +1,19 @@
+# Viper/Eagle REP Rev A
+
+A alternative PCB for Viper and Eagle V2 and V3
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: Viper/Eagle REP Rev A
+
+Make example for this keyboard (after setting up your build environment):
+
+ make 4pplet/eagle_viper_rep/rev_a:default
+
+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).
+
+How to enter bootloader (DFU):
+* Press and hold the button on the keyboard (the small one on the same side as the MCU) for more than 1 second. The keyboard will then enter bootloader (DFU) mode and it's ready to flash the firmware.
+* Note: If holding the button a shorter time, the keyboard will just reset. If you want to exit bootloader mode without flashing a firmware, dissconnect the keyboard from your PC and reconnect it.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. Bootmagic lite is enabled by default.
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c b/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c
new file mode 100644
index 000000000000..2971460bd21a
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c
@@ -0,0 +1,108 @@
+/*
+Copyright 2021 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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 .
+*/
+#include "rev_a.h"
+
+void board_init(void) {
+ setPinInputHigh(CAPS_PIN);
+ setPinInputHigh(SCROLL_PIN);
+ setPinInputHigh(NUM_PIN);
+}
+
+/* Set indicator leds to indicate lock states */
+bool led_update_kb(led_t led_state) {
+ bool res = led_update_user(led_state);
+ if(res && LOCK_LIGHTS) {
+ if(led_state.caps_lock){
+ setPinOutput(CAPS_PIN);
+ writePin(CAPS_PIN, 0);
+ }
+ else
+ setPinInputHigh(CAPS_PIN);
+ if(led_state.scroll_lock){
+ setPinOutput(SCROLL_PIN);
+ writePin(SCROLL_PIN, 0);
+ }
+ else
+ setPinInputHigh(SCROLL_PIN);
+ if(led_state.num_lock){
+ setPinOutput(NUM_PIN);
+ writePin(NUM_PIN, 0);
+ }
+ else
+ setPinInputHigh(NUM_PIN);
+ }
+ return res;
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+ state = layer_state_set_user(state);
+ if(DISPLAY_LAYERS){
+ setLayerLed(state);
+ }
+ return state;
+}
+/* Set indicator leds to indicate which layer is active */
+void setLayerLed(layer_state_t state){
+ switch(get_highest_layer(state)){
+ case 0 :
+ setPinOutput(LAYER_1);
+ writePin(LAYER_1, 0);
+ setPinInputHigh(LAYER_2);
+ setPinInputHigh(LAYER_3);
+ setPinInputHigh(LAYER_4);
+ setPinInputHigh(LAYER_5);
+ break;
+ case 1 :
+ setPinOutput(LAYER_2);
+ writePin(LAYER_2, 0);
+ setPinInputHigh(LAYER_1);
+ setPinInputHigh(LAYER_3);
+ setPinInputHigh(LAYER_4);
+ setPinInputHigh(LAYER_5);
+ break;
+ case 2 :
+ setPinOutput(LAYER_3);
+ writePin(LAYER_3, 0);
+ setPinInputHigh(LAYER_1);
+ setPinInputHigh(LAYER_2);
+ setPinInputHigh(LAYER_4);
+ setPinInputHigh(LAYER_5);
+ break;
+ case 3 :
+ writePin(LAYER_4, 0);
+ setPinInputHigh(LAYER_5);
+ setPinInputHigh(LAYER_1);
+ setPinInputHigh(LAYER_2);
+ setPinInputHigh(LAYER_3);
+ setPinOutput(LAYER_4);
+ break;
+ case 4 :
+ setPinOutput(LAYER_5);
+ writePin(LAYER_5, 0);
+ setPinInputHigh(LAYER_1);
+ setPinInputHigh(LAYER_2);
+ setPinInputHigh(LAYER_3);
+ setPinInputHigh(LAYER_4);
+ break;
+ default :
+ setPinInputHigh(LAYER_1);
+ setPinInputHigh(LAYER_2);
+ setPinInputHigh(LAYER_3);
+ setPinInputHigh(LAYER_4);
+ setPinInputHigh(LAYER_5);
+ }
+}
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.h b/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.h
new file mode 100644
index 000000000000..5dac41f92105
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2021 Stefan Sundin "4pplet" <4pplet@protonmail.com>
+
+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 .
+*/
+#pragma once
+
+#include "quantum.h"
+
+void setLayerLed(layer_state_t state);
+
+#define LAYOUT_all( \
+ k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k36, \
+ k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k56,\
+ k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k76,\
+ k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k96,\
+ k80, k90, k91, k93, k94, k85, k95, k86 \
+) \
+{ \
+ {k00, k01, k02, k03, k04, k05, k06}, \
+ {k10, k11, k12, k13, k14, k15, k16}, \
+ {k20, k21, k22, k23, k24, k25, k26}, \
+ {k30, k31, k32, k33, k34, k35, k36}, \
+ {k40, k41, k42, k43, k44, k45, k46}, \
+ {k50, k51, k52, k53, k54, k55, k56}, \
+ {k60, k61, k62, k63, k64, k65, k66}, \
+ {k70, k71, k72, k73, k74, k75, k76}, \
+ {k80, KC_NO, KC_NO, KC_NO, KC_NO, k85, k86}, \
+ {k90, k91, KC_NO, k93, k94, k95, k96} \
+}
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
new file mode 100644
index 000000000000..2a1539ed5d23
--- /dev/null
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+# comment out to disable the options.
+#
+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 = yes # Commands for debug and configuration
+SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
+NKRO_ENABLE = yes # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes
+BACKLIGHT_DRIVER = pwm
+RGBLIGHT_ENABLE = yes
+WS2812_DRIVER = spi
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
new file mode 100644
index 000000000000..8a5214fe6810
--- /dev/null
+++ b/keyboards/makrosu/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2021 Valdydesu_
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xAB69
+#define PRODUCT_ID 0x8585
+#define DEVICE_VER 0x0001
+#define MANUFACTURER valdydesu_
+#define PRODUCT makrosu
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 6
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B6 }
+#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5}
+#define UNUSED_PINS
+
+#define ENCODERS_PAD_A { D1 }
+#define ENCODERS_PAD_B { E6 }
+#define ENCODER_DIRECTION_FLIP
+#define TAP_CODE_DELAY 10
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 5
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 0
+#endif
+
+
+/* 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
+
+
+
+// EEPROM usage
+
+
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 0
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json
new file mode 100644
index 000000000000..caf039ac63ab
--- /dev/null
+++ b/keyboards/makrosu/info.json
@@ -0,0 +1,21 @@
+{
+ "keyboard_name": "MakrOSU",
+ "url": "",
+ "maintainer": "Valdydesu_",
+ "width": 3,
+ "height": 2,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+
+ {"label" : "Esc", "x":0, "y":0},
+ {"label" : "F1", "x":1, "y":0},
+ {"label" : "F2", "x":2, "y":0},
+
+ {"label" : "Lower", "x":0, "y":1},
+ {"label" : "Z", "x":1.5, "y":1},
+ {"label" : "X", "x":2.5, "y":1}
+ ]
+ }
+ }
+}
diff --git a/keyboards/makrosu/keymaps/default/keymap.c b/keyboards/makrosu/keymaps/default/keymap.c
new file mode 100644
index 000000000000..b0c47dbdd9f9
--- /dev/null
+++ b/keyboards/makrosu/keymaps/default/keymap.c
@@ -0,0 +1,122 @@
+/* Copyright 2021 Valdydesu_
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum planck_layers {
+ _1,
+ _2,
+ _3,
+ _4
+
+};
+
+
+enum planck_keycodes {
+ L1 = SAFE_RANGE,
+ L2,
+ L3
+
+};
+
+#define LOWER MO(_4)
+#define IND_1 D4
+#define IND_2 C6
+#define IND_3 D7
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_1] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2,
+ LOWER, KC_Z, KC_X),
+
+ [_2] = LAYOUT(
+ LALT(KC_TAB), LGUI(KC_TAB), LCTL(KC_S),
+ LOWER, LCTL(KC_C), LCTL(KC_V)),
+
+ [_3] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS),
+
+ [_4] = LAYOUT(
+ L1, L2, L3,
+ _______, _______, _______),
+
+};
+
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+ state = update_tri_layer_state(state, _4, X_PAUSE, X_PAUSE);
+ writePin(IND_1, layer_state_cmp(state, 1));
+ writePin(IND_2, layer_state_cmp(state, 2));
+ writePin(IND_3, layer_state_cmp(state, 3));
+ return state;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case L1:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_1);
+ }
+ return false;
+ case L2:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_2);
+ }
+ return false;
+ case L3:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_3);
+ }
+ return false;
+ }
+ return true;
+}
+
+void matrix_init_user(void) {
+ //init the Pro Micro on-board LEDs
+ setPinOutput(IND_1);
+ setPinOutput(IND_2);
+ setPinOutput(IND_3);
+ //set to off
+ writePinHigh(IND_1);
+ writePinHigh(IND_2);
+ writePinHigh(IND_3);
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (layer_state_is(_1)) {
+ if (clockwise) {
+ tap_code(KC_UP);
+ } else {
+ tap_code(KC_DOWN);
+ }
+ } else if (layer_state_is(_2)) {
+ if (clockwise) {
+ tap_code(KC_RGHT);
+ } else {
+ tap_code(KC_LEFT);
+ }
+ } else if (layer_state_is(_3)) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ }
+ return true;
+}
diff --git a/keyboards/makrosu/keymaps/via/keymap.c b/keyboards/makrosu/keymaps/via/keymap.c
new file mode 100644
index 000000000000..b0c47dbdd9f9
--- /dev/null
+++ b/keyboards/makrosu/keymaps/via/keymap.c
@@ -0,0 +1,122 @@
+/* Copyright 2021 Valdydesu_
+ *
+ * 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum planck_layers {
+ _1,
+ _2,
+ _3,
+ _4
+
+};
+
+
+enum planck_keycodes {
+ L1 = SAFE_RANGE,
+ L2,
+ L3
+
+};
+
+#define LOWER MO(_4)
+#define IND_1 D4
+#define IND_2 C6
+#define IND_3 D7
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_1] = LAYOUT(
+ KC_ESC, KC_F1, KC_F2,
+ LOWER, KC_Z, KC_X),
+
+ [_2] = LAYOUT(
+ LALT(KC_TAB), LGUI(KC_TAB), LCTL(KC_S),
+ LOWER, LCTL(KC_C), LCTL(KC_V)),
+
+ [_3] = LAYOUT(
+ KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS),
+
+ [_4] = LAYOUT(
+ L1, L2, L3,
+ _______, _______, _______),
+
+};
+
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+ state = update_tri_layer_state(state, _4, X_PAUSE, X_PAUSE);
+ writePin(IND_1, layer_state_cmp(state, 1));
+ writePin(IND_2, layer_state_cmp(state, 2));
+ writePin(IND_3, layer_state_cmp(state, 3));
+ return state;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case L1:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_1);
+ }
+ return false;
+ case L2:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_2);
+ }
+ return false;
+ case L3:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_3);
+ }
+ return false;
+ }
+ return true;
+}
+
+void matrix_init_user(void) {
+ //init the Pro Micro on-board LEDs
+ setPinOutput(IND_1);
+ setPinOutput(IND_2);
+ setPinOutput(IND_3);
+ //set to off
+ writePinHigh(IND_1);
+ writePinHigh(IND_2);
+ writePinHigh(IND_3);
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (layer_state_is(_1)) {
+ if (clockwise) {
+ tap_code(KC_UP);
+ } else {
+ tap_code(KC_DOWN);
+ }
+ } else if (layer_state_is(_2)) {
+ if (clockwise) {
+ tap_code(KC_RGHT);
+ } else {
+ tap_code(KC_LEFT);
+ }
+ } else if (layer_state_is(_3)) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ }
+ return true;
+}
diff --git a/keyboards/makrosu/keymaps/via/rules.mk b/keyboards/makrosu/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/makrosu/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/makrosu/makrosu.c b/keyboards/makrosu/makrosu.c
new file mode 100644
index 000000000000..8a9a22278961
--- /dev/null
+++ b/keyboards/makrosu/makrosu.c
@@ -0,0 +1,16 @@
+ /* Copyright 2021 Valdydesu_
+ *
+ * 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 .
+ */
+#include "makrosu.h"
diff --git a/keyboards/makrosu/makrosu.h b/keyboards/makrosu/makrosu.h
new file mode 100644
index 000000000000..ee61ce118584
--- /dev/null
+++ b/keyboards/makrosu/makrosu.h
@@ -0,0 +1,20 @@
+#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( \
+ K02, K03, K04, \
+ K00, K01, K05 \
+) \
+{ \
+ { K00, K01, K02, K03, K04, K05 }, \
+}
+
diff --git a/keyboards/makrosu/readme.md b/keyboards/makrosu/readme.md
new file mode 100644
index 000000000000..fab6c0911589
--- /dev/null
+++ b/keyboards/makrosu/readme.md
@@ -0,0 +1,14 @@
+# [Makrosu Keypad](https://www.instagram.com/p/CJ8eoQ7BoGZ/)
+
+A Macropad that has 1 rotary encoder, 2 switches and 3 push buttons. Default function is for playing OSU!
+
+* Keyboard Maintainer: [Valdy](https://github.com/valdiieee)
+* Hardware Supported: Pro Micro, EC11 rotary encoder, MX Style Switches, Push Buttons, 1n4148 diodes
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+ make makrosu:default
+
+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/makrosu/rules.mk b/keyboards/makrosu/rules.mk
new file mode 100644
index 000000000000..d12ce5037752
--- /dev/null
+++ b/keyboards/makrosu/rules.mk
@@ -0,0 +1,23 @@
+# 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 = no # 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 = yes # 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
diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json
new file mode 100644
index 000000000000..27d397c0a242
--- /dev/null
+++ b/keyboards/technika/info.json
@@ -0,0 +1,71 @@
+{
+ "keyboard_name": "Technika",
+ "url": "",
+ "maintainer": "Gondolindrim",
+ "height": 4,
+ "width": 14,
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"K00", "x":0, "y":0},
+ {"label":"K01", "x":1, "y":0},
+ {"label":"K02", "x":2, "y":0},
+ {"label":"K03", "x":3, "y":0},
+ {"label":"K04", "x":4, "y":0},
+ {"label":"K05", "x":5, "y":0},
+ {"label":"K06", "x":6, "y":0},
+ {"label":"K07", "x":7, "y":0},
+ {"label":"K08", "x":8, "y":0},
+ {"label":"K09", "x":9, "y":0},
+ {"label":"K0A", "x":10, "y":0},
+ {"label":"K0B", "x":11, "y":0},
+ {"label":"K0C", "x":12, "y":0},
+ {"label":"K0D", "x":13, "y":0},
+
+ {"label":"K10", "x":0, "y":1},
+ {"label":"K11", "x":1, "y":1},
+ {"label":"K12", "x":2, "y":1},
+ {"label":"K13", "x":3, "y":1},
+ {"label":"K14", "x":4, "y":1},
+ {"label":"K15", "x":5, "y":1},
+ {"label":"K16", "x":6, "y":1},
+ {"label":"K17", "x":7, "y":1},
+ {"label":"K18", "x":8, "y":1},
+ {"label":"K19", "x":9, "y":1},
+ {"label":"K1A", "x":10, "y":1},
+ {"label":"K1B", "x":11, "y":1},
+ {"label":"K1C", "x":12, "y":1},
+ {"label":"K1D", "x":13, "y":1},
+
+ {"label":"K20", "x":0, "y":2},
+ {"label":"K21", "x":1, "y":2},
+ {"label":"K22", "x":2, "y":2},
+ {"label":"K23", "x":3, "y":2},
+ {"label":"K24", "x":4, "y":2},
+ {"label":"K25", "x":5, "y":2},
+ {"label":"K26", "x":6, "y":2},
+ {"label":"K27", "x":7, "y":2},
+ {"label":"K28", "x":8, "y":2},
+ {"label":"K29", "x":9, "y":2},
+ {"label":"K2A", "x":10, "y":2},
+ {"label":"K2B", "x":11, "y":2},
+ {"label":"K2C", "x":12, "y":2},
+ {"label":"K2D", "x":13, "y":2},
+
+ {"label":"K30", "x":0, "y":3},
+ {"label":"K31", "x":1, "y":3},
+ {"label":"K32", "x":2, "y":3},
+ {"label":"K33", "x":3, "y":3},
+ {"label":"K35", "x":5, "y":3},
+ {"label":"K36", "x":6, "y":3},
+ {"label":"K37", "x":7, "y":3},
+ {"label":"K38", "x":8, "y":3},
+ {"label":"K39", "x":9, "y":3},
+ {"label":"K3A", "x":10, "y":3},
+ {"label":"K3B", "x":11, "y":3},
+ {"label":"K3C", "x":12, "y":3},
+ {"label":"K3D", "x":13, "y":3}
+ ]
+ }
+ }
+}