diff --git a/docs/contributing.md b/docs/contributing.md
index bb46add7892b..4801bb8224a4 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -63,6 +63,7 @@ Most of our style is pretty easy to pick up on. If you are familiar with either
We have a few different types of changes in QMK, each requiring a different level of rigor. We'd like you to keep the following guidelines in mind no matter what type of change you're making.
+* **Before you contribute:** Please make sure your fork is up to date with the upstream `qmk_firmware` repo. This will help minimize CI failures that may not occur for you when compiling locally.
* Separate PRs into logical units. For example, do not submit one PR covering two separate features, instead submit a separate PR for each feature.
* Check for unnecessary whitespace with `git diff --check` before committing.
* Make sure your code change actually compiles.
diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index d22e912e86a9..0d6b4db206a1 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -42,7 +42,7 @@ If there are any inconsistencies with these recommendations, you're best off [cr
- `#include QMK_KEYBOARD_H` preferred to including specific board files
- prefer layer `enum`s to `#define`s
-- require custom keycode `enum`s to `#define`s, first entry must have ` = SAFE_RANGE`
+- custom keycode `enum`s must have first entry `= SAFE_RANGE`
- terminating backslash (`\`) in lines of LAYOUT macro parameters is superfluous and should be removed
- some care with spacing (e.g., alignment on commas or first char of keycodes) makes for a much nicer-looking keymap
diff --git a/keyboards/binepad/bn009/keymaps/default/keymap.json b/keyboards/binepad/bn009/keymaps/default/keymap.json
index 2d5410de04fb..bcce7475c6d1 100644
--- a/keyboards/binepad/bn009/keymaps/default/keymap.json
+++ b/keyboards/binepad/bn009/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "binepad/bn009r2",
+ "keyboard": "binepad/bn009/r2",
"version": 1,
"author": "binepad",
"notes": "This file is a keymap.json file for binepad/bn009r2",
diff --git a/keyboards/binepad/bn009/keymaps/via/keymap.json b/keyboards/binepad/bn009/keymaps/via/keymap.json
index 414859ec9609..1790cf9328a2 100644
--- a/keyboards/binepad/bn009/keymaps/via/keymap.json
+++ b/keyboards/binepad/bn009/keymaps/via/keymap.json
@@ -4,7 +4,7 @@
"via": true
}
},
- "keyboard": "binepad/bn009r2",
+ "keyboard": "binepad/bn009/r2",
"version": 1,
"author": "binepad",
"notes": "This file is a keymap.json file for binepad/bn009r2",
diff --git a/keyboards/chouchou/config.h b/keyboards/chouchou/config.h
new file mode 100644
index 000000000000..405bd8b5ff42
--- /dev/null
+++ b/keyboards/chouchou/config.h
@@ -0,0 +1,7 @@
+// Copyright 2023 Dane Lipscombe (@dlip)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/chouchou/info.json b/keyboards/chouchou/info.json
new file mode 100644
index 000000000000..726f190aab1f
--- /dev/null
+++ b/keyboards/chouchou/info.json
@@ -0,0 +1,52 @@
+{
+ "manufacturer": "dlip",
+ "keyboard_name": "chouchou",
+ "maintainer": "dlip",
+ "bootloader": "rp2040",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "direct": [
+ ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP26", "GP27", "GP28", "GP29"]
+ ]
+ },
+ "processor": "RP2040",
+ "url": "https://github.com/dlip/chouchou",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0117",
+ "vid": "0xFABE"
+ },
+ "layouts": {
+ "LAYOUT_split_2x4_2": {
+ "layout": [
+ {"matrix": [0, 16], "x": 0, "y": 0.88},
+ {"matrix": [0, 17], "x": 1, "y": 0.38},
+ {"matrix": [0, 18], "x": 2, "y": 0},
+ {"matrix": [0, 19], "x": 3, "y": 0.38},
+ {"matrix": [0, 0], "x": 4, "y": 0.38},
+ {"matrix": [0, 1], "x": 5, "y": 0},
+ {"matrix": [0, 2], "x": 6, "y": 0.38},
+ {"matrix": [0, 3], "x": 7, "y": 0.88},
+ {"matrix": [0, 12], "x": 0, "y": 1.88},
+ {"matrix": [0, 13], "x": 1, "y": 1.38},
+ {"matrix": [0, 14], "x": 2, "y": 1},
+ {"matrix": [0, 15], "x": 3, "y": 1.38},
+ {"matrix": [0, 4], "x": 4, "y": 1.38},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1.38},
+ {"matrix": [0, 7], "x": 7, "y": 1.88},
+ {"matrix": [0, 11], "x": 2, "y": 2.38},
+ {"matrix": [0, 10], "x": 3, "y": 2.5},
+ {"matrix": [0, 9], "x": 4, "y": 2.5},
+ {"matrix": [0, 8], "x": 5, "y": 2.38}
+ ]
+ }
+ }
+}
diff --git a/keyboards/chouchou/keymaps/default/keymap.c b/keyboards/chouchou/keymaps/default/keymap.c
new file mode 100644
index 000000000000..7a20b6e21593
--- /dev/null
+++ b/keyboards/chouchou/keymaps/default/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2023 Dane Lipscombe (@dlip)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_split_2x4_2(
+ KC_A, KC_B, KC_C, KC_D, KC_N, KC_M, KC_L, KC_K,
+ KC_E, KC_F, KC_G, KC_H, KC_R, KC_Q, KC_P, KC_O,
+ KC_I, KC_J, KC_T, KC_S
+ ),
+};
diff --git a/keyboards/chouchou/readme.md b/keyboards/chouchou/readme.md
new file mode 100644
index 000000000000..dcd0c9031419
--- /dev/null
+++ b/keyboards/chouchou/readme.md
@@ -0,0 +1,26 @@
+# Chouchou
+
+
+
+Chouchou (Japanese for butterfly) is a minimalist unibody keyboard designed to be used with the [Taipo](https://inkeys.wiki/en/keymaps/taipo) layout.
+
+- [Github repo](https://github.com/dlip/chouchou)
+- Keyboard Maintainer: [Dane Lipscombe](https://github.com/dlip)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make chouchou:default
+
+Flashing example for this keyboard:
+
+ make chouchou: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/chouchou/rules.mk b/keyboards/chouchou/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json b/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
index 1227020b2971..10f557d72975 100644
--- a/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
+++ b/keyboards/clueboard/2x1800/2021/keymaps/default/keymap.json
@@ -2,7 +2,7 @@
"version": 1,
"author": "skullydazed",
"notes": "",
- "keyboard": "clueboard/2x1800/2018",
+ "keyboard": "clueboard/2x1800/2021",
"keymap": "default",
"layout": "LAYOUT_all",
"layers": [
diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h
index ef26abfc02f5..4282937c7cdc 100644
--- a/keyboards/coarse/cordillera/config.h
+++ b/keyboards/coarse/cordillera/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see .
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
-#define BACKLIGHT_PAL_MODE 1
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index d0cda9579460..82064abb5758 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -20,115 +20,103 @@ along with this program. If not, see .
#pragma once
-//#define USE_MATRIX_I2C
-
/* Select hand configuration */
#define EE_HANDS
-#ifdef OLED_ENABLE
-# define OLED_TIMEOUT 600000
-#endif
-
-// #define FORCE_NKRO
+#define NO_ACTION_ONESHOT
+#define NO_USB_STARTUP_CHECK
-#define QMK_ESC_OUTPUT F4 // usually COL
-#define QMK_ESC_INPUT D4 // usually ROW
-#define QMK_LED B0
+#define LAYER_STATE_8BIT // 8 layer limit
-#define NO_ACTION_ONESHOT
+#define SPLIT_ACTIVITY_ENABLE
+#define SPLIT_LAYER_STATE_ENABLE
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-
-# define RGB_MATRIX_HUE_STEP 8
-# define RGB_MATRIX_SAT_STEP 12
-# define RGB_MATRIX_VAL_STEP 10
-# define RGB_MATRIX_SPD_STEP 10
+// Undefine r2g effects
# undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-# undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# undef ENABLE_RGB_MATRIX_BREATHING
+# undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# undef ENABLE_RGB_MATRIX_BAND_SAT
# undef ENABLE_RGB_MATRIX_BAND_VAL
-# undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
# undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
# undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-
-// #undef ENABLE_RGB_MATRIX_CYCLE_ALL
-// # undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
# undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
# undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# undef ENABLE_RGB_MATRIX_DUAL_BEACON
-# undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
# undef ENABLE_RGB_MATRIX_RAINDROPS
-# undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+# undef ENABLE_RGB_MATRIX_HUE_BREATHING
+# undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+# undef ENABLE_RGB_MATRIX_SPLASH
+# undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+# define SPLIT_TRANSACTION_IDS_USER USER_CONFIG_SYNC
-# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+# define IDLE_TIMEOUT 60000 * 4
+# define GAMING_IDLE_TIMEOUT 10000
+# define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+# define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_ALL
+# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 135
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+# define RGB_MATRIX_HUE_STEP 6
+# define RGB_MATRIX_SAT_STEP 8
+# define RGB_MATRIX_VAL_STEP 10
+# define RGB_MATRIX_SPD_STEP 10
-# undef ENABLE_RGB_MATRIX_SPLASH
-# undef ENABLE_RGB_MATRIX_MULTISPLASH
-# undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-# undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+# define ENABLE_RGB_MATRIX_BREATHING
+# define ENABLE_RGB_MATRIX_CYCLE_ALL
+# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define RGB_MATRIX_ANIMATION_SPEED_DEFAULT UINT8_MAX / 2
-# define RGB_MATRIX_ANIMATION_SPEED_SLOW RGB_MATRIX_ANIMATION_SPEED_DEFAULT / 4
-# define RGB_MATRIX_ANIMATION_SPEED_SLOWER RGB_MATRIX_ANIMATION_SPEED_SLOW / 3
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+
+# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+
+# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+
+# define RGB_MATRIX_ANIMATION_SPEED_FAST UINT8_MAX / 2
+# define RGB_MATRIX_ANIMATION_SPEED_MEDIUM UINT8_MAX / 4
+# define RGB_MATRIX_ANIMATION_SPEED_SLOW UINT8_MAX / 8
+# define RGB_MATRIX_ANIMATION_SPEED_SLOWER UINT8_MAX / 24
+
+# if defined(THEME_GODSPEED)
+# define THEME_HSV 132, 255, 125
+# elif defined(THEME_GODSPEED_ARES)
+# define THEME_HSV HSV_ORANGE
+# elif defined(THEME_LASER)
+# undef RGB_MATRIX_TYPING_ACTIVE
+# undef RGB_MATRIX_TYPING_PASSIVE
+# define THEME_HSV HSV_PURPLE
+# define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+# define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_LEFT_RIGHT
+# elif defined(THEME_MILKSHAKE)
+# undef RGB_MATRIX_TYPING_ACTIVE
+# undef RGB_MATRIX_TYPING_PASSIVE
+# define THEME_HSV 30, 255, 218
+# define RGB_MATRIX_TYPING_ACTIVE RGB_MATRIX_TYPING_HEATMAP
+# define RGB_MATRIX_TYPING_PASSIVE RGB_MATRIX_CYCLE_LEFT_RIGHT
+# else
+# define THEME_HSV 123, 255, 125 // default to PULSE
+# endif
#endif
#define TAPPING_TERM 140
#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
+#define TAP_CODE_DELAY 10
#define TAPPING_TOGGLE 2
-#ifdef MOUSEKEY_ENABLE
-# define MOUSEKEY_DELAY 0
-# define MOUSEKEY_INTERVAL 16
-# define MOUSEKEY_MAX_SPEED 6
-# define MOUSEKEY_TIME_TO_MAX 36
-# define MOUSEKEY_WHEEL_MAX_SPEED 4
-# define MOUSEKEY_WHEEL_TIME_TO_MAX 100
-#endif
-
-#ifdef THEME_GODSPEED
-# define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_godspeed.c"
-# define THEME_HSV 132, 255, 125
-#endif
-
-#ifdef THEME_PULSE
-# define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_pulse.c"
-# define THEME_HSV 123, 255, 125
-#endif
-
-#ifdef THEME_LASER
-# define OLED_FONT_H "keyboards/crkbd/keymaps/rpbaptist/glcdfont_laser.c"
-# define THEME_HSV HSV_MAGENTA
+#ifdef OLED_ENABLE
+# define SPLIT_OLED_ENABLE
+# define OLED_TIMEOUT 60000 * 10
+# define OLED_FONT_H "glcdfont_multi.c"
#endif
-#define NO_ACTION_ONESHOT
-
#undef PRODUCT
#define PRODUCT "Corne Keyboard"
-
-#define LCPC_KEYS KC_LCTL, KC_LSFT, KC_9
-#define RCPC_KEYS KC_RCTL, KC_RSFT, KC_0
diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c
deleted file mode 100644
index ac1f11dbbe2b..000000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/glcdfont.c
+++ /dev/null
@@ -1,231 +0,0 @@
-#include "progmem.h"
-
-// Helidox 8x6 font with QMK Firmware Logo
-// Online editor: http://teripom.x0.com/
-
-const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xE0,
-0x38, 0x1C, 0x0C, 0x06, 0x03, 0x03,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x03, 0x03, 0x82, 0x86, 0xCC, 0xF8,
-0xF0, 0xF0, 0x38, 0x1C, 0x0C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0xC0, 0x70,
-0xF8, 0x0C, 0x04, 0xC6, 0xA2, 0xB3,
-0x9F, 0x87, 0x01, 0x01, 0x1F, 0x66,
-0x66, 0x44, 0x4C, 0x58, 0x70, 0xE0,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
-0xE0, 0x78, 0x18, 0x8C, 0xC6, 0xE6,
-0xE3, 0xE3, 0xC3, 0x83, 0x03, 0x03,
-0x73, 0x76, 0x76, 0x0C, 0x18, 0xF8,
-0xF0, 0xC0, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
-0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
-0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
-0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
-0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
-0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
-0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x80, 0xC0, 0x40, 0x7F, 0xF3,
-0x60, 0x20, 0x30, 0x30, 0x38, 0x18,
-0x9C, 0xCC, 0x6C, 0x6E, 0x3E, 0x3E,
-0x1F, 0x0F, 0x0F, 0x03, 0x03, 0x01,
-0xC0, 0xFF, 0x3E, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7F, 0xC1, 0x00,
-0x1D, 0x67, 0xC0, 0x80, 0x01, 0x00,
-0x00, 0xF0, 0x0F, 0x00, 0x00, 0x00,
-0x0C, 0x1A, 0x32, 0xC2, 0x01, 0xC1,
-0xFF, 0x3E, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x7E, 0xFF,
-0x80, 0x00, 0x00, 0xC3, 0xC7, 0xC7,
-0x8F, 0x0F, 0x07, 0x03, 0x80, 0xC0,
-0xC0, 0xC0, 0xC0, 0x80, 0x00, 0x07,
-0x0F, 0xFF, 0x7F, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
-0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
-0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
-0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
-0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
-0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
-0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
-0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x40, 0x60, 0x31,
-0x3B, 0x1E, 0x0C, 0x1E, 0x36, 0x23,
-0x61, 0x60, 0x60, 0x60, 0x60, 0x60,
-0x60, 0x30, 0x1C, 0x3E, 0x3E, 0x3F,
-0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x07,
-0x0C, 0x18, 0x10, 0x33, 0x3E, 0x38,
-0x6E, 0x67, 0x60, 0x60, 0x60, 0x20,
-0x30, 0x18, 0x08, 0x0F, 0x06, 0x03,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x03, 0x06, 0x0C, 0x19, 0x31, 0x21,
-0x60, 0x60, 0x60, 0x60, 0x61, 0x63,
-0x67, 0x67, 0x33, 0x39, 0x18, 0x0E,
-0x07, 0x03, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_godspeed.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont_godspeed.c
deleted file mode 100644
index ac1f11dbbe2b..000000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_godspeed.c
+++ /dev/null
@@ -1,231 +0,0 @@
-#include "progmem.h"
-
-// Helidox 8x6 font with QMK Firmware Logo
-// Online editor: http://teripom.x0.com/
-
-const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xE0,
-0x38, 0x1C, 0x0C, 0x06, 0x03, 0x03,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x03, 0x03, 0x82, 0x86, 0xCC, 0xF8,
-0xF0, 0xF0, 0x38, 0x1C, 0x0C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0xC0, 0x70,
-0xF8, 0x0C, 0x04, 0xC6, 0xA2, 0xB3,
-0x9F, 0x87, 0x01, 0x01, 0x1F, 0x66,
-0x66, 0x44, 0x4C, 0x58, 0x70, 0xE0,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
-0xE0, 0x78, 0x18, 0x8C, 0xC6, 0xE6,
-0xE3, 0xE3, 0xC3, 0x83, 0x03, 0x03,
-0x73, 0x76, 0x76, 0x0C, 0x18, 0xF8,
-0xF0, 0xC0, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
-0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
-0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
-0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
-0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
-0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
-0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x80, 0xC0, 0x40, 0x7F, 0xF3,
-0x60, 0x20, 0x30, 0x30, 0x38, 0x18,
-0x9C, 0xCC, 0x6C, 0x6E, 0x3E, 0x3E,
-0x1F, 0x0F, 0x0F, 0x03, 0x03, 0x01,
-0xC0, 0xFF, 0x3E, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7F, 0xC1, 0x00,
-0x1D, 0x67, 0xC0, 0x80, 0x01, 0x00,
-0x00, 0xF0, 0x0F, 0x00, 0x00, 0x00,
-0x0C, 0x1A, 0x32, 0xC2, 0x01, 0xC1,
-0xFF, 0x3E, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x7E, 0xFF,
-0x80, 0x00, 0x00, 0xC3, 0xC7, 0xC7,
-0x8F, 0x0F, 0x07, 0x03, 0x80, 0xC0,
-0xC0, 0xC0, 0xC0, 0x80, 0x00, 0x07,
-0x0F, 0xFF, 0x7F, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
-0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
-0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
-0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
-0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
-0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
-0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
-0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x00, 0x40, 0x60, 0x31,
-0x3B, 0x1E, 0x0C, 0x1E, 0x36, 0x23,
-0x61, 0x60, 0x60, 0x60, 0x60, 0x60,
-0x60, 0x30, 0x1C, 0x3E, 0x3E, 0x3F,
-0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x07,
-0x0C, 0x18, 0x10, 0x33, 0x3E, 0x38,
-0x6E, 0x67, 0x60, 0x60, 0x60, 0x20,
-0x30, 0x18, 0x08, 0x0F, 0x06, 0x03,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x03, 0x06, 0x0C, 0x19, 0x31, 0x21,
-0x60, 0x60, 0x60, 0x60, 0x61, 0x63,
-0x67, 0x67, 0x33, 0x39, 0x18, 0x0E,
-0x07, 0x03, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_laser.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont_laser.c
deleted file mode 100644
index 612b7123b093..000000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_laser.c
+++ /dev/null
@@ -1,231 +0,0 @@
-#include "progmem.h"
-
-// Helidox 8x6 font with QMK Firmware Logo
-// Online editor: http://teripom.x0.com/
-
-const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
-0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
-0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
-0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
-0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
-0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
-0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
-0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
-0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
-0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
-0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
-0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
-0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
-0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
-0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
-0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
-0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
-0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
-0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
-0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
-0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
-0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
-0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
-0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
-0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-0xE0, 0xF8, 0x3E, 0x0F, 0x03, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x80, 0xC0,
-0xE0, 0xF0, 0xF8, 0xFC, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xE0, 0xF0, 0x7C,
-0x3F, 0x0F, 0x03, 0x03, 0x03, 0x03,
-0x03, 0x03, 0x1B, 0x1F, 0x1F, 0x07,
-0x03, 0xC0, 0xE0, 0xFC, 0x1C, 0x0F,
-0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-0xE7, 0xFF, 0xFF, 0x0F, 0x03, 0x03,
-0x03, 0x03, 0x83, 0x83, 0xE3, 0xE7,
-0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
-0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
-0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
-0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
-0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
-0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
-0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
-0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x80, 0xC0, 0xF0, 0x7C, 0x1F, 0x07,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-0x80, 0x90, 0x98, 0x9C, 0x8C, 0x80,
-0x80, 0x80, 0x9C, 0x9C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x10, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
-0x1C, 0x1C, 0x9C, 0x9C, 0x1C, 0x1C,
-0x0C, 0x0C, 0x80, 0x90, 0x90, 0x10,
-0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
-0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x0C,
-0x00, 0x00, 0x90, 0x90, 0x9C, 0x9C,
-0x1C, 0x1C, 0x1C, 0x1C, 0x9C, 0x9C,
-0x9C, 0x0C, 0x0C, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
-0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
-0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
-0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
-0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
-0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
-0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
-0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x70, 0x7C, 0x7E,
-0x6F, 0x63, 0x60, 0x60, 0x60, 0x60,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-0x60, 0x70, 0x78, 0x3C, 0x1E, 0x0F,
-0x07, 0x03, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x01, 0x7F, 0x7F, 0x00, 0x00,
-0x60, 0x70, 0x7C, 0x7C, 0x6C, 0x60,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x78,
-0x3E, 0x0F, 0x03, 0x01, 0x00, 0x60,
-0x78, 0x7E, 0x67, 0x61, 0x60, 0x60,
-0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x60,
-0x78, 0x7E, 0x0F, 0x07, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x03, 0x0F,
-0x7F, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_multi.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont_multi.c
new file mode 100644
index 000000000000..28d228190cb9
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rpbaptist/glcdfont_multi.c
@@ -0,0 +1,36 @@
+// Copyright 2023 Your Name (@rpbaptist)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "progmem.h"
+
+// Helidox 8x6 font with QMK Firmware Logo
+// Online editor: https://joric.github.io/qle/
+
+const unsigned char font[] PROGMEM = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+ 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+ 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+ 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, 0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+ 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+#if defined(THEME_GODSPEED) || defined(THEME_GODSPEED_ARES)
+ 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x38, 0x1C, 0x0C, 0x06, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x82, 0x86, 0xCC, 0xF8, 0xF0, 0xF0, 0x38, 0x1C, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x70, 0xF8, 0x0C, 0x04, 0xC6, 0xA2, 0xB3, 0x9F, 0x87, 0x01, 0x01, 0x1F, 0x66, 0x66, 0x44, 0x4C, 0x58, 0x70, 0xE0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0x78, 0x18, 0x8C, 0xC6, 0xE6, 0xE3, 0xE3, 0xC3, 0x83, 0x03, 0x03, 0x73, 0x76, 0x76, 0x0C, 0x18, 0xF8, 0xF0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
+ 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0x40, 0x7F, 0xF3, 0x60, 0x20, 0x30, 0x30, 0x38, 0x18, 0x9C, 0xCC, 0x6C, 0x6E, 0x3E, 0x3E, 0x1F, 0x0F, 0x0F, 0x03, 0x03, 0x01, 0xC0, 0xFF, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xC1, 0x00, 0x1D, 0x67, 0xC0, 0x80, 0x01, 0x00, 0x00, 0xF0, 0x0F, 0x00, 0x00, 0x00, 0x0C, 0x1A, 0x32, 0xC2, 0x01, 0xC1, 0xFF, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0xFF,
+ 0x80, 0x00, 0x00, 0xC3, 0xC7, 0xC7, 0x8F, 0x0F, 0x07, 0x03, 0x80, 0xC0, 0xC0, 0xC0, 0xC0, 0x80, 0x00, 0x07, 0x0F, 0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x40, 0x60, 0x31, 0x3B, 0x1E, 0x0C, 0x1E, 0x36, 0x23, 0x61, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x30, 0x1C, 0x3E, 0x3E, 0x3F, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0C, 0x18, 0x10, 0x33, 0x3E, 0x38, 0x6E, 0x67, 0x60, 0x60, 0x60, 0x20, 0x30, 0x18, 0x08, 0x0F, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0C, 0x19, 0x31, 0x21, 0x60, 0x60, 0x60, 0x60, 0x61, 0x63, 0x67, 0x67, 0x33, 0x39, 0x18, 0x0E, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+#elif defined(THEME_LASER)
+ 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xE0, 0xF8, 0x3E, 0x0F, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0x7C, 0x3F, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x1B, 0x1F, 0x1F, 0x07, 0x03, 0xC0, 0xE0, 0xFC, 0x1C, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0xE7, 0xFF, 0xFF, 0x0F, 0x03, 0x03, 0x03, 0x03, 0x83, 0x83, 0xE3, 0xE7, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
+ 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xF0, 0x7C, 0x1F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x90, 0x98, 0x9C, 0x8C, 0x80, 0x80, 0x80, 0x9C, 0x9C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x9C, 0x9C, 0x1C, 0x1C, 0x0C, 0x0C, 0x80, 0x90, 0x90, 0x10, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x0C,
+ 0x00, 0x00, 0x90, 0x90, 0x9C, 0x9C, 0x1C, 0x1C, 0x1C, 0x1C, 0x9C, 0x9C, 0x9C, 0x0C, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x7C, 0x7E, 0x6F, 0x63, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70, 0x78, 0x3C, 0x1E, 0x0F, 0x07, 0x03, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x7F, 0x7F, 0x00, 0x00, 0x60, 0x70, 0x7C, 0x7C, 0x6C, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x78, 0x3E, 0x0F, 0x03, 0x01, 0x00, 0x60, 0x78, 0x7E, 0x67, 0x61, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x78, 0x7E, 0x0F, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0F, 0x7F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+#elif defined(THEME_MILKSHAKE)
+ 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFC, 0xFE, 0xFE, 0xFE, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xF8, 0xF8, 0xF8, 0xF0, 0xE0, 0xC0, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xF8, 0xF8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFE, 0xFE, 0xFE, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xF8, 0xFC, 0x7C, 0x7C, 0x7C, 0xFC, 0xF8, 0xF8, 0xF0, 0xE0, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
+ 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xF8, 0xFC, 0xFE, 0xFF, 0xDF, 0x8F, 0x07, 0x03, 0x00, 0x00, 0x70, 0xF8, 0xF8, 0xF8, 0xF8, 0xFC, 0x7C, 0x7E, 0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0xF1, 0xFB, 0xFF, 0xFF, 0x7F, 0x3F, 0x7F, 0xFF, 0xFF, 0xFB, 0xF1, 0xE0, 0xC0, 0x00, 0x00, 0x00, 0x0E, 0x1F, 0x1F, 0x1F, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xF0, 0xF0, 0xF0, 0xE0, 0xC1, 0x83, 0x03, 0x83, 0xC1, 0xE0, 0xF0, 0xF0, 0xF0, 0x60, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x1F, 0x1F, 0x1F, 0x0E, 0x00, 0x00, 0x1F, 0x7F, 0xFF, 0xFF, 0xFF, 0xF1, 0xE0, 0xC0, 0xC0, 0xC0, 0xE0, 0xF1, 0xFF, 0xFF, 0xFF, 0x3F, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x1F, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x1F, 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+#else // default PULSE
+ 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xF0, 0xF8, 0xF8, 0xF0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xF0, 0xFE, 0x7F, 0x7F, 0xFE, 0xF0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
+ 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1F, 0x0F, 0x03, 0x03, 0x1F, 0xFF, 0xFC, 0xE0, 0xE0, 0xFC, 0xFF, 0x1F, 0x03, 0x00, 0x00, 0x03, 0x1F, 0xFF, 0xFC, 0xE0, 0xE0, 0xF8, 0xFC, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
+ 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0F, 0x0F, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0F, 0x0F, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+#endif
+};
diff --git a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_pulse.c b/keyboards/crkbd/keymaps/rpbaptist/glcdfont_pulse.c
deleted file mode 100644
index 3699f4500b76..000000000000
--- a/keyboards/crkbd/keymaps/rpbaptist/glcdfont_pulse.c
+++ /dev/null
@@ -1,231 +0,0 @@
-#include "progmem.h"
-
-// Helidox 8x6 font with QMK Firmware Logo
-// Online editor: http://teripom.x0.com/
-
-const unsigned char font[] PROGMEM = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
- 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
- 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
- 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
- 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
- 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
- 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
- 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
- 0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
- 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
- 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
- 0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
- 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
- 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
- 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
- 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
- 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
- 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
- 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
- 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
- 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
- 0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
- 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
- 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
- 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
- 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
- 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
- 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
- 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
- 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
- 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
- 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
- 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
- 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
- 0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
- 0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
- 0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
- 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
- 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
- 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
- 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
- 0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
- 0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
- 0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
- 0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
- 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
- 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
- 0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
- 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
- 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
- 0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
- 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
- 0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
- 0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
- 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
- 0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
- 0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
- 0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
- 0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
- 0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
- 0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
- 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
- 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
- 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
- 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
- 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
- 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
- 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
- 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
- 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
- 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
- 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
- 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
- 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
- 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
- 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
- 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
- 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
- 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
- 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
- 0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
- 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
- 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
- 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
- 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
- 0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
- 0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
- 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
- 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
- 0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
- 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
- 0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
- 0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
- 0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
- 0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
- 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
- 0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
- 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
- 0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
- 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
- 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
- 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
- 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
- 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
- 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
- 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
- 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
- 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
- 0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
- 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
- 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
- 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
- 0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
- 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
- 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
- 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
- 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
- 0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
- 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
- 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
- 0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
- 0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
- 0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
- 0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
- 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x80, 0xF0, 0xF8, 0xF8, 0xF0,
- 0x80, 0x00, 0x00, 0x00, 0x00, 0x80,
- 0xF0, 0xFE, 0x7F, 0x7F, 0xFE, 0xF0,
- 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
- 0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
- 0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
- 0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
- 0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
- 0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
- 0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
- 0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1F, 0x0F, 0x03, 0x03, 0x1F,
- 0xFF, 0xFC, 0xE0, 0xE0, 0xFC, 0xFF,
- 0x1F, 0x03, 0x00, 0x00, 0x03, 0x1F,
- 0xFF, 0xFC, 0xE0, 0xE0, 0xF8, 0xFC,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C,
- 0x1F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
- 0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
- 0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
- 0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
- 0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
- 0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
- 0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
- 0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x07, 0x0F, 0x0F, 0x07, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x07, 0x0F, 0x0F, 0x07, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index aeeae2cbd82f..fc05a554036e 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -1,474 +1,152 @@
-#include QMK_KEYBOARD_H
+// Copyright 2023 Your Name (@rpbaptist)
+// SPDX-License-Identifier: GPL-2.0-or-later
-static uint32_t oled_timer = 0;
-
-#ifdef RGB_MATRIX_ENABLE
- static uint32_t hypno_timer;
-#endif
-
-enum layer_names {
- _COLEMAKDHM,
- _GAMING,
- _GAMING_EXT,
- _NUMPAD,
- _SYM,
- _NAV,
- _UTIL
-};
-
-enum custom_keycodes {
- BSP_DEL = SAFE_RANGE,
- RGB_RST, // Reset RGB
- RGB_UND, // Toggle RGB underglow as layer indicator
- RGB_IDL, // RGB Idling animations
- RGB_MAP, // RGB_MATRIX_TYPING_HEATMAP
- RGB_NXS, // RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
- RGB_SOL, // RGB_MATRIX_SOLID_COLOR
- RGB_CYC, // RGB_MATRIX_CYCLE_ALL
- RGB_DUO, // RGB_MATRIX_RAINBOW_PINWHEELS
- RGB_SCR // RGB_MATRIX_CYCLE_LEFT_RIGHT
-};
-
-typedef union {
- uint32_t raw;
- struct {
- bool rgb_layer_change : 1;
- bool rgb_matrix_idle_anim : 1;
- uint8_t rgb_matrix_active_mode : 4;
- uint8_t rgb_matrix_idle_mode : 4;
- uint8_t rgb_matrix_active_speed : 8;
- uint8_t rgb_matrix_idle_speed : 8;
- uint16_t rgb_matrix_idle_timeout : 16;
- };
-} user_config_t;
-
-user_config_t user_config;
-
-// Base layers
-#define COLEMAK DF(_COLEMAKDHM)
-#define GAMING DF(_GAMING)
-
-// Layer toggle and switch
-#define T_NAV TT(_NAV)
-#define S_NAV MO(_NAV)
-
-#define T_SYM TT(_SYM)
-#define S_SYM MO(_SYM)
-
-// Layer keys with functionality on tap
-#define NAV_0 LT(_NAV, KC_0)
-#define TAB_NUM LT(_NUMPAD, KC_TAB)
-
-#define EXT_SF LT(_GAMING_EXT, KC_LSFT)
-
-// Tap/mod keys
-#define RCTL_BR RCTL_T(KC_RBRC)
-#define LCTL_BR LCTL_T(KC_LBRC)
-
-#define SFT_SPC LSFT_T(KC_SPACE)
-#define SFT_ENT RSFT_T(KC_ENTER)
-
-// Global tab forward and backward
-#define TAB_FWD LCTL(KC_TAB)
-#define TAB_BCK LCTL(LSFT(KC_TAB))
-#define TAB_CLS LCTL(KC_W)
-
-#define WIN_CLS LALT(KC_F4)
-
-// CTRL become parens keys on NAV and NUM layers
-#define LCT_PRN SC_LCPO
-#define RCT_PRN SC_RCPC
-
-// €
-#define KC_EUR ALGR(KC_5)
+#include "rpbaptist.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_COLEMAKDHM] = LAYOUT_split_3x6_3(
+ [_COLEMAKDH] = LAYOUT_split_3x6_3( \
//,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, BSP_DEL,
+ KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, BSP_DEL,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- TAB_NUM, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
+ TAB_NUM, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- LCTL_BR, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, RCTL_BR,
+ LCTL_BR, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, RCTL_BR,\
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LALT, T_SYM, SFT_SPC, SFT_ENT, T_NAV, KC_RGUI
+ KC_LALT, T_SYM, SFT_SPC, SFT_ENT, T_NAV, KC_RGUI \
//`--------------------------' `--------------------------'
),
- [_GAMING] = LAYOUT_split_3x6_3(
+ [_GAMING] = LAYOUT_split_3x6_3( \
//,-----------------------------------------------------. ,-----------------------------------------------------.
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_TAB, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_TAB, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL,
+ KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL,\
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- _______, EXT_SF, KC_SPC, _______, _______, _______
+ EXTALT, KC_LSFT, KC_SPC, _______, _______, _______ \
//`--------------------------' `--------------------------'
),
- [_GAMING_EXT] = LAYOUT_split_3x6_3(
+ [_WASD] = LAYOUT_split_3x6_3( \
//,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_GRV, KC_1, KC_2, _______, KC_3, KC_4, _______, _______, _______, _______, _______, KC_DEL,
+ _______, KC_T, KC_Q, KC_W, KC_E, KC_R, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LBRC, KC_RBRC, _______, _______, _______, KC_BSLS, _______, _______, _______, _______, _______, _______,
+ KC_TAB, KC_G, KC_A, KC_S, KC_D, KC_F, KC_H, KC_J, KC_K, KC_L, KC_SCLN, _______,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, _______, _______, _______,
+ KC_LCTL, KC_B, KC_Z, KC_X, KC_C, KC_V, KC_N, KC_M, _______, _______, _______, KC_RCTL,\
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- _______, _______, _______, KC_ENT, _______, _______
+ EXTALT, KC_LSFT, KC_SPC, _______, _______, _______ \
//`--------------------------' `--------------------------'
),
- [_NUMPAD] = LAYOUT_split_3x6_3(
+ [_GAMING_EXT] = LAYOUT_split_3x6_3( \
//,-----------------------------------------------------. ,-----------------------------------------------------.
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_EUR, KC_P7, KC_P8, KC_P9, XXXXXXX, _______,
+ KC_GRV, KC_Y, KC_I, KC_J, KC_M, KC_N, _______, _______, _______, _______, _______, KC_DEL,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PPLS,
+ KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NUM, KC_EQL, KC_P1, KC_P2, KC_P3, KC_PSLS, KC_PAST,
+ KC_CAPS, KC_6, KC_7, KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______, _______, _______,\
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, KC_P0, KC_DOT
+ _______, KC_LALT, KC_ENT, KC_ENT, _______, _______ \
//`--------------------------' `--------------------------'
),
- [_SYM] = LAYOUT_split_3x6_3(
+ [_NUMPAD] = LAYOUT_split_3x6_3( \
//,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
+ _______, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, XXXXXXX, KC_EUR, KC_7, KC_8, KC_9, _______, _______,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_MINS, KC_PLUS,
+ S_NUM, XXXXXXX, KC_MSTP, KC_VOLD, KC_MPLY, XXXXXXX, KC_UNDS, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- LCT_PRN, XXXXXXX, XXXXXXX, XXXXXXX, KC_EUR, XXXXXXX, KC_EQL, KC_PIPE, KC_LT, KC_GT, KC_BSLS, RCT_PRN,
+ SC_LCPO, XXXXXXX, XXXXXXX, KC_MUTE, KC_PSCR, KC_NUM, KC_EQL, KC_1, KC_2, KC_3, KC_SLSH, KC_ASTR,\
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- _______, S_SYM, _______, _______, _______, _______
+ _______, _______, _______, _______, KC_0, KC_DOT \
//`--------------------------' `--------------------------'
),
- [_NAV] = LAYOUT_split_3x6_3(
+ [_SYM] = LAYOUT_split_3x6_3( \
//,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, KC_BSPC,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_TILD, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_UNDS, KC_MINS, KC_PLUS,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- LCT_PRN, KC_F11, KC_F12, KC_INS, KC_PSCR, KC_CAPS, WIN_CLS, TAB_BCK, TAB_CLS, TAB_FWD, XXXXXXX, RCT_PRN,
+ SC_LCPO, XXXXXXX, XXXXXXX, XXXXXXX, KC_EUR, XXXXXXX, KC_EQL, KC_PIPE, KC_LT, KC_GT, KC_EXLM, SC_RCPC,\
+ //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
+ _______, S_SYM, _______, _______, _______, _______ \
+ //`--------------------------' `--------------------------'
+ ),
+
+ [_NAV] = LAYOUT_split_3x6_3( \
+ //,-----------------------------------------------------. ,-----------------------------------------------------.
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_INS, KC_BSPC,\
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ KC_TILD, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, KC_RSFT,\
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ SC_LCPO, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_CAPS, WIN_CLS, TAB_BCK, TAB_CLS, TAB_FWD, KC_BSLS, SC_RCPC,\
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+---------|
- _______, _______, _______, _______, S_NAV, _______
+ _______, _______, _______, _______, S_NAV, _______ \
//`--------------------------' `--------------------------'
),
- [_UTIL] = LAYOUT_split_3x6_3(
+ [_UTIL] = LAYOUT_split_3x6_3( \
//,-----------------------------------------------------. ,-----------------------------------------------------.
- QK_BOOT, XXXXXXX, KC_MPRV, KC_VOLU, KC_MNXT, COLEMAK, RGB_IDL, RGB_MAP, RGB_NXS, XXXXXXX, RGB_HUD, RGB_HUI,
+ QK_BOOT, RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, TYPING, RGB_ATG, XXXXXXX, XXXXXXX, RGB_IDL, RGB_UND, RGB_TOG,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- RGB_RST, XXXXXXX, KC_MSTP, KC_VOLD, KC_MPLY, GAMING, RGB_UND, RGB_DUO, RGB_SCR, RGB_SPI, RGB_SAD, RGB_SAI,
+ LCK_NMP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, GAMING, RGB_PST, XXXXXXX, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,\
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- EE_CLR, KC_SLEP, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, RGB_TOG, RGB_SOL, RGB_CYC, RGB_SPD, RGB_VAD, RGB_VAI,
+ EE_CLR, KC_SLEP, XXXXXXX, XXXXXXX, XXXXXXX, WASD, RGB_PCT, XXXXXXX, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD,\
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______ \
//`--------------------------' `--------------------------'
)
};
layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(default_layer_state)) {
- case _COLEMAKDHM:
+ case _COLEMAKDH:
state = update_tri_layer_state(state, _SYM, _NAV, _UTIL);
break;
case _GAMING:
+ case _WASD:
state = update_tri_layer_state(state, _GAMING_EXT, _NAV, _UTIL);
break;
}
return state;
}
+void suspend_power_down_keymap(void) {
#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (is_keyboard_master()) {
- return OLED_ROTATION_270;
- } else {
- return OLED_ROTATION_180;
- }
-}
-
-void render_crkbd_logo(void) {
- static const char PROGMEM crkbd_logo[] = {
- 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
- 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
- 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
- 0};
- oled_write_P(crkbd_logo, false);
-}
-
-# ifdef RGB_MATRIX_ENABLE
-const char *rgb_matrix_anim_oled_text(uint8_t mode) {
- switch (mode) {
- case RGB_MATRIX_TYPING_HEATMAP:
- return PSTR("Heat ");
- case RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS:
- return PSTR("Nexus");
- case RGB_MATRIX_SOLID_COLOR:
- return PSTR("Solid");
- case RGB_MATRIX_CYCLE_ALL:
- return PSTR("Cycle");
- case RGB_MATRIX_RAINBOW_PINWHEELS:
- return PSTR("Wheel");
- case RGB_MATRIX_CYCLE_LEFT_RIGHT:
- return PSTR("Wave ");
- default:
- return PSTR("");
- }
-}
-# endif
-
-void render_status(void) {
- // oled_write_P(PSTR("Layout: "), false);
- switch (get_highest_layer(default_layer_state)) {
- case _COLEMAKDHM:
- oled_write_P(PSTR("TYPE "), false);
- break;
- case _GAMING:
- oled_write_P(PSTR("GAME "), false);
- break;
- }
-
- oled_write_P(PSTR("\n"), false);
-
- switch (get_highest_layer(layer_state)) {
- case 0:
- oled_write_P(PSTR(" "), false);
- break;
- case _SYM:
- oled_write_P(PSTR("Sym "), false);
- break;
- case _NAV:
- oled_write_P(PSTR("Nav "), false);
- break;
- case _GAMING_EXT:
- oled_write_P(PSTR("Ext "), false);
- break;
- case _NUMPAD:
- oled_write_P(PSTR("Num "), false);
- break;
- case _UTIL:
- oled_write_P(PSTR("Util "), false);
- break;
- default:
- oled_write_P(PSTR("Unkn "), false);
- break;
- }
- oled_write_P(PSTR("\n"), false);
-
- uint8_t modifiers = get_mods();
-
- oled_write_P((modifiers & MOD_MASK_SHIFT) ? PSTR("SHIFT") : PSTR("\n"), false);
- oled_write_P((modifiers & MOD_MASK_CTRL) ? PSTR("CTRL ") : PSTR("\n"), false);
- oled_write_P((modifiers & MOD_MASK_ALT) ? PSTR("ALT ") : PSTR("\n"), false);
- oled_write_P((modifiers & MOD_MASK_GUI) ? PSTR("SUPER") : PSTR("\n"), false);
-
- oled_write_P(PSTR("\n"), false);
-
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write_P(PSTR("Mode:"), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR(" NUM ") : PSTR("\n"), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR(" CAPS") : PSTR("\n"), false);
-
-# ifdef RGB_MATRIX_ENABLE
- oled_write_P(PSTR("\n"), false);
- oled_write_P(PSTR("\n"), false);
-
- if (rgb_matrix_config.enable) {
- if (user_config.rgb_matrix_idle_anim) {
- oled_write_P(rgb_matrix_anim_oled_text(user_config.rgb_matrix_active_mode), false);
- oled_write_P(rgb_matrix_anim_oled_text(user_config.rgb_matrix_idle_mode), false);
- } else {
- oled_write_P(PSTR("\n"), false);
- oled_write_P(rgb_matrix_anim_oled_text(rgb_matrix_get_mode()), false);
- }
- } else {
- oled_write_P(PSTR("\n"), false);
- oled_write_P(PSTR("\n"), false);
- }
-# endif
-}
-
-bool oled_task_user(void) {
- if (timer_elapsed32(oled_timer) > OLED_TIMEOUT) {
- oled_off();
- return;
- } else {
- oled_on();
- }
-
- if (is_keyboard_master()) {
- render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
- } else {
- render_crkbd_logo();
- #ifdef RGB_MATRIX_ENABLE
- if (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode) {
- oled_scroll_left(); // Turns on scrolling
- } else {
- oled_scroll_off();
- }
- #endif
- }
- return false;
-}
+ oled_off();
#endif
-
#ifdef RGB_MATRIX_ENABLE
-
-extern led_config_t g_led_config;
-void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t led_type) {
- HSV hsv = {hue, sat, val};
- if (hsv.v > rgb_matrix_config.hsv.v) {
- hsv.v = rgb_matrix_config.hsv.v;
- }
-
- RGB rgb = hsv_to_rgb(hsv);
- for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
- if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
- rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
- }
- }
-}
-
-void check_default_layer(uint8_t type) {
- switch (get_highest_layer(default_layer_state)) {
- case _COLEMAKDHM:
- rgb_matrix_layer_helper(THEME_HSV, type);
- break;
- case _GAMING:
- rgb_matrix_layer_helper(HSV_RED, type);
- break;
- }
-}
-
-bool rgb_matrix_indicators_user(void) {
- if (
- user_config.rgb_layer_change && rgb_matrix_config.enable &&
- (!user_config.rgb_matrix_idle_anim || rgb_matrix_get_mode() != user_config.rgb_matrix_idle_mode)
- )
- {
- switch (get_highest_layer(layer_state)) {
- case _GAMING_EXT:
- rgb_matrix_layer_helper(HSV_PURPLE, LED_FLAG_UNDERGLOW);
- break;
- case _SYM:
- rgb_matrix_layer_helper(HSV_GOLDENROD, LED_FLAG_UNDERGLOW);
- break;
- case _NAV:
- rgb_matrix_layer_helper(HSV_SPRINGGREEN, LED_FLAG_UNDERGLOW);
- break;
- case _UTIL:
- rgb_matrix_layer_helper(HSV_PINK, LED_FLAG_UNDERGLOW);
- break;
- case _NUMPAD:
- rgb_matrix_layer_helper(HSV_CORAL, LED_FLAG_UNDERGLOW);
- break;
- default: {
- check_default_layer(LED_FLAG_UNDERGLOW);
- break;
- }
- }
- }
- return false;
-}
-
-void rgb_matrix_update_current_mode(uint8_t mode, uint8_t speed) {
- rgb_matrix_config.speed = speed;
- rgb_matrix_mode_noeeprom(mode);
- eeconfig_update_user(user_config.raw);
-}
-
-void rgb_matrix_update_dynamic_mode(uint8_t mode, uint8_t speed, bool active) {
- if (active) {
- user_config.rgb_matrix_active_speed = speed;
- user_config.rgb_matrix_active_mode = mode;
- } else {
- user_config.rgb_matrix_idle_speed = speed;
- user_config.rgb_matrix_idle_mode = mode;
- }
-}
-
-void rgb_matrix_update_mode(uint8_t mode, uint8_t speed, bool active) {
- if (user_config.rgb_matrix_idle_anim) {
- rgb_matrix_update_dynamic_mode(mode, speed, active);
- }
- if (active || !user_config.rgb_matrix_idle_anim) {
- rgb_matrix_update_current_mode(mode, speed);
- }
-}
-
-void rgb_matrix_set_defaults(void) {
- rgb_matrix_config.enable = 1;
- rgb_matrix_sethsv_noeeprom(THEME_HSV);
-
- user_config.rgb_layer_change = false;
- user_config.rgb_matrix_idle_anim = true;
- user_config.rgb_matrix_idle_timeout = 60000;
-
- rgb_matrix_update_dynamic_mode(RGB_MATRIX_CYCLE_ALL, RGB_MATRIX_ANIMATION_SPEED_SLOWER, false);
- rgb_matrix_update_dynamic_mode(RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS, RGB_MATRIX_ANIMATION_SPEED_DEFAULT, true);
-
- eeprom_update_block(&rgb_matrix_config, EECONFIG_RGB_MATRIX, sizeof(rgb_matrix_config));
-}
-
-void matrix_scan_rgb(void) {
- if (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_active_mode && timer_elapsed32(hypno_timer) > user_config.rgb_matrix_idle_timeout) {
- if (user_config.rgb_layer_change) {
- rgb_matrix_layer_helper(0, 0, 0, LED_FLAG_UNDERGLOW);
- }
- rgb_matrix_update_current_mode(user_config.rgb_matrix_idle_mode, user_config.rgb_matrix_idle_speed);
- }
-}
-
-void matrix_scan_user(void) {
- static bool has_ran_yet;
- if (!has_ran_yet) {
- has_ran_yet = true;
- startup_user();
- }
- matrix_scan_rgb();
-}
-
-void eeconfig_init_user(void) {
- user_config.raw = 0;
- rgb_matrix_mode_noeeprom(user_config.rgb_matrix_active_mode);
- keyboard_init();
-}
-
-void keyboard_post_init_user(void) {
- user_config.raw = eeconfig_read_user();
- rgb_matrix_set_defaults();
- rgb_matrix_enable_noeeprom();
-}
-#endif
-
-void suspend_power_down_keymap(void) {
- oled_off();
rgb_matrix_set_suspend_state(true);
+#endif
}
void suspend_wakeup_init_keymap(void) {
+#ifdef OLED_ENABLE
oled_on();
+#endif
+#ifdef RGB_MATRIX_ENABLE
rgb_matrix_set_suspend_state(false);
+#endif
+}
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case SFT_ENT:
+ return TAPPING_TERM - 20;
+ default:
+ return TAPPING_TERM;
+ }
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
static uint8_t saved_mods = 0;
uint16_t temp_keycode = keycode;
- oled_timer = timer_read32();
-
#ifdef RGB_MATRIX_ENABLE
- if (user_config.rgb_matrix_idle_anim) {
- hypno_timer = timer_read32();
- if (rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode) {
- rgb_matrix_update_current_mode(user_config.rgb_matrix_active_mode, user_config.rgb_matrix_active_speed);
- if (!user_config.rgb_layer_change) {
- rgb_matrix_layer_helper(0, 0, 0, LED_FLAG_UNDERGLOW);
- }
- }
- }
+ process_record_user_rgb_matrix(temp_keycode, record);
#endif
// Filter out the actual keycode from MT and LT keys.
@@ -481,12 +159,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) {
saved_mods = get_mods() & MOD_MASK_SHIFT;
- if (saved_mods == MOD_MASK_SHIFT) { // Both shifts pressed
+ if (saved_mods == MOD_MASK_SHIFT) { // Both shifts pressed
register_code(KC_DEL);
- } else if (saved_mods) { // One shift pressed
- del_mods(saved_mods); // Remove any Shifts present
+ } else if (saved_mods) { // One shift pressed
+ del_mods(saved_mods); // Remove any Shifts present
register_code(KC_DEL);
- add_mods(saved_mods); // Add shifts again
+ add_mods(saved_mods); // Add shifts again
} else {
register_code(KC_BSPC);
}
@@ -495,80 +173,40 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
unregister_code(KC_BSPC);
}
return false;
-#ifdef RGB_MATRIX_ENABLE
- case COLEMAK:
+ case TYPING:
if (record->event.pressed) {
- user_config.rgb_matrix_idle_timeout = 60000;
- rgb_matrix_update_mode(RGB_MATRIX_CYCLE_ALL, RGB_MATRIX_ANIMATION_SPEED_SLOWER, false);
+#ifdef RGB_MATRIX_ENABLE
+ rgb_matrix_set_typing_defaults();
+#endif
+ default_layer_set(1U << _COLEMAKDH);
}
return true;
case GAMING:
if (record->event.pressed) {
- if (!user_config.rgb_layer_change) {
- user_config.rgb_layer_change = true;
- }
- user_config.rgb_matrix_idle_timeout = 10000;
- rgb_matrix_update_mode(RGB_MATRIX_RAINBOW_PINWHEELS, RGB_MATRIX_ANIMATION_SPEED_SLOW, false);
+#ifdef RGB_MATRIX_ENABLE
+ rgb_matrix_set_gaming_defaults();
+#endif
+ default_layer_set(1U << _GAMING);
}
return true;
- case RGB_RST:
- if (record->event.pressed) {
- rgb_matrix_set_defaults();
- rgb_matrix_enable();
- }
- break;
- case RGB_UND: // Toggle separate underglow status
- if (record->event.pressed) {
- user_config.rgb_layer_change ^= 1;
- eeconfig_update_user(user_config.raw);
- if (user_config.rgb_layer_change) {
- layer_state_set(layer_state); // This is needed to immediately set the layer color (looks better)
- } else {
- rgb_matrix_layer_helper(0, 0, 0, LED_FLAG_UNDERGLOW);
- }
- }
- break;
- case RGB_IDL: // Toggle idle/heatmap animation
- if (record->event.pressed) {
- user_config.rgb_matrix_idle_anim ^= 1;
- if (user_config.rgb_matrix_idle_anim) {
- rgb_matrix_update_mode(user_config.rgb_matrix_active_mode, user_config.rgb_matrix_active_speed, true);
- } else {
- rgb_matrix_update_current_mode(user_config.rgb_matrix_idle_mode, user_config.rgb_matrix_idle_speed);
- }
- }
- break;
- case RGB_MAP:
- if (record->event.pressed) {
- rgb_matrix_update_mode(RGB_MATRIX_TYPING_HEATMAP, rgb_matrix_config.speed, true);
- }
- break;
- case RGB_NXS:
+ case WASD:
if (record->event.pressed) {
- rgb_matrix_update_mode(RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS, RGB_MATRIX_ANIMATION_SPEED_DEFAULT, true);
- }
- break;
- case RGB_SOL:
- if (record->event.pressed) {
- rgb_matrix_update_mode(RGB_MATRIX_SOLID_COLOR, rgb_matrix_config.speed, false);
- }
- break;
- case RGB_CYC:
- if (record->event.pressed) {
- rgb_matrix_update_mode(RGB_MATRIX_CYCLE_ALL, RGB_MATRIX_ANIMATION_SPEED_SLOWER, false);
- }
- break;
- case RGB_DUO:
- if (record->event.pressed) {
- rgb_matrix_update_mode(RGB_MATRIX_RAINBOW_PINWHEELS, RGB_MATRIX_ANIMATION_SPEED_SLOW, false);
- }
- break;
- case RGB_SCR:
- if (record->event.pressed) {
- rgb_matrix_update_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT, RGB_MATRIX_ANIMATION_SPEED_SLOW, false);
- }
- break;
+#ifdef RGB_MATRIX_ENABLE
+ rgb_matrix_set_gaming_defaults();
#endif
+ default_layer_set(1U << _WASD);
+ }
+ return true;
}
return true;
}
+
+// Override functions to save memory
+// https://docs.qmk.fm/#/squeezing_avr?id=magic-keycodes
+uint16_t keycode_config(uint16_t keycode) {
+ return keycode;
+}
+
+uint8_t mod_config(uint8_t mod) {
+ return mod;
+}
diff --git a/keyboards/crkbd/keymaps/rpbaptist/oled.c b/keyboards/crkbd/keymaps/rpbaptist/oled.c
new file mode 100644
index 000000000000..a2cc43c37365
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rpbaptist/oled.c
@@ -0,0 +1,112 @@
+// Copyright 2023 Your Name (@rpbaptist)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "rpbaptist.h"
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+ if (is_keyboard_master()) {
+ return OLED_ROTATION_270;
+ } else {
+ return OLED_ROTATION_180;
+ }
+}
+
+void render_crkbd_logo(void) {
+ static const char PROGMEM crkbd_logo[] = {
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+ 0};
+ oled_write_P(crkbd_logo, false);
+}
+
+user_config_t user_config;
+
+void render_status(void) {
+ switch (get_highest_layer(default_layer_state)) {
+ case _COLEMAKDH:
+ oled_write_P(PSTR("TYPE "), false);
+ break;
+ case _GAMING:
+ oled_write_P(PSTR("GAME "), false);
+ break;
+ case _WASD:
+ oled_write_P(PSTR("WASD "), false);
+ break;
+ }
+
+ oled_write_P(PSTR("\n"), false);
+
+ switch (get_highest_layer(layer_state)) {
+ case 0:
+ oled_write_P(PSTR(" "), false);
+ break;
+ case _SYM:
+ oled_write_P(PSTR("Sym "), false);
+ break;
+ case _NAV:
+ oled_write_P(PSTR("Nav "), false);
+ break;
+ case _GAMING_EXT:
+ oled_write_P(PSTR("Ext "), false);
+ break;
+ case _NUMPAD:
+ oled_write_P(PSTR("Num "), false);
+ break;
+ case _UTIL:
+ oled_write_P(PSTR("Util "), false);
+ break;
+ default:
+ oled_write_P(PSTR("Unkn "), false);
+ break;
+ }
+ oled_write_P(PSTR("\n"), false);
+
+ uint8_t modifiers = get_mods();
+
+ oled_write_P((modifiers & MOD_MASK_SHIFT) ? PSTR("SHIFT") : PSTR("\n"), false);
+ oled_write_P((modifiers & MOD_MASK_CTRL) ? PSTR("CTRL ") : PSTR("\n"), false);
+ oled_write_P((modifiers & MOD_MASK_ALT) ? PSTR("ALT ") : PSTR("\n"), false);
+ oled_write_P((modifiers & MOD_MASK_GUI) ? PSTR("SUPER") : PSTR("\n"), false);
+
+ oled_write_P(PSTR("\n"), false);
+
+ uint8_t led_usb_state = host_keyboard_leds();
+ oled_write_P(PSTR("Mode:"), false);
+ oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR(" NUM ") : PSTR("\n"), false);
+ oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR(" CAPS") : PSTR("\n"), false);
+
+#ifdef RGB_MATRIX_ENABLE
+ oled_write_P(PSTR("\n"), false);
+ oled_write_P(PSTR("\n"), false);
+
+ if (rgb_matrix_config.enable) {
+ if (user_config.rgb_matrix_idle_anim) {
+ oled_write_P(rgb_matrix_anim_oled_text(user_config.rgb_matrix_active_mode), false);
+ oled_write_P(rgb_matrix_anim_oled_text(user_config.rgb_matrix_idle_mode), false);
+ } else {
+ oled_write_P(PSTR("\n"), false);
+ oled_write_P(rgb_matrix_anim_oled_text(rgb_matrix_get_mode()), false);
+ }
+ } else {
+ oled_write_P(PSTR("\n"), false);
+ oled_write_P(PSTR("\n"), false);
+ }
+#endif
+}
+
+bool oled_task_user(void) {
+ if (is_keyboard_master()) {
+ render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+ } else {
+ render_crkbd_logo();
+#ifdef RGB_MATRIX_ENABLE
+ if (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode) {
+ oled_scroll_left(); // Turns on scrolling
+ } else {
+ oled_scroll_off();
+ }
+#endif
+ }
+ return false;
+}
diff --git a/keyboards/crkbd/keymaps/rpbaptist/oled.h b/keyboards/crkbd/keymaps/rpbaptist/oled.h
new file mode 100644
index 000000000000..d4a73992e0ed
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rpbaptist/oled.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Your Name (@rpbaptist)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "oled_driver.h"
+
+void render_crkbd_logo(void);
diff --git a/keyboards/crkbd/keymaps/rpbaptist/readme.md b/keyboards/crkbd/keymaps/rpbaptist/readme.md
index 9525cf7cfe3b..2312ec8c4982 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/readme.md
+++ b/keyboards/crkbd/keymaps/rpbaptist/readme.md
@@ -1,6 +1,6 @@
# Corne keyboard layout
-This is my highly personalized CRKBD layout. I use Colemak DHm as main typing layer. I use this keyboard and layout in my daily programming job and for everything at home, including gaming.
+This is my highly personalized CRKBD layout. I use Colemak DH as main typing layer. I use this keyboard and layout in my daily programming job and for everything at home, including gaming.
This keymap is the result of an evolution from Ultimate Hacking Keyboard to Iris, to Corne. It took many iterations and changes and only now I feel this is ready to be merged into the main QMK repository, because I think further changes will be minor. This is my 1.0 release so to speak.
@@ -8,7 +8,7 @@ Many thanks to foostan for the keyboard, all QMK contributors and drashna specif
## Layers
-### COLEMAKDHM
+### COLEMAKDH
Main typing layer. I really love having SHIFT available on thumbs. I am a left thumb space bar person, so I put SPACE there and ENTER on right. I use CTRL key combos lot in my text editor and desktop environment. That's why I have two of them. I also found them to be a great position for the square brackets. (`[` and `]`). These become parenthesis (`(` and `)`) on either of the layers.
@@ -16,23 +16,23 @@ Holding SHIFT while tapping BACKSPACE will output DEL. Holding both SHIFT keys w
I don't know about you but "lower" and "raise" don't mean that much to me. I named my layers `SYM`, short for symbols and `NAV`, short for navigation. Holding the key will activate the layer for as long as it is held, double tapping it will switch to it. Single tapping it once will switch to main layer again.
-Holding TAB will access `NUM` layer which features a numpad.
+Holding TAB will access `NUMPAD` layer which features a numpad. This is lockable by going to `ADJUST` layer and pressing the same key.
### SYM
-Includes a number row, the symbols normally on SHIFT and numbers, as well as a numpad under right side homing keys.
+Includes a number row, the symbols normally on SHIFT and numbers and a variety of other symbols used mostly for programming.
### NAV
-This is where I access arrow keys, page up, down, home, end and F keys. I also added general tab forward and backward keys. Tab close and window close. I primarily use these in my browser, terminal and text editor.
+This is where I access F keys, arrow keys, page up, down, home, end and F keys. I also added general tab forward and backward keys. Tab close and window close. I primarily use these in my browser, terminal and text editor.
### UTIL
-Short for utility. This is accessed by pressing both `SYM` and `NAV` at the same time. It has a software `RESET` key, media keys, RGB control and switches main layer between Colemak and a gaming layer.
+Short for utility. This is accessed by pressing both `SYM` and `NAV` at the same time. It has a software `QK_BOOT` key, control for RGB and switching the main layer. More on the RGB below.
-### NUMPAD
+### NUMPAD"
-This gives access to a numpad on the right half with some additional symbols I find useful when using the numpad.
+This gives access to a numpad on the right half with some additional symbols I find useful when using the numpad. The left half has media control.
### GAMING
@@ -42,31 +42,41 @@ I put movement on FRST (would be ESDF on QWERTY), because it lines up more comfo
Most notable here is that there are no tap and hold differences anymore on left hand side besides the new layer key. This is a different layer than `SYM`.
+### WASD
+
+This is functionally the same as the `GAMING` layer, but uses traditional WASD layout. This is done for games where I don't need to type and want to just jump in without rebinding everything.
+
### GAMING_EXT
-This is the gaming extended layer where movement keys remain the same. This means I can keep moving while accessing second layer keys. All other keys are keys on which I can easily rebind something. Besides that it gives me an ENTER key which does not switch. This is good when a game requires you to hold ENTER.
+This is the gaming extended layer. I moved this to most inner thumb instead of mid thumb position. Num row is now moved to the home row. Besides that it gives me an ENTER key which does not switch. This is good when a game requires you to hold ENTER.
## RGB
I took a big inspiration from Drashna's RGB configuration and tweaked it.
- `RGB_UND`: Toggles underglow indicators on and off. Each layer has its own color.
-- `RGB_IDL`: This will enable/disable idle mode. By default, when typing, the `ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS` will be used. When the idle timeout has exceeded the secondary animation will be activated, which is `RGB_MATRIX_CYCLE_ALL` by default. When switching to `GAMING` layer the timeout will be reduced and the idle animation changed to `RGB_MATRIX_RAINBOW_PINWHEELS`.
- When idle mode is enabled, `RGB_MATRIX_TYPING_HEATMAP` and `RGB_MATRIX_MULTISPLASH` will be used for active animation. All others for idle animation. When disabling idle mode, the current idle animation will be activated. Additionally, on idling, the underglow layer indication will be deactivated.
-- There are no RGB mode cycle keys, but instead several keys to use a specific RGB directly. Each has their own default speed, although this can be changed.
+- `RGB_IDL`: This will enable/disable idle mode. By default an "active" RGB mode will be used. When the idle timeout has exceeded the secondary animation will be activated, which is a passive animation. When switching to `GAMING` layer the timeout will be reduced and the idle animation changed to `RGB_MATRIX_RAINBOW_PINWHEELS`.
+ When disabling idle mode, the current idle animation will be activated.
+ On idling, on idling, the underglow layer indication will be deactivated and the animation RGB will be set instead.
+- `RGB_ATG`: Cylces through three active modes: `RGB_MATRIX_SOLID_REACTIVE_SIMPLE` -> `RGB_MATRIX_TYPING_HEATMAP` -> `RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS`
+- `RGB_PST`: Cycles through three passive modes: `RGB_MATRIX_SOLID_COLOR` -> `RGB_MATRIX_BREATHING` -> `RGB_MATRIX_CYCLE_ALL`
+- `RGB_PCT`: Cycles through two, more colorful, passive modes: `RGB_MATRIX_RAINBOW_PINWHEELS` -> `RGB_MATRIX_CYCLE_LEFT_RIGHT`
## Building
-`make crkbd/rev1:rpbaptist:dfu`
+`qmk flash -bl dfu -kb crkbd -km rpbaptist`
## Notes
I use several OLED slave side images, depending on the keycaps I am using. These also determine the default LED color and underglow.
-`make crkbd/rev1:rpbaptist:dfu THEME=pulse`
+Provide the theme like this:
+
+`THEME=laser qmk flash -bl dfu -kb crkbd -km rpbaptist`
Current supported themes are:
+- pulse (default)
- godspeed
- laser
-- pulse
+- milkshake
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rgb.c b/keyboards/crkbd/keymaps/rpbaptist/rgb.c
new file mode 100644
index 000000000000..7f87d0a9eaa4
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rpbaptist/rgb.c
@@ -0,0 +1,350 @@
+// Copyright 2023 Your Name (@rpbaptist)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "rpbaptist.h"
+
+uint32_t transport_user_config = 0;
+
+void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
+ if (initiator2target_buffer_size == sizeof(transport_user_config)) {
+ memcpy(&transport_user_config, initiator2target_buffer, initiator2target_buffer_size);
+ }
+}
+
+#ifdef OLED_ENABLE
+const char* rgb_matrix_anim_oled_text(uint8_t mode) {
+ switch (mode) {
+ case RGB_MATRIX_TYPING_HEATMAP:
+ return PSTR("Heat ");
+ case RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS:
+ return PSTR("Nexus");
+ case RGB_MATRIX_SOLID_REACTIVE_SIMPLE:
+ return PSTR("Ease ");
+ case RGB_MATRIX_SOLID_COLOR:
+ return PSTR("Solid");
+ case RGB_MATRIX_BREATHING:
+ return PSTR("Fade ");
+ case RGB_MATRIX_CYCLE_ALL:
+ return PSTR("Cycle");
+ case RGB_MATRIX_RAINBOW_PINWHEELS:
+ return PSTR("Wheel");
+ case RGB_MATRIX_CYCLE_LEFT_RIGHT:
+ return PSTR("Wave ");
+ default:
+ return PSTR("");
+ }
+}
+#endif
+
+extern led_config_t g_led_config;
+
+void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t led_min, uint8_t led_max) {
+ HSV hsv = {hue, sat, val};
+ if (hsv.v > rgb_matrix_get_val()) {
+ hsv.v = rgb_matrix_get_val();
+ }
+
+ RGB rgb = hsv_to_rgb(hsv);
+ for (uint8_t i = 0; i < led_max; i++) {
+ if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
+ rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+ }
+ }
+}
+
+extern user_config_t user_config;
+
+bool rgb_matrix_in_idle(void) {
+ return (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode);
+}
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+ if (user_config.rgb_layer_indicator && !rgb_matrix_in_idle()) {
+ switch (get_highest_layer(layer_state | default_layer_state)) {
+ case _GAMING_EXT:
+ rgb_matrix_layer_helper(HSV_PURPLE, led_min, led_max);
+ break;
+ case _SYM:
+ rgb_matrix_layer_helper(HSV_YELLOW, led_min, led_max);
+ break;
+ case _NAV:
+ rgb_matrix_layer_helper(HSV_SPRINGGREEN, led_min, led_max);
+ break;
+ case _UTIL:
+ rgb_matrix_layer_helper(HSV_PINK, led_min, led_max);
+ break;
+ case _NUMPAD:
+ rgb_matrix_layer_helper(HSV_CORAL, led_min, led_max);
+ break;
+ case _GAMING:
+ case _WASD:
+ rgb_matrix_layer_helper(HSV_RED, led_min, led_max);
+ break;
+ default:
+ rgb_matrix_layer_helper(THEME_HSV, led_min, led_max);
+ break;
+ }
+ }
+ return false;
+}
+
+void rgb_matrix_turn_off_underglow(void) {
+ rgb_matrix_layer_helper(0, 0, 0, 0, 54);
+}
+
+uint8_t rgb_matrix_speed_for_mode(uint8_t mode) {
+ switch (mode) {
+ case RGB_MATRIX_SOLID_REACTIVE_SIMPLE:
+ case RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS:
+ return RGB_MATRIX_ANIMATION_SPEED_FAST;
+ case RGB_MATRIX_BREATHING:
+ case RGB_MATRIX_CYCLE_LEFT_RIGHT:
+ case RGB_MATRIX_RAINBOW_PINWHEELS:
+ return RGB_MATRIX_ANIMATION_SPEED_SLOW;
+ case RGB_MATRIX_CYCLE_ALL:
+ return RGB_MATRIX_ANIMATION_SPEED_SLOWER;
+ default:
+ return RGB_MATRIX_ANIMATION_SPEED_MEDIUM;
+ }
+}
+
+bool rgb_matrix_mode_active(uint8_t mode) {
+ return (mode == RGB_MATRIX_SOLID_REACTIVE_SIMPLE || mode == RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS || mode == RGB_MATRIX_TYPING_HEATMAP);
+}
+
+void rgb_matrix_update_current_mode(uint8_t mode) {
+ rgb_matrix_config.speed = rgb_matrix_speed_for_mode(mode);
+ rgb_matrix_mode_noeeprom(mode);
+}
+
+void rgb_matrix_update_dynamic_mode(uint8_t mode) {
+ uint8_t speed;
+ speed = rgb_matrix_speed_for_mode(mode);
+
+ if (rgb_matrix_mode_active(mode)) {
+ user_config.rgb_matrix_active_speed = speed;
+ user_config.rgb_matrix_active_mode = mode;
+ } else {
+ user_config.rgb_matrix_idle_speed = speed;
+ user_config.rgb_matrix_idle_mode = mode;
+ }
+}
+
+void rgb_matrix_update_mode(uint8_t mode) {
+ if (user_config.rgb_matrix_idle_anim) {
+ rgb_matrix_update_dynamic_mode(mode);
+ }
+ if (rgb_matrix_mode_active(mode) || !user_config.rgb_matrix_idle_anim) {
+ rgb_matrix_update_current_mode(mode);
+ }
+}
+
+uint8_t get_rgb_matrix_active_mode(void) {
+ if (user_config.rgb_matrix_idle_anim) {
+ return user_config.rgb_matrix_active_mode;
+ } else {
+ return rgb_matrix_get_mode();
+ }
+}
+
+void rgb_matrix_toggle_active_mode(void) {
+ switch (get_rgb_matrix_active_mode()) {
+ case RGB_MATRIX_SOLID_REACTIVE_SIMPLE:
+ rgb_matrix_update_mode(RGB_MATRIX_TYPING_HEATMAP);
+ break;
+ case RGB_MATRIX_TYPING_HEATMAP:
+ rgb_matrix_update_mode(RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS);
+ break;
+ default:
+ rgb_matrix_update_mode(RGB_MATRIX_SOLID_REACTIVE_SIMPLE);
+ break;
+ }
+}
+
+uint8_t get_rgb_matrix_idle_mode(void) {
+ if (user_config.rgb_matrix_idle_anim) {
+ return user_config.rgb_matrix_idle_mode;
+ } else {
+ return rgb_matrix_get_mode();
+ }
+}
+
+void rgb_matrix_toggle_simple_passive_mode(void) {
+ switch (get_rgb_matrix_idle_mode()) {
+ case RGB_MATRIX_SOLID_COLOR:
+ rgb_matrix_update_mode(RGB_MATRIX_BREATHING);
+ break;
+ case RGB_MATRIX_BREATHING:
+ rgb_matrix_update_mode(RGB_MATRIX_CYCLE_ALL);
+ break;
+ default:
+ rgb_matrix_update_mode(RGB_MATRIX_SOLID_COLOR);
+ break;
+ }
+}
+
+void rgb_matrix_toggle_color_passive_mode(void) {
+ switch (get_rgb_matrix_idle_mode()) {
+ case RGB_MATRIX_RAINBOW_PINWHEELS:
+ rgb_matrix_update_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT);
+ break;
+ default:
+ rgb_matrix_update_mode(RGB_MATRIX_RAINBOW_PINWHEELS);
+ break;
+ }
+}
+
+void rgb_matrix_toggle_underglow_layer_indicator(void) {
+ user_config.rgb_layer_indicator ^= 1;
+ if (user_config.rgb_layer_indicator) {
+ layer_state_set(layer_state); // This is needed to immediately set the layer color (looks better)
+ } else {
+ rgb_matrix_turn_off_underglow();
+ }
+}
+
+void rgb_matrix_toggle_idle_animation_change(void) {
+ user_config.rgb_matrix_idle_anim ^= 1;
+ if (user_config.rgb_matrix_idle_anim) {
+ rgb_matrix_update_mode(user_config.rgb_matrix_active_mode);
+ } else {
+ rgb_matrix_update_current_mode(user_config.rgb_matrix_idle_mode);
+ }
+}
+
+void rgb_matrix_set_gaming_defaults(void) {
+ if (!user_config.rgb_layer_indicator) {
+ user_config.rgb_layer_indicator = true;
+ }
+ user_config.rgb_matrix_idle_timeout = GAMING_IDLE_TIMEOUT;
+ rgb_matrix_update_mode(RGB_MATRIX_RAINBOW_PINWHEELS);
+ rgb_matrix_update_mode(RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS);
+}
+
+void rgb_matrix_set_typing_defaults(void) {
+ user_config.rgb_matrix_idle_timeout = IDLE_TIMEOUT;
+ rgb_matrix_update_mode(RGB_MATRIX_TYPING_PASSIVE);
+ rgb_matrix_update_mode(RGB_MATRIX_TYPING_ACTIVE);
+}
+
+void rgb_matrix_set_defaults(void) {
+ rgb_matrix_enable_noeeprom();
+ rgb_matrix_sethsv_noeeprom(THEME_HSV);
+
+ user_config.rgb_layer_indicator = true;
+ user_config.rgb_matrix_idle_anim = true;
+
+ rgb_matrix_set_typing_defaults();
+
+ rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_REACTIVE_SIMPLE);
+}
+
+void matrix_scan_rgb(void) {
+ if (user_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == user_config.rgb_matrix_active_mode && last_input_activity_elapsed() > user_config.rgb_matrix_idle_timeout) {
+ if (user_config.rgb_layer_indicator) {
+ rgb_matrix_turn_off_underglow();
+ }
+ rgb_matrix_update_current_mode(user_config.rgb_matrix_idle_mode);
+ }
+}
+
+void user_transport_sync(void) {
+ // Keep track of the last state, so that we can tell if we need to propagate to slave
+ static uint32_t last_config = 0, last_sync = 0;
+
+ // Check if the state values are different
+ // or if sync timer elapsed
+ if (memcmp(&user_config, &last_config, sizeof(transport_user_config)) || (timer_elapsed32(last_sync) > 250)) {
+ memcpy(&last_config, &user_config, sizeof(transport_user_config));
+
+ if (transaction_rpc_send(USER_CONFIG_SYNC, sizeof(transport_user_config), &transport_user_config)) {
+ last_sync = timer_read32();
+ }
+ }
+}
+
+void user_transport_update(void) {
+ if (is_keyboard_master()) {
+ transport_user_config = user_config.raw;
+ user_transport_sync();
+ } else {
+ user_config.raw = transport_user_config;
+ }
+}
+
+void housekeeping_task_user(void) {
+ static bool has_ran_yet;
+ if (!has_ran_yet) {
+ has_ran_yet = true;
+ startup_user();
+ }
+ matrix_scan_rgb();
+
+ // Update config to slave
+ user_transport_update();
+}
+
+void eeconfig_init_user(void) {
+ user_config.raw = 0;
+ user_config.rgb_layer_indicator = true;
+ user_config.rgb_matrix_idle_anim = true;
+
+ rgb_matrix_enable();
+ rgb_matrix_sethsv(THEME_HSV);
+ rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE_SIMPLE);
+
+ eeconfig_update_user(user_config.raw);
+}
+
+void keyboard_post_init_user(void) {
+ set_single_persistent_default_layer(_COLEMAKDH);
+ rgb_matrix_set_defaults();
+
+ // Register user config sync
+ transaction_register_rpc(USER_CONFIG_SYNC, user_config_sync);
+}
+
+bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t* record) {
+ if (user_config.rgb_matrix_idle_anim) {
+ if (rgb_matrix_get_mode() == user_config.rgb_matrix_idle_mode) {
+ rgb_matrix_update_current_mode(user_config.rgb_matrix_active_mode);
+ if (!user_config.rgb_layer_indicator) {
+ rgb_matrix_turn_off_underglow();
+ }
+ }
+ }
+
+ switch (keycode) {
+ case RGB_RST:
+ if (record->event.pressed) {
+ rgb_matrix_set_defaults();
+ }
+ break;
+ case RGB_UND: // Toggle separate underglow status
+ if (record->event.pressed) {
+ rgb_matrix_toggle_underglow_layer_indicator();
+ }
+ break;
+ case RGB_IDL: // Toggle idle/heatmap animation
+ if (record->event.pressed) {
+ rgb_matrix_toggle_idle_animation_change();
+ }
+ break;
+ case RGB_ATG:
+ if (record->event.pressed) {
+ rgb_matrix_toggle_active_mode();
+ }
+ break;
+ case RGB_PST:
+ if (record->event.pressed) {
+ rgb_matrix_toggle_simple_passive_mode();
+ }
+ break;
+ case RGB_PCT:
+ if (record->event.pressed) {
+ rgb_matrix_toggle_color_passive_mode();
+ }
+ break;
+ }
+ return true;
+}
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rgb.h b/keyboards/crkbd/keymaps/rpbaptist/rgb.h
new file mode 100644
index 000000000000..91c25f5c2872
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rpbaptist/rgb.h
@@ -0,0 +1,28 @@
+// Copyright 2023 Your Name (@rpbaptist)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "transactions.h"
+
+typedef union {
+ uint32_t raw;
+ struct {
+ bool rgb_layer_indicator : 1;
+ bool rgb_matrix_idle_anim : 1;
+ uint8_t rgb_matrix_active_mode : 4;
+ uint8_t rgb_matrix_idle_mode : 4;
+ uint8_t rgb_matrix_active_speed : 2;
+ uint8_t rgb_matrix_idle_speed : 2;
+ uint32_t rgb_matrix_idle_timeout : 18;
+ };
+} user_config_t;
+
+extern user_config_t user_config;
+
+_Static_assert(sizeof(user_config_t) == sizeof(uint32_t), "Userspace EECONFIG out of spec.");
+
+const char *rgb_matrix_anim_oled_text(uint8_t mode);
+void rgb_matrix_set_gaming_defaults(void);
+void rgb_matrix_set_typing_defaults(void);
+bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t *record);
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rpbaptist.h b/keyboards/crkbd/keymaps/rpbaptist/rpbaptist.h
new file mode 100644
index 000000000000..630ab5df49c1
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rpbaptist/rpbaptist.h
@@ -0,0 +1,73 @@
+// Copyright 2023 Your Name (@rpbaptist)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include QMK_KEYBOARD_H
+
+#include "quantum.h"
+
+#if defined(RGB_MATRIX_ENABLE)
+# include "rgb.h"
+#endif
+
+#if defined(OLED_ENABLE)
+# include "oled.h"
+#endif
+
+enum layer_names {
+ _COLEMAKDH,
+ _GAMING,
+ _WASD,
+ _GAMING_EXT,
+ _NUMPAD,
+ _SYM,
+ _NAV,
+ _UTIL
+};
+
+enum custom_keycodes {
+ BSP_DEL = SAFE_RANGE,
+#if defined(RGB_MATRIX_ENABLE)
+ RGB_RST, // Reset RGB
+ RGB_UND, // Toggle RGB underglow as layer indicator
+ RGB_ATG, // Toggle active RGB mode
+ RGB_PST, // Toggle simple passive RGB mode
+ RGB_PCT, // Toggle colorful passive RGB mode
+ RGB_IDL, // RGB Idling animations
+#endif
+ TYPING, // Switch to Colemak layer
+ GAMING, // Switch to gaming Colemak layer
+ WASD // Switch to gaming with WASD positions
+};
+
+// Layer toggle and switch
+#define T_NAV TT(_NAV)
+#define S_NAV MO(_NAV)
+
+#define T_SYM TT(_SYM)
+#define S_SYM MO(_SYM)
+
+// Layer keys with functionality on tap
+#define NAV_0 LT(_NAV, KC_0)
+#define TAB_NUM LT(_NUMPAD, KC_TAB)
+#define LCK_NMP TG(_NUMPAD)
+#define S_NUM MO(_NUMPAD)
+
+#define EXTALT LT(_GAMING_EXT, KC_LALT)
+
+// Tap/mod keys
+#define RCTL_BR RCTL_T(KC_RBRC)
+#define LCTL_BR LCTL_T(KC_LBRC)
+
+#define SFT_SPC LSFT_T(KC_SPACE)
+#define SFT_ENT RSFT_T(KC_ENTER)
+
+// Global tab forward and backward
+#define TAB_FWD LCTL(KC_TAB)
+#define TAB_BCK LCTL(LSFT(KC_TAB))
+#define TAB_CLS LCTL(KC_W)
+
+#define WIN_CLS LALT(KC_F4)
+
+// €
+#define KC_EUR ALGR(KC_5)
diff --git a/keyboards/crkbd/keymaps/rpbaptist/rules.mk b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
index 2366f669a0d2..21b8fd312786 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/rules.mk
+++ b/keyboards/crkbd/keymaps/rpbaptist/rules.mk
@@ -7,11 +7,11 @@ LTO_ENABLE = yes
#
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-# DYNAMIC_MACRO_ENABLE = yes
+DYNAMIC_MACRO_ENABLE = no
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
CONSOLE_ENABLE = no # Console for debug(+400)
COMMAND_ENABLE = no # Commands for debug and configuration
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
@@ -20,6 +20,9 @@ AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
SWAP_HANDS_ENABLE = no # Enable one-hand typing
+GRAVE_ESC_ENABLE = no
+MAGIC_ENABLE = no
+MUSIC_ENABLE = no
RGB_MATRIX_ENABLE = yes
@@ -31,10 +34,16 @@ BOOTLOADER = qmk-dfu
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
+DEBOUNCE_TYPE = sym_eager_pk
+
ifeq ($(strip $(THEME)), godspeed)
OPT_DEFS += -DTHEME_GODSPEED
endif
+ifeq ($(strip $(THEME)), godspeed_ares)
+ OPT_DEFS += -DTHEME_GODSPEED_ARES
+endif
+
ifeq ($(strip $(THEME)), pulse)
OPT_DEFS += -DTHEME_PULSE
endif
@@ -42,3 +51,15 @@ endif
ifeq ($(strip $(THEME)), laser)
OPT_DEFS += -DTHEME_LASER
endif
+
+ifeq ($(strip $(THEME)), milkshake)
+ OPT_DEFS += -DTHEME_MILKSHAKE
+endif
+
+ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
+ SRC += rgb.c
+endif
+
+ifeq ($(strip $(OLED_ENABLE)), yes)
+ SRC+= oled.c
+endif
diff --git a/keyboards/cxt_studio/info.json b/keyboards/cxt_studio/info.json
index 036794843046..07b5ff17ea9d 100644
--- a/keyboards/cxt_studio/info.json
+++ b/keyboards/cxt_studio/info.json
@@ -50,8 +50,8 @@
"url": "",
"usb": {
"device_version": "1.0.0",
- "pid": "0x0000",
- "vid": "0xFEED"
+ "pid": "0xC401",
+ "vid": "0x5754"
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/cxt_studio/keymaps/via/keymap.c b/keyboards/cxt_studio/keymaps/via/keymap.c
new file mode 100644
index 000000000000..1d58a60471c7
--- /dev/null
+++ b/keyboards/cxt_studio/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2023 Brian McKenna
+ *
+ * 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] = {
+ [0] = LAYOUT(
+ KC_ESC, KC_F11, KC_NO, KC_MSTP,
+ KC_NO, KC_NO, KC_MRWD, KC_MFFD,
+ KC_NO, KC_MPLY, KC_MPLY, KC_MNXT,
+
+ KC_MUTE, KC_NO, KC_NO, RGB_TOG
+ )
+};
+
+#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = {
+ ENCODER_CCW_CW(KC_VOLD, KC_VOLU),
+ ENCODER_CCW_CW(RGB_HUD, RGB_HUI),
+ ENCODER_CCW_CW(RGB_VAD, RGB_VAI),
+ ENCODER_CCW_CW(RGB_MODE_REVERSE, RGB_MODE_FORWARD)
+ },
+};
+#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
diff --git a/keyboards/cxt_studio/keymaps/via/rules.mk b/keyboards/cxt_studio/keymaps/via/rules.mk
new file mode 100644
index 000000000000..70cf4224c01f
--- /dev/null
+++ b/keyboards/cxt_studio/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/drop/alt/keymaps/default/keymap.c b/keyboards/drop/alt/keymaps/default/keymap.c
new file mode 100644
index 000000000000..28d7232bcfc8
--- /dev/null
+++ b/keyboards/drop/alt/keymaps/default/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_65_ansi_blocker(
+ 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_BSPC, KC_DEL,
+ 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_HOME,
+ 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_PGUP,
+ 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_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_65_ansi_blocker(
+ KC_GRV, 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_MUTE,
+ _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
+ _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
+ _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP, KC_VOLD,
+ _______, _______, _______, EE_CLR, KC_APP, _______, KC_HOME, KC_PGDN, KC_END
+ )
+};
diff --git a/keyboards/drop/alt/keymaps/via/config.h b/keyboards/drop/alt/keymaps/via/config.h
new file mode 100644
index 000000000000..616f8e329102
--- /dev/null
+++ b/keyboards/drop/alt/keymaps/via/config.h
@@ -0,0 +1,5 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/drop/alt/keymaps/via/keymap.c b/keyboards/drop/alt/keymaps/via/keymap.c
new file mode 100644
index 000000000000..28d7232bcfc8
--- /dev/null
+++ b/keyboards/drop/alt/keymaps/via/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_65_ansi_blocker(
+ 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_BSPC, KC_DEL,
+ 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_HOME,
+ 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_PGUP,
+ 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_UP, KC_PGDN,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_65_ansi_blocker(
+ KC_GRV, 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_MUTE,
+ _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,
+ _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
+ _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, KC_PGUP, KC_VOLD,
+ _______, _______, _______, EE_CLR, KC_APP, _______, KC_HOME, KC_PGDN, KC_END
+ )
+};
diff --git a/keyboards/drop/alt/keymaps/via/rules.mk b/keyboards/drop/alt/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/drop/alt/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/drop/alt/v2/board.h b/keyboards/drop/alt/v2/board.h
new file mode 100644
index 000000000000..ed3ea4b1f776
--- /dev/null
+++ b/keyboards/drop/alt/v2/board.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/drop/alt/v2/config.h b/keyboards/drop/alt/v2/config.h
new file mode 100644
index 000000000000..f3f432390e1a
--- /dev/null
+++ b/keyboards/drop/alt/v2/config.h
@@ -0,0 +1,29 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define ADC_BUFFER_DEPTH 4
+#define ADC_SAMPLING_RATE ADC_SMPR_SMP_601P5
+#define ADC_RESOLUTION ADC_CFGR_RES_12BITS
+
+#define I2C_DRIVER I2CD2
+#define I2C1_SCL_PIN A9
+#define I2C1_SDA_PIN A10
+
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10101000
+#define EXTERNAL_EEPROM_WP_PIN B5
+#define EEPROM_I2C_24LC256
+
+#define DRIVER_ADDR_1 0b1010011
+#define DRIVER_ADDR_2 0b1011111
+#define DRIVER_COUNT 2
+#define RGB_MATRIX_LED_COUNT 111
+#define ISSI_PWM_FREQUENCY 0b010 // 26k
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_DEFAULT_VAL 100
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_MATRIX_CYCLE_ZONES_ENABLE
+#define RGB_MATRIX_CAPS_LOCK_INDEX 30
diff --git a/keyboards/drop/alt/v2/halconf.h b/keyboards/drop/alt/v2/halconf.h
new file mode 100644
index 000000000000..77495ecfa0d0
--- /dev/null
+++ b/keyboards/drop/alt/v2/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_I2C TRUE
+
+#include_next
diff --git a/keyboards/drop/alt/v2/info.json b/keyboards/drop/alt/v2/info.json
new file mode 100644
index 000000000000..432dd4b2d1a1
--- /dev/null
+++ b/keyboards/drop/alt/v2/info.json
@@ -0,0 +1,261 @@
+{
+ "keyboard_name": "ALT v2",
+ "manufacturer": "Drop Inc.",
+ "maintainer": "zvecr",
+ "processor": "STM32F303",
+ "bootloader": "tinyuf2",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["C0", "C1", "C2", "C3", "B4", "B3", "C6", "C7", "C8", "C9", "C10", "C11", "C12", "C13", "C14"],
+ "rows": ["A0", "A1", "A2", "A3", "B10"]
+ },
+ "usb": {
+ "vid": "0x359B",
+ "pid": "0x0006",
+ "device_version": "2.0.0"
+ },
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "features": {
+ "rgb_matrix": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "community_layouts": ["65_ansi_blocker"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_65_ansi_blocker"
+ },
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ {"matrix": [0, 0], "label":"ESCAPE", "x":0, "y":0},
+ {"matrix": [0, 1], "label":"1", "x":1, "y":0},
+ {"matrix": [0, 2], "label":"2", "x":2, "y":0},
+ {"matrix": [0, 3], "label":"3", "x":3, "y":0},
+ {"matrix": [0, 4], "label":"4", "x":4, "y":0},
+ {"matrix": [0, 5], "label":"5", "x":5, "y":0},
+ {"matrix": [0, 6], "label":"6", "x":6, "y":0},
+ {"matrix": [0, 7], "label":"7", "x":7, "y":0},
+ {"matrix": [0, 8], "label":"8", "x":8, "y":0},
+ {"matrix": [0, 9], "label":"9", "x":9, "y":0},
+ {"matrix": [0, 10], "label":"0", "x":10, "y":0},
+ {"matrix": [0, 11], "label":"MINUS", "x":11, "y":0},
+ {"matrix": [0, 12], "label":"EQUALS", "x":12, "y":0},
+ {"matrix": [0, 13], "label":"BACKSPACE", "x":13, "y":0, "w":2},
+ {"matrix": [0, 14], "label":"DELETE", "x":15, "y":0},
+ {"matrix": [1, 0], "label":"TAB", "x":0, "y":1, "w":1.5},
+ {"matrix": [1, 1], "label":"Q", "x":1.5, "y":1},
+ {"matrix": [1, 2], "label":"W", "x":2.5, "y":1},
+ {"matrix": [1, 3], "label":"E", "x":3.5, "y":1},
+ {"matrix": [1, 4], "label":"R", "x":4.5, "y":1},
+ {"matrix": [1, 5], "label":"T", "x":5.5, "y":1},
+ {"matrix": [1, 6], "label":"Y", "x":6.5, "y":1},
+ {"matrix": [1, 7], "label":"U", "x":7.5, "y":1},
+ {"matrix": [1, 8], "label":"I", "x":8.5, "y":1},
+ {"matrix": [1, 9], "label":"O", "x":9.5, "y":1},
+ {"matrix": [1, 10], "label":"P", "x":10.5, "y":1},
+ {"matrix": [1, 11], "label":"LEFT BRACKET", "x":11.5, "y":1},
+ {"matrix": [1, 12], "label":"RIGHT BRACKET", "x":12.5, "y":1},
+ {"matrix": [1, 13], "label":"BACK SLASH", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 14], "label":"HOME", "x":15, "y":1},
+ {"matrix": [2, 0], "label":"CAPS LOCK", "x":0, "y":2, "w":1.75},
+ {"matrix": [2, 1], "label":"A", "x":1.75, "y":2},
+ {"matrix": [2, 2], "label":"S", "x":2.75, "y":2},
+ {"matrix": [2, 3], "label":"D", "x":3.75, "y":2},
+ {"matrix": [2, 4], "label":"F", "x":4.75, "y":2},
+ {"matrix": [2, 5], "label":"G", "x":5.75, "y":2},
+ {"matrix": [2, 6], "label":"H", "x":6.75, "y":2},
+ {"matrix": [2, 7], "label":"J", "x":7.75, "y":2},
+ {"matrix": [2, 8], "label":"K", "x":8.75, "y":2},
+ {"matrix": [2, 9], "label":"L", "x":9.75, "y":2},
+ {"matrix": [2, 10], "label":"SEMICOLON", "x":10.75, "y":2},
+ {"matrix": [2, 11], "label":"SINGLE TICK", "x":11.75, "y":2},
+ {"matrix": [2, 13], "label":"ENTER", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 14], "label":"PAGE UP", "x":15, "y":2},
+ {"matrix": [3, 0], "label":"LEFT SHIFT", "x":0, "y":3, "w":2.25},
+ {"matrix": [3, 2], "label":"Z", "x":2.25, "y":3},
+ {"matrix": [3, 3], "label":"X", "x":3.25, "y":3},
+ {"matrix": [3, 4], "label":"C", "x":4.25, "y":3},
+ {"matrix": [3, 5], "label":"V", "x":5.25, "y":3},
+ {"matrix": [3, 6], "label":"B", "x":6.25, "y":3},
+ {"matrix": [3, 7], "label":"N", "x":7.25, "y":3},
+ {"matrix": [3, 8], "label":"M", "x":8.25, "y":3},
+ {"matrix": [3, 9], "label":"COMMA", "x":9.25, "y":3},
+ {"matrix": [3, 10], "label":"PERIOD", "x":10.25, "y":3},
+ {"matrix": [3, 11], "label":"FORWARD SLASH", "x":11.25, "y":3},
+ {"matrix": [3, 12], "label":"RIGHT SHIFT", "x":12.25, "y":3, "w":1.75},
+ {"matrix": [3, 13], "label":"UP ARROW", "x":14, "y":3},
+ {"matrix": [3, 14], "label":"PAGE DOWN", "x":15, "y":3},
+ {"matrix": [4, 0], "label":"LEFT CTRL", "x":0, "y":4, "w":1.25},
+ {"matrix": [4, 1], "label":"LEFT WIN", "x":1.25, "y":4, "w":1.25},
+ {"matrix": [4, 2], "label":"LEFT ALT", "x":2.5, "y":4, "w":1.25},
+ {"matrix": [4, 6], "label":"SPACEBAR", "x":3.75, "y":4, "w":6.25},
+ {"matrix": [4, 10], "label":"RIGHT ALT", "x":10, "y":4, "w":1.25},
+ {"matrix": [4, 11], "label":"FN", "x":11.25, "y":4, "w":1.25},
+ {"matrix": [4, 12], "label":"LEFT ARROW", "x":13, "y":4},
+ {"matrix": [4, 13], "label":"DOWN ARROW", "x":14, "y":4},
+ {"matrix": [4, 14], "label":"RIGHT ARROW", "x":15, "y":4}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "driver": "IS31FL3733",
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "rainbow_moving_chevron": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "layout": [
+ { "flags": 4, "matrix": [0, 0], "x": 8, "y": 56 },
+ { "flags": 4, "matrix": [0, 1], "x": 22, "y": 56 },
+ { "flags": 4, "matrix": [0, 2], "x": 35, "y": 56 },
+ { "flags": 4, "matrix": [0, 3], "x": 49, "y": 56 },
+ { "flags": 4, "matrix": [0, 4], "x": 63, "y": 56 },
+ { "flags": 4, "matrix": [0, 5], "x": 77, "y": 56 },
+ { "flags": 4, "matrix": [0, 6], "x": 91, "y": 56 },
+ { "flags": 4, "matrix": [0, 7], "x": 105, "y": 56 },
+ { "flags": 4, "matrix": [0, 8], "x": 118, "y": 56 },
+ { "flags": 4, "matrix": [0, 9], "x": 132, "y": 56 },
+ { "flags": 4, "matrix": [0, 10], "x": 146, "y": 56 },
+ { "flags": 4, "matrix": [0, 11], "x": 160, "y": 56 },
+ { "flags": 4, "matrix": [0, 12], "x": 174, "y": 56 },
+ { "flags": 4, "matrix": [0, 13], "x": 195, "y": 56 },
+ { "flags": 4, "matrix": [0, 14], "x": 215, "y": 56 },
+ { "flags": 4, "matrix": [1, 0], "x": 11, "y": 44 },
+ { "flags": 4, "matrix": [1, 1], "x": 28, "y": 44 },
+ { "flags": 4, "matrix": [1, 2], "x": 42, "y": 44 },
+ { "flags": 4, "matrix": [1, 3], "x": 56, "y": 44 },
+ { "flags": 4, "matrix": [1, 4], "x": 70, "y": 44 },
+ { "flags": 4, "matrix": [1, 5], "x": 84, "y": 44 },
+ { "flags": 4, "matrix": [1, 6], "x": 98, "y": 44 },
+ { "flags": 4, "matrix": [1, 7], "x": 112, "y": 44 },
+ { "flags": 4, "matrix": [1, 8], "x": 125, "y": 44 },
+ { "flags": 4, "matrix": [1, 9], "x": 139, "y": 44 },
+ { "flags": 4, "matrix": [1, 10], "x": 153, "y": 44 },
+ { "flags": 4, "matrix": [1, 11], "x": 167, "y": 44 },
+ { "flags": 4, "matrix": [1, 12], "x": 181, "y": 44 },
+ { "flags": 4, "matrix": [1, 13], "x": 198, "y": 44 },
+ { "flags": 4, "matrix": [1, 14], "x": 215, "y": 44 },
+ { "flags": 4, "matrix": [2, 0], "x": 13, "y": 32 },
+ { "flags": 4, "matrix": [2, 1], "x": 32, "y": 32 },
+ { "flags": 4, "matrix": [2, 2], "x": 46, "y": 32 },
+ { "flags": 4, "matrix": [2, 3], "x": 60, "y": 32 },
+ { "flags": 4, "matrix": [2, 4], "x": 73, "y": 32 },
+ { "flags": 4, "matrix": [2, 5], "x": 87, "y": 32 },
+ { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 },
+ { "flags": 4, "matrix": [2, 7], "x": 115, "y": 32 },
+ { "flags": 4, "matrix": [2, 8], "x": 129, "y": 32 },
+ { "flags": 4, "matrix": [2, 9], "x": 143, "y": 32 },
+ { "flags": 4, "matrix": [2, 10], "x": 156, "y": 32 },
+ { "flags": 4, "matrix": [2, 11], "x": 170, "y": 32 },
+ { "flags": 4, "matrix": [2, 13], "x": 193, "y": 32 },
+ { "flags": 4, "matrix": [2, 14], "x": 215, "y": 32 },
+ { "flags": 4, "matrix": [3, 0], "x": 16, "y": 19 },
+ { "flags": 4, "matrix": [3, 2], "x": 39, "y": 19 },
+ { "flags": 4, "matrix": [3, 3], "x": 53, "y": 19 },
+ { "flags": 4, "matrix": [3, 4], "x": 67, "y": 19 },
+ { "flags": 4, "matrix": [3, 5], "x": 80, "y": 19 },
+ { "flags": 4, "matrix": [3, 6], "x": 94, "y": 19 },
+ { "flags": 4, "matrix": [3, 7], "x": 108, "y": 19 },
+ { "flags": 4, "matrix": [3, 8], "x": 122, "y": 19 },
+ { "flags": 4, "matrix": [3, 9], "x": 136, "y": 19 },
+ { "flags": 4, "matrix": [3, 10], "x": 150, "y": 19 },
+ { "flags": 4, "matrix": [3, 11], "x": 163, "y": 19 },
+ { "flags": 4, "matrix": [3, 12], "x": 182, "y": 19 },
+ { "flags": 4, "matrix": [3, 13], "x": 201, "y": 19 },
+ { "flags": 4, "matrix": [3, 14], "x": 215, "y": 19 },
+ { "flags": 4, "matrix": [4, 0], "x": 9, "y": 7 },
+ { "flags": 4, "matrix": [4, 1], "x": 27, "y": 7 },
+ { "flags": 4, "matrix": [4, 2], "x": 44, "y": 7 },
+ { "flags": 4, "matrix": [4, 6], "x": 96, "y": 7 },
+ { "flags": 4, "matrix": [4, 10], "x": 148, "y": 7 },
+ { "flags": 4, "matrix": [4, 11], "x": 165, "y": 7 },
+ { "flags": 4, "matrix": [4, 12], "x": 188, "y": 7 },
+ { "flags": 4, "matrix": [4, 13], "x": 201, "y": 7 },
+ { "flags": 4, "matrix": [4, 14], "x": 215, "y": 7 },
+ { "flags": 2, "x": 1, "y": 1 },
+ { "flags": 2, "x": 15, "y": 0 },
+ { "flags": 2, "x": 31, "y": 0 },
+ { "flags": 2, "x": 47, "y": 0 },
+ { "flags": 2, "x": 63, "y": 0 },
+ { "flags": 2, "x": 79, "y": 0 },
+ { "flags": 2, "x": 95, "y": 0 },
+ { "flags": 2, "x": 112, "y": 0 },
+ { "flags": 2, "x": 128, "y": 0 },
+ { "flags": 2, "x": 144, "y": 0 },
+ { "flags": 2, "x": 160, "y": 0 },
+ { "flags": 2, "x": 176, "y": 0 },
+ { "flags": 2, "x": 192, "y": 0 },
+ { "flags": 2, "x": 208, "y": 0 },
+ { "flags": 2, "x": 222, "y": 1 },
+ { "flags": 2, "x": 224, "y": 13 },
+ { "flags": 2, "x": 224, "y": 25 },
+ { "flags": 2, "x": 224, "y": 38 },
+ { "flags": 2, "x": 224, "y": 50 },
+ { "flags": 2, "x": 222, "y": 62 },
+ { "flags": 2, "x": 191, "y": 64 },
+ { "flags": 2, "x": 179, "y": 64 },
+ { "flags": 2, "x": 167, "y": 64 },
+ { "flags": 2, "x": 153, "y": 64 },
+ { "flags": 2, "x": 139, "y": 64 },
+ { "flags": 2, "x": 125, "y": 64 },
+ { "flags": 2, "x": 112, "y": 64 },
+ { "flags": 2, "x": 98, "y": 64 },
+ { "flags": 2, "x": 84, "y": 64 },
+ { "flags": 2, "x": 70, "y": 64 },
+ { "flags": 2, "x": 56, "y": 64 },
+ { "flags": 2, "x": 42, "y": 64 },
+ { "flags": 2, "x": 28, "y": 64 },
+ { "flags": 2, "x": 1, "y": 62 },
+ { "flags": 2, "x": 0, "y": 50 },
+ { "flags": 2, "x": 0, "y": 38 },
+ { "flags": 2, "x": 0, "y": 25 },
+ { "flags": 2, "x": 0, "y": 13 }
+ ]
+ }
+}
diff --git a/keyboards/drop/alt/v2/mcuconf.h b/keyboards/drop/alt/v2/mcuconf.h
new file mode 100644
index 000000000000..dc3e45dac054
--- /dev/null
+++ b/keyboards/drop/alt/v2/mcuconf.h
@@ -0,0 +1,20 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 16
+
+#undef STM32_PREDIV_VALUE
+#define STM32_PREDIV_VALUE 2
+
+#undef STM32_ADC_USE_ADC2
+#define STM32_ADC_USE_ADC2 TRUE
+
+#undef STM32_ADC_USE_ADC3
+#define STM32_ADC_USE_ADC3 TRUE
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/drop/alt/v2/readme.md b/keyboards/drop/alt/v2/readme.md
new file mode 100644
index 000000000000..bf69d4b28967
--- /dev/null
+++ b/keyboards/drop/alt/v2/readme.md
@@ -0,0 +1,24 @@
+# ALT v2
+
+The Drop ALT v2 is a 65% mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
+
+* Keyboard Maintainer: [zvecr](https://github.com/zvecr)
+* Hardware Availability: [Drop ALT Mechanical Keyboard](https://drop.com/buy/drop-alt-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make drop/alt/v2:default
+
+Flashing example for this keyboard:
+
+ make drop/alt/v2: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Quickly double tap the button located under the spacebar
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/drop/alt/v2/rules.mk b/keyboards/drop/alt/v2/rules.mk
new file mode 100644
index 000000000000..a504f81cb146
--- /dev/null
+++ b/keyboards/drop/alt/v2/rules.mk
@@ -0,0 +1,4 @@
+UF2_DEVICE_TYPE_ID = 0x35446147
+UF2CONV_ARGS = --device-type $(UF2_DEVICE_TYPE_ID)
+
+SRC += analog.c lib/common.c lib/mux.c
diff --git a/keyboards/drop/alt/v2/v2.c b/keyboards/drop/alt/v2/v2.c
new file mode 100644
index 000000000000..2e183fe4d82b
--- /dev/null
+++ b/keyboards/drop/alt/v2/v2.c
@@ -0,0 +1,114 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifdef RGB_MATRIX_ENABLE
+# include "rgb_matrix.h"
+
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+ { 1, B_2, A_2, C_2 },
+ { 1, E_3, D_3, F_3 },
+ { 1, E_4, D_4, F_4 },
+ { 1, E_5, D_5, F_5 },
+ { 1, E_6, D_6, F_6 },
+ { 1, E_7, D_7, F_7 },
+ { 1, E_8, D_8, F_8 },
+ { 1, B_13, A_13, C_13 },
+ { 0, E_1, D_1, F_1 },
+ { 0, E_2, D_2, F_2 },
+ { 0, E_3, D_3, F_3 },
+ { 0, E_4, D_4, F_4 },
+ { 0, E_5, D_5, F_5 },
+ { 0, E_6, D_6, F_6 },
+ { 0, B_7, A_7, C_7 },
+ { 1, E_2, D_2, F_2 },
+ { 1, H_3, G_3, I_3 },
+ { 1, H_4, G_4, I_4 },
+ { 1, H_5, G_5, I_5 },
+ { 1, H_6, G_6, I_6 },
+ { 1, H_7, G_7, I_7 },
+ { 1, H_8, G_8, I_8 },
+ { 0, H_1, G_1, I_1 },
+ { 0, H_2, G_2, I_2 },
+ { 0, H_3, G_3, I_3 },
+ { 0, H_4, G_4, I_4 },
+ { 0, H_5, G_5, I_5 },
+ { 0, K_11, J_11, L_11 },
+ { 0, H_6, G_6, I_6 },
+ { 0, E_7, D_7, F_7 },
+ { 1, H_2, G_2, I_2 },
+ { 1, K_3, J_3, L_3 },
+ { 1, K_4, J_4, L_4 },
+ { 1, K_5, J_5, L_5 },
+ { 1, K_6, J_6, L_6 },
+ { 1, K_7, J_7, L_7 },
+ { 1, K_8, J_8, L_8 },
+ { 0, K_1, J_1, L_1 },
+ { 0, K_2, J_2, L_2 },
+ { 0, K_3, J_3, L_3 },
+ { 0, K_4, J_4, L_4 },
+ { 0, K_5, J_5, L_5 },
+ { 0, K_6, J_6, L_6 },
+ { 0, H_7, G_7, I_7 },
+ { 1, K_2, J_2, L_2 },
+ { 1, E_9, D_9, F_9 },
+ { 1, B_9, A_9, C_9 },
+ { 1, K_9, J_9, L_9 },
+ { 1, H_9, G_9, I_9 },
+ { 1, K_12, J_12, L_12 },
+ { 1, K_13, J_13, L_13 },
+ { 0, K_9, J_9, L_9 },
+ { 0, K_10, J_10, L_10 },
+ { 0, H_10, G_10, I_10 },
+ { 0, H_11, G_11, I_11 },
+ { 0, B_11, A_11, C_11 },
+ { 0, E_11, D_11, F_11 },
+ { 0, K_7, J_7, L_7 },
+ { 1, H_10, G_10, I_10 },
+ { 1, E_10, D_10, F_10 },
+ { 1, B_10, A_10, C_10 },
+ { 1, H_12, G_12, I_12 },
+ { 0, E_10, D_10, F_10 },
+ { 0, B_10, A_10, C_10 },
+ { 0, B_12, A_12, C_12 },
+ { 0, H_12, G_12, I_12 },
+ { 0, E_12, D_12, F_12 },
+ { 1, K_11, J_11, L_11 },
+ { 1, H_11, G_11, I_11 },
+ { 1, E_11, D_11, F_11 },
+ { 1, B_11, A_11, C_11 },
+ { 1, B_12, A_12, C_12 },
+ { 1, E_12, D_12, F_12 },
+ { 1, E_13, D_13, F_13 },
+ { 1, H_13, G_13, I_13 },
+ { 0, H_9, G_9, I_9 },
+ { 0, E_9, D_9, F_9 },
+ { 0, B_9, A_9, C_9 },
+ { 0, B_13, A_13, C_13 },
+ { 0, H_13, G_13, I_13 },
+ { 0, E_13, D_13, F_13 },
+ { 0, K_13, J_13, L_13 },
+ { 0, K_12, J_12, L_12 },
+ { 0, K_8, J_8, L_8 },
+ { 0, H_8, G_8, I_8 },
+ { 0, E_8, D_8, F_8 },
+ { 0, B_8, A_8, C_8 },
+ { 0, B_6, A_6, C_6 },
+ { 0, B_5, A_5, C_5 },
+ { 0, B_4, A_4, C_4 },
+ { 0, B_3, A_3, C_3 },
+ { 0, B_2, A_2, C_2 },
+ { 0, B_1, A_1, C_1 },
+ { 0, B_14, A_14, C_14 },
+ { 1, B_8, A_8, C_8 },
+ { 1, B_7, A_7, C_7 },
+ { 1, B_6, A_6, C_6 },
+ { 1, B_5, A_5, C_5 },
+ { 1, B_4, A_4, C_4 },
+ { 1, B_3, A_3, C_3 },
+ { 1, B_1, A_1, C_1 },
+ { 1, E_1, D_1, F_1 },
+ { 1, H_1, G_1, I_1 },
+ { 1, K_1, J_1, L_1 },
+ { 1, K_10, J_10, L_10 },
+};
+
+#endif
diff --git a/keyboards/drop/ctrl/keymaps/default/keymap.c b/keyboards/drop/ctrl/keymaps/default/keymap.c
new file mode 100644
index 000000000000..82b108892175
--- /dev/null
+++ b/keyboards/drop/ctrl/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_tkl_ansi(
+ 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_PSCR, KC_SCRL, KC_PAUS,
+ 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_INS, KC_HOME, KC_PGUP,
+ 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_DEL, KC_END, KC_PGDN,
+ 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_tkl_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU,
+ _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD,
+ _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, EE_CLR, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/drop/ctrl/keymaps/via/config.h b/keyboards/drop/ctrl/keymaps/via/config.h
new file mode 100644
index 000000000000..616f8e329102
--- /dev/null
+++ b/keyboards/drop/ctrl/keymaps/via/config.h
@@ -0,0 +1,5 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/drop/ctrl/keymaps/via/keymap.c b/keyboards/drop/ctrl/keymaps/via/keymap.c
new file mode 100644
index 000000000000..82b108892175
--- /dev/null
+++ b/keyboards/drop/ctrl/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_tkl_ansi(
+ 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_PSCR, KC_SCRL, KC_PAUS,
+ 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_INS, KC_HOME, KC_PGUP,
+ 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_DEL, KC_END, KC_PGDN,
+ 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_tkl_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_VOLU,
+ _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD,
+ _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, EE_CLR, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/drop/ctrl/keymaps/via/rules.mk b/keyboards/drop/ctrl/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/drop/ctrl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/drop/ctrl/v2/board.h b/keyboards/drop/ctrl/v2/board.h
new file mode 100644
index 000000000000..ed3ea4b1f776
--- /dev/null
+++ b/keyboards/drop/ctrl/v2/board.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/drop/ctrl/v2/config.h b/keyboards/drop/ctrl/v2/config.h
new file mode 100644
index 000000000000..539c505cb38c
--- /dev/null
+++ b/keyboards/drop/ctrl/v2/config.h
@@ -0,0 +1,29 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define ADC_BUFFER_DEPTH 4
+#define ADC_SAMPLING_RATE ADC_SMPR_SMP_601P5
+#define ADC_RESOLUTION ADC_CFGR_RES_12BITS
+
+#define I2C_DRIVER I2CD2
+#define I2C1_SCL_PIN A9
+#define I2C1_SDA_PIN A10
+
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10101000
+#define EXTERNAL_EEPROM_WP_PIN B5
+#define EEPROM_I2C_24LC256
+
+#define DRIVER_ADDR_1 0b1010011
+#define DRIVER_ADDR_2 0b1011111
+#define DRIVER_COUNT 2
+#define RGB_MATRIX_LED_COUNT 119
+#define ISSI_PWM_FREQUENCY 0b010 // 26k
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_DEFAULT_VAL 100
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_MATRIX_CYCLE_ZONES_ENABLE
+#define RGB_MATRIX_CAPS_LOCK_INDEX 50
diff --git a/keyboards/drop/ctrl/v2/halconf.h b/keyboards/drop/ctrl/v2/halconf.h
new file mode 100644
index 000000000000..77495ecfa0d0
--- /dev/null
+++ b/keyboards/drop/ctrl/v2/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_I2C TRUE
+
+#include_next
diff --git a/keyboards/drop/ctrl/v2/info.json b/keyboards/drop/ctrl/v2/info.json
new file mode 100644
index 000000000000..30b86db9b5e9
--- /dev/null
+++ b/keyboards/drop/ctrl/v2/info.json
@@ -0,0 +1,295 @@
+{
+ "keyboard_name": "CTRL v2",
+ "manufacturer": "Drop Inc.",
+ "maintainer": "zvecr",
+ "processor": "STM32F303",
+ "bootloader": "tinyuf2",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["C0", "C1", "C2", "C3", "C6", "C7", "C8", "C9"],
+ "rows": ["A0", "A1", "A2", "A3", "C10", "C11", "C12", "B3", "C14", "C13", "C15"]
+ },
+ "usb": {
+ "vid": "0x359B",
+ "pid": "0x0009",
+ "device_version": "2.0.0"
+ },
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "features": {
+ "rgb_matrix": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "community_layouts": ["tkl_ansi"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_tkl_ansi"
+ },
+ "layouts": {
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "label":"ESCAPE", "x":0, "y":0},
+ {"matrix": [0, 1], "label":"F1", "x":2, "y":0},
+ {"matrix": [0, 2], "label":"F2", "x":3, "y":0},
+ {"matrix": [0, 3], "label":"F3", "x":4, "y":0},
+ {"matrix": [0, 4], "label":"F4", "x":5, "y":0},
+ {"matrix": [0, 5], "label":"F5", "x":6.5, "y":0},
+ {"matrix": [0, 6], "label":"F6", "x":7.5, "y":0},
+ {"matrix": [0, 7], "label":"F7", "x":8.5, "y":0},
+ {"matrix": [6, 0], "label":"F8", "x":9.5, "y":0},
+ {"matrix": [6, 1], "label":"F9", "x":11, "y":0},
+ {"matrix": [6, 2], "label":"F10", "x":12, "y":0},
+ {"matrix": [6, 3], "label":"F11", "x":13, "y":0},
+ {"matrix": [6, 4], "label":"F12", "x":14, "y":0},
+ {"matrix": [6, 5], "label":"PRINT SCREEN", "x":15.5, "y":0},
+ {"matrix": [6, 6], "label":"SCROLL LOCK", "x":16.5, "y":0},
+ {"matrix": [6, 7], "label":"PAUSE BREAK", "x":17.5, "y":0},
+ {"matrix": [1, 0], "label":"BACKTICK", "x":0, "y":1.5},
+ {"matrix": [1, 1], "label":"1", "x":1, "y":1.5},
+ {"matrix": [1, 2], "label":"2", "x":2, "y":1.5},
+ {"matrix": [1, 3], "label":"3", "x":3, "y":1.5},
+ {"matrix": [1, 4], "label":"4", "x":4, "y":1.5},
+ {"matrix": [1, 5], "label":"5", "x":5, "y":1.5},
+ {"matrix": [1, 6], "label":"6", "x":6, "y":1.5},
+ {"matrix": [1, 7], "label":"7", "x":7, "y":1.5},
+ {"matrix": [7, 0], "label":"8", "x":8, "y":1.5},
+ {"matrix": [7, 1], "label":"9", "x":9, "y":1.5},
+ {"matrix": [7, 2], "label":"0", "x":10, "y":1.5},
+ {"matrix": [7, 3], "label":"MINUS", "x":11, "y":1.5},
+ {"matrix": [7, 4], "label":"EQUALS", "x":12, "y":1.5},
+ {"matrix": [7, 5], "label":"BACKSPACE", "x":13, "y":1.5, "w":2},
+ {"matrix": [7, 6], "label":"INSERT", "x":15.5, "y":1.5},
+ {"matrix": [7, 7], "label":"HOME", "x":16.5, "y":1.5},
+ {"matrix": [9, 7], "label":"PAGE UP", "x":17.5, "y":1.5},
+ {"matrix": [2, 0], "label":"TAB", "x":0, "y":2.5, "w":1.5},
+ {"matrix": [2, 1], "label":"Q", "x":1.5, "y":2.5},
+ {"matrix": [2, 2], "label":"W", "x":2.5, "y":2.5},
+ {"matrix": [2, 3], "label":"E", "x":3.5, "y":2.5},
+ {"matrix": [2, 4], "label":"R", "x":4.5, "y":2.5},
+ {"matrix": [2, 5], "label":"T", "x":5.5, "y":2.5},
+ {"matrix": [2, 6], "label":"Y", "x":6.5, "y":2.5},
+ {"matrix": [2, 7], "label":"U", "x":7.5, "y":2.5},
+ {"matrix": [8, 0], "label":"I", "x":8.5, "y":2.5},
+ {"matrix": [8, 1], "label":"O", "x":9.5, "y":2.5},
+ {"matrix": [8, 2], "label":"P", "x":10.5, "y":2.5},
+ {"matrix": [8, 3], "label":"LEFT BRACKET", "x":11.5, "y":2.5},
+ {"matrix": [8, 4], "label":"RIGHT BRACKET", "x":12.5, "y":2.5},
+ {"matrix": [8, 5], "label":"BACK SLASH", "x":13.5, "y":2.5, "w":1.5},
+ {"matrix": [8, 6], "label":"DELETE", "x":15.5, "y":2.5},
+ {"matrix": [8, 7], "label":"END", "x":16.5, "y":2.5},
+ {"matrix": [9, 6], "label":"PAGE DOWN", "x":17.5, "y":2.5},
+ {"matrix": [3, 0], "label":"CAPS LOCK", "x":0, "y":3.5, "w":1.75},
+ {"matrix": [3, 1], "label":"A", "x":1.75, "y":3.5},
+ {"matrix": [3, 2], "label":"S", "x":2.75, "y":3.5},
+ {"matrix": [3, 3], "label":"D", "x":3.75, "y":3.5},
+ {"matrix": [3, 4], "label":"F", "x":4.75, "y":3.5},
+ {"matrix": [3, 5], "label":"G", "x":5.75, "y":3.5},
+ {"matrix": [3, 6], "label":"H", "x":6.75, "y":3.5},
+ {"matrix": [3, 7], "label":"J", "x":7.75, "y":3.5},
+ {"matrix": [9, 0], "label":"K", "x":8.75, "y":3.5},
+ {"matrix": [9, 1], "label":"L", "x":9.75, "y":3.5},
+ {"matrix": [9, 2], "label":"SEMICOLON", "x":10.75, "y":3.5},
+ {"matrix": [9, 3], "label":"SINGLE TICK", "x":11.75, "y":3.5},
+ {"matrix": [9, 4], "label":"ENTER", "x":12.75, "y":3.5, "w":2.25},
+ {"matrix": [4, 0], "label":"LEFT SHIFT", "x":0, "y":4.5, "w":2.25},
+ {"matrix": [4, 1], "label":"Z", "x":2.25, "y":4.5},
+ {"matrix": [4, 2], "label":"X", "x":3.25, "y":4.5},
+ {"matrix": [4, 3], "label":"C", "x":4.25, "y":4.5},
+ {"matrix": [4, 4], "label":"V", "x":5.25, "y":4.5},
+ {"matrix": [4, 5], "label":"B", "x":6.25, "y":4.5},
+ {"matrix": [4, 6], "label":"N", "x":7.25, "y":4.5},
+ {"matrix": [4, 7], "label":"M", "x":8.25, "y":4.5},
+ {"matrix": [10, 0], "label":"COMMA", "x":9.25, "y":4.5},
+ {"matrix": [10, 1], "label":"PERIOD", "x":10.25, "y":4.5},
+ {"matrix": [10, 2], "label":"FORWARD SLASH", "x":11.25, "y":4.5},
+ {"matrix": [10, 3], "label":"RIGHT SHIFT", "x":12.25, "y":4.5, "w":2.75},
+ {"matrix": [9, 5], "label":"UP ARROW", "x":16.5, "y":4.5},
+ {"matrix": [5, 0], "label":"LEFT CTRL", "x":0, "y":5.5, "w":1.25},
+ {"matrix": [5, 1], "label":"LEFT WIN", "x":1.25, "y":5.5, "w":1.25},
+ {"matrix": [5, 2], "label":"LEFT ALT", "x":2.5, "y":5.5, "w":1.25},
+ {"matrix": [5, 3], "label":"SPACEBAR", "x":3.75, "y":5.5, "w":6.25},
+ {"matrix": [5, 4], "label":"RIGHT ALT", "x":10, "y":5.5, "w":1.25},
+ {"matrix": [5, 5], "label":"FN", "x":11.25, "y":5.5, "w":1.25},
+ {"matrix": [5, 6], "label":"MENU", "x":12.5, "y":5.5, "w":1.25},
+ {"matrix": [5, 7], "label":"RIGHT CTRL", "x":13.75, "y":5.5, "w":1.25},
+ {"matrix": [10, 4], "label":"LEFT ARROW", "x":15.5, "y":5.5},
+ {"matrix": [10, 5], "label":"DOWN ARROW", "x":16.5, "y":5.5},
+ {"matrix": [10, 6], "label":"RIGHT ARROW", "x":17.5, "y":5.5}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "driver": "IS31FL3733",
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "rainbow_moving_chevron": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "layout": [
+ { "flags": 1, "matrix": [0, 0], "x": 7, "y": 5 },
+ { "flags": 4, "matrix": [0, 1], "x": 31, "y": 5 },
+ { "flags": 4, "matrix": [0, 2], "x": 43, "y": 5 },
+ { "flags": 4, "matrix": [0, 3], "x": 55, "y": 5 },
+ { "flags": 4, "matrix": [0, 4], "x": 67, "y": 5 },
+ { "flags": 1, "matrix": [0, 5], "x": 85, "y": 5 },
+ { "flags": 1, "matrix": [0, 6], "x": 97, "y": 5 },
+ { "flags": 1, "matrix": [0, 7], "x": 109, "y": 5 },
+ { "flags": 1, "matrix": [6, 0], "x": 121, "y": 5 },
+ { "flags": 4, "matrix": [6, 1], "x": 139, "y": 5 },
+ { "flags": 4, "matrix": [6, 2], "x": 151, "y": 5 },
+ { "flags": 4, "matrix": [6, 3], "x": 163, "y": 5 },
+ { "flags": 4, "matrix": [6, 4], "x": 175, "y": 5 },
+ { "flags": 1, "matrix": [6, 5], "x": 193, "y": 5 },
+ { "flags": 9, "matrix": [6, 6], "x": 205, "y": 5 },
+ { "flags": 1, "matrix": [6, 7], "x": 217, "y": 5 },
+ { "flags": 4, "matrix": [1, 0], "x": 7, "y": 20 },
+ { "flags": 4, "matrix": [1, 1], "x": 19, "y": 20 },
+ { "flags": 4, "matrix": [1, 2], "x": 31, "y": 20 },
+ { "flags": 4, "matrix": [1, 3], "x": 43, "y": 20 },
+ { "flags": 4, "matrix": [1, 4], "x": 55, "y": 20 },
+ { "flags": 4, "matrix": [1, 5], "x": 67, "y": 20 },
+ { "flags": 4, "matrix": [1, 6], "x": 79, "y": 20 },
+ { "flags": 4, "matrix": [1, 7], "x": 91, "y": 20 },
+ { "flags": 4, "matrix": [7, 0], "x": 103, "y": 20 },
+ { "flags": 4, "matrix": [7, 1], "x": 115, "y": 20 },
+ { "flags": 4, "matrix": [7, 2], "x": 127, "y": 20 },
+ { "flags": 4, "matrix": [7, 3], "x": 139, "y": 20 },
+ { "flags": 4, "matrix": [7, 4], "x": 151, "y": 20 },
+ { "flags": 1, "matrix": [7, 5], "x": 169, "y": 20 },
+ { "flags": 1, "matrix": [7, 6], "x": 193, "y": 20 },
+ { "flags": 1, "matrix": [7, 7], "x": 205, "y": 20 },
+ { "flags": 1, "matrix": [9, 7], "x": 217, "y": 20 },
+ { "flags": 1, "matrix": [2, 0], "x": 10, "y": 30 },
+ { "flags": 4, "matrix": [2, 1], "x": 25, "y": 30 },
+ { "flags": 4, "matrix": [2, 2], "x": 37, "y": 30 },
+ { "flags": 4, "matrix": [2, 3], "x": 49, "y": 30 },
+ { "flags": 4, "matrix": [2, 4], "x": 61, "y": 30 },
+ { "flags": 4, "matrix": [2, 5], "x": 73, "y": 30 },
+ { "flags": 4, "matrix": [2, 6], "x": 85, "y": 30 },
+ { "flags": 4, "matrix": [2, 7], "x": 97, "y": 30 },
+ { "flags": 4, "matrix": [8, 0], "x": 109, "y": 30 },
+ { "flags": 4, "matrix": [8, 1], "x": 121, "y": 30 },
+ { "flags": 4, "matrix": [8, 2], "x": 133, "y": 30 },
+ { "flags": 4, "matrix": [8, 3], "x": 145, "y": 30 },
+ { "flags": 4, "matrix": [8, 4], "x": 157, "y": 30 },
+ { "flags": 4, "matrix": [8, 5], "x": 172, "y": 30 },
+ { "flags": 1, "matrix": [8, 6], "x": 193, "y": 30 },
+ { "flags": 1, "matrix": [8, 7], "x": 205, "y": 30 },
+ { "flags": 1, "matrix": [9, 6], "x": 217, "y": 30 },
+ { "flags": 9, "matrix": [3, 0], "x": 11, "y": 39 },
+ { "flags": 4, "matrix": [3, 1], "x": 28, "y": 39 },
+ { "flags": 4, "matrix": [3, 2], "x": 40, "y": 39 },
+ { "flags": 4, "matrix": [3, 3], "x": 52, "y": 39 },
+ { "flags": 4, "matrix": [3, 4], "x": 64, "y": 39 },
+ { "flags": 4, "matrix": [3, 5], "x": 76, "y": 39 },
+ { "flags": 4, "matrix": [3, 6], "x": 88, "y": 39 },
+ { "flags": 4, "matrix": [3, 7], "x": 100, "y": 39 },
+ { "flags": 4, "matrix": [9, 0], "x": 112, "y": 39 },
+ { "flags": 4, "matrix": [9, 1], "x": 124, "y": 39 },
+ { "flags": 4, "matrix": [9, 2], "x": 136, "y": 39 },
+ { "flags": 4, "matrix": [9, 3], "x": 148, "y": 39 },
+ { "flags": 1, "matrix": [9, 4], "x": 168, "y": 39 },
+ { "flags": 1, "matrix": [4, 0], "x": 14, "y": 49 },
+ { "flags": 4, "matrix": [4, 1], "x": 34, "y": 49 },
+ { "flags": 4, "matrix": [4, 2], "x": 46, "y": 49 },
+ { "flags": 4, "matrix": [4, 3], "x": 58, "y": 49 },
+ { "flags": 4, "matrix": [4, 4], "x": 70, "y": 49 },
+ { "flags": 4, "matrix": [4, 5], "x": 82, "y": 49 },
+ { "flags": 4, "matrix": [4, 6], "x": 94, "y": 49 },
+ { "flags": 4, "matrix": [4, 7], "x": 106, "y": 49 },
+ { "flags": 4, "matrix": [10, 0], "x": 118, "y": 49 },
+ { "flags": 4, "matrix": [10, 1], "x": 130, "y": 49 },
+ { "flags": 4, "matrix": [10, 2], "x": 142, "y": 49 },
+ { "flags": 1, "matrix": [10, 3], "x": 165, "y": 49 },
+ { "flags": 1, "matrix": [9, 5], "x": 205, "y": 49 },
+ { "flags": 1, "matrix": [5, 0], "x": 8, "y": 59 },
+ { "flags": 1, "matrix": [5, 1], "x": 23, "y": 59 },
+ { "flags": 1, "matrix": [5, 2], "x": 38, "y": 59 },
+ { "flags": 4, "matrix": [5, 3], "x": 83, "y": 59 },
+ { "flags": 1, "matrix": [5, 4], "x": 129, "y": 59 },
+ { "flags": 1, "matrix": [5, 5], "x": 144, "y": 59 },
+ { "flags": 1, "matrix": [5, 6], "x": 159, "y": 59 },
+ { "flags": 1, "matrix": [5, 7], "x": 174, "y": 59 },
+ { "flags": 1, "matrix": [10, 4], "x": 193, "y": 59 },
+ { "flags": 1, "matrix": [10, 5], "x": 205, "y": 59 },
+ { "flags": 1, "matrix": [10, 6], "x": 217, "y": 59 },
+ { "flags": 2, "x": 224, "y": 64 },
+ { "flags": 2, "x": 204, "y": 64 },
+ { "flags": 2, "x": 186, "y": 64 },
+ { "flags": 2, "x": 167, "y": 64 },
+ { "flags": 2, "x": 149, "y": 64 },
+ { "flags": 2, "x": 130, "y": 64 },
+ { "flags": 2, "x": 112, "y": 64 },
+ { "flags": 2, "x": 94, "y": 64 },
+ { "flags": 2, "x": 75, "y": 64 },
+ { "flags": 2, "x": 57, "y": 64 },
+ { "flags": 2, "x": 38, "y": 64 },
+ { "flags": 2, "x": 20, "y": 64 },
+ { "flags": 2, "x": 0, "y": 64 },
+ { "flags": 2, "x": 0, "y": 47 },
+ { "flags": 2, "x": 0, "y": 32 },
+ { "flags": 2, "x": 0, "y": 17 },
+ { "flags": 2, "x": 0, "y": 0 },
+ { "flags": 2, "x": 20, "y": 0 },
+ { "flags": 2, "x": 38, "y": 0 },
+ { "flags": 2, "x": 57, "y": 0 },
+ { "flags": 2, "x": 75, "y": 0 },
+ { "flags": 2, "x": 94, "y": 0 },
+ { "flags": 2, "x": 112, "y": 0 },
+ { "flags": 2, "x": 130, "y": 0 },
+ { "flags": 2, "x": 149, "y": 0 },
+ { "flags": 2, "x": 167, "y": 0 },
+ { "flags": 2, "x": 186, "y": 0 },
+ { "flags": 2, "x": 204, "y": 0 },
+ { "flags": 2, "x": 224, "y": 0 },
+ { "flags": 2, "x": 224, "y": 17 },
+ { "flags": 2, "x": 224, "y": 32 },
+ { "flags": 2, "x": 224, "y": 47 }
+ ]
+ }
+}
diff --git a/keyboards/drop/ctrl/v2/mcuconf.h b/keyboards/drop/ctrl/v2/mcuconf.h
new file mode 100644
index 000000000000..dc3e45dac054
--- /dev/null
+++ b/keyboards/drop/ctrl/v2/mcuconf.h
@@ -0,0 +1,20 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 16
+
+#undef STM32_PREDIV_VALUE
+#define STM32_PREDIV_VALUE 2
+
+#undef STM32_ADC_USE_ADC2
+#define STM32_ADC_USE_ADC2 TRUE
+
+#undef STM32_ADC_USE_ADC3
+#define STM32_ADC_USE_ADC3 TRUE
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/drop/ctrl/v2/readme.md b/keyboards/drop/ctrl/v2/readme.md
new file mode 100644
index 000000000000..8e5be108b6dd
--- /dev/null
+++ b/keyboards/drop/ctrl/v2/readme.md
@@ -0,0 +1,24 @@
+# CTRL v2
+
+The Drop CTRL v2 is a TKL mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
+
+* Keyboard Maintainer: [zvecr](https://github.com/zvecr)
+* Hardware Availability: [Drop CTRL Mechanical Keyboard](https://drop.com/buy/drop-ctrl-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make drop/ctrl/v2:default
+
+Flashing example for this keyboard:
+
+ make drop/ctrl/v2: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Quickly double tap the button located under the spacebar
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/drop/ctrl/v2/rules.mk b/keyboards/drop/ctrl/v2/rules.mk
new file mode 100644
index 000000000000..13c11c1833d2
--- /dev/null
+++ b/keyboards/drop/ctrl/v2/rules.mk
@@ -0,0 +1,4 @@
+UF2_DEVICE_TYPE_ID = 0x27b9a6ea
+UF2CONV_ARGS = --device-type $(UF2_DEVICE_TYPE_ID)
+
+SRC += analog.c lib/common.c lib/mux.c
diff --git a/keyboards/drop/ctrl/v2/v2.c b/keyboards/drop/ctrl/v2/v2.c
new file mode 100644
index 000000000000..6f3091035b7a
--- /dev/null
+++ b/keyboards/drop/ctrl/v2/v2.c
@@ -0,0 +1,128 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifdef RGB_MATRIX_ENABLE
+# include "rgb_matrix.h"
+
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+ { 1, B_2, A_2, C_2 },
+ { 1, E_3, D_3, F_3 },
+ { 1, E_4, D_4, F_4 },
+ { 1, E_5, D_5, F_5 },
+ { 1, B_6, A_6, C_6 },
+ { 1, E_7, D_7, F_7 },
+ { 1, E_8, D_8, F_8 },
+ { 0, E_1, D_1, F_1 },
+ { 0, E_2, D_2, F_2 },
+ { 0, E_3, D_3, F_3 },
+ { 0, E_4, D_4, F_4 },
+ { 0, E_5, D_5, F_5 },
+ { 0, E_6, D_6, F_6 },
+ { 0, E_7, D_7, F_7 },
+ { 0, E_8, D_8, F_8 },
+ { 0, E_9, D_9, F_9 },
+ { 1, H_1, G_1, I_1 },
+ { 1, H_2, G_2, I_2 },
+ { 1, H_3, G_3, I_3 },
+ { 1, H_4, G_4, I_4 },
+ { 1, H_5, G_5, I_5 },
+ { 1, H_6, G_6, I_6 },
+ { 1, H_7, G_7, I_7 },
+ { 1, H_8, G_8, I_8 },
+ { 0, H_1, G_1, I_1 },
+ { 0, H_2, G_2, I_2 },
+ { 0, H_3, G_3, I_3 },
+ { 0, H_4, G_4, I_4 },
+ { 0, H_5, G_5, I_5 },
+ { 0, H_6, G_6, I_6 },
+ { 0, H_7, G_7, I_7 },
+ { 0, H_8, G_8, I_8 },
+ { 0, H_9, G_9, I_9 },
+ { 1, K_1, J_1, L_1 },
+ { 1, K_2, J_2, L_2 },
+ { 1, K_3, J_3, L_3 },
+ { 1, K_4, J_4, L_4 },
+ { 1, K_5, J_5, L_5 },
+ { 1, K_6, J_6, L_6 },
+ { 1, K_7, J_7, L_7 },
+ { 1, K_8, J_8, L_8 },
+ { 0, K_1, J_1, L_1 },
+ { 0, K_2, J_2, L_2 },
+ { 0, K_3, J_3, L_3 },
+ { 0, K_4, J_4, L_4 },
+ { 0, K_5, J_5, L_5 },
+ { 0, K_6, J_6, L_6 },
+ { 0, K_7, J_7, L_7 },
+ { 0, K_8, J_8, L_8 },
+ { 0, K_9, J_9, L_9 },
+ { 1, E_1, D_1, F_1 },
+ { 1, E_2, D_2, F_2 },
+ { 1, K_13, J_13, L_13 },
+ { 1, K_12, J_12, L_12 },
+ { 1, K_11, J_11, L_11 },
+ { 1, E_6, D_6, F_6 },
+ { 1, K_10, J_10, L_10 },
+ { 1, K_9, J_9, L_9 },
+ { 0, K_16, J_16, L_16 },
+ { 0, K_15, J_15, L_15 },
+ { 0, K_14, J_14, L_14 },
+ { 0, K_13, J_13, L_13 },
+ { 0, K_12, J_12, L_12 },
+ { 1, E_14, D_14, F_14 },
+ { 1, E_13, D_13, F_13 },
+ { 1, H_12, G_12, I_12 },
+ { 1, E_12, D_12, F_12 },
+ { 1, E_11, D_11, F_11 },
+ { 1, E_10, D_10, F_10 },
+ { 1, E_9, D_9, F_9 },
+ { 1, H_9, G_9, I_9 },
+ { 0, H_16, G_16, I_16 },
+ { 0, H_15, G_15, I_15 },
+ { 0, H_14, G_14, I_14 },
+ { 0, H_13, G_13, I_13 },
+ { 0, H_11, G_11, I_11 },
+ { 1, K_14, J_14, L_14 },
+ { 1, H_14, G_14, I_14 },
+ { 1, H_13, G_13, I_13 },
+ { 1, H_10, G_10, I_10 },
+ { 0, E_16, D_16, F_16 },
+ { 0, E_15, D_15, F_15 },
+ { 0, E_14, D_14, F_14 },
+ { 0, E_13, D_13, F_13 },
+ { 0, H_12, G_12, I_12 },
+ { 0, E_12, D_12, F_12 },
+ { 0, E_11, D_11, F_11 },
+ { 0, B_11, A_11, C_11 },
+ { 0, B_12, A_12, C_12 },
+ { 0, B_13, A_13, C_13 },
+ { 0, B_14, A_14, C_14 },
+ { 0, B_15, A_15, C_15 },
+ { 0, B_16, A_16, C_16 },
+ { 1, B_9, A_9, C_9 },
+ { 1, B_10, A_10, C_10 },
+ { 1, B_11, A_11, C_11 },
+ { 1, B_12, A_12, C_12 },
+ { 1, B_13, A_13, C_13 },
+ { 1, B_14, A_14, C_14 },
+ { 1, B_15, A_15, C_15 },
+ { 1, K_15, J_15, L_15 },
+ { 1, E_15, D_15, F_15 },
+ { 1, H_15, G_15, I_15 },
+ { 1, B_1, A_1, C_1 },
+ { 1, B_3, A_3, C_3 },
+ { 1, B_4, A_4, C_4 },
+ { 1, B_5, A_5, C_5 },
+ { 1, B_7, A_7, C_7 },
+ { 1, B_8, A_8, C_8 },
+ { 0, B_1, A_1, C_1 },
+ { 0, B_2, A_2, C_2 },
+ { 0, B_3, A_3, C_3 },
+ { 0, B_5, A_5, C_5 },
+ { 0, B_6, A_6, C_6 },
+ { 0, B_8, A_8, C_8 },
+ { 0, B_10, A_10, C_10 },
+ { 0, H_10, G_10, I_10 },
+ { 0, K_10, J_10, L_10 },
+ { 0, E_10, D_10, F_10 },
+};
+
+#endif
diff --git a/keyboards/drop/lib/common.c b/keyboards/drop/lib/common.c
new file mode 100644
index 000000000000..515625a68637
--- /dev/null
+++ b/keyboards/drop/lib/common.c
@@ -0,0 +1,54 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifdef RGB_MATRIX_ENABLE
+# include "host.h"
+# include "rgb_matrix.h"
+
+# define LED_FLAG_ANY_SWITCH (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR)
+
+# ifdef RGB_MATRIX_CAPS_LOCK_INDEX
+bool rgb_matrix_indicators_kb(void) {
+ if (!rgb_matrix_indicators_user()) {
+ return false;
+ }
+
+ if (host_keyboard_led_state().caps_lock) {
+ rgb_matrix_set_color(RGB_MATRIX_CAPS_LOCK_INDEX, RGB_WHITE);
+ } else if ((rgb_matrix_get_flags() & LED_FLAG_ANY_SWITCH) == 0) {
+ rgb_matrix_set_color(RGB_MATRIX_CAPS_LOCK_INDEX, RGB_OFF);
+ }
+ return true;
+}
+# endif
+
+# ifdef RGB_MATRIX_CYCLE_ZONES_ENABLE
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_user(keycode, record)) {
+ return false;
+ }
+
+ if (!record->event.pressed) {
+ switch (keycode) {
+ case RGB_TOG:
+ switch (rgb_matrix_get_flags()) {
+ case LED_FLAG_ALL:
+ rgb_matrix_set_flags(LED_FLAG_ANY_SWITCH);
+ break;
+ case LED_FLAG_ANY_SWITCH:
+ rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+ break;
+ case LED_FLAG_UNDERGLOW:
+ rgb_matrix_set_flags(LED_FLAG_NONE);
+ break;
+ default:
+ rgb_matrix_set_flags(LED_FLAG_ALL);
+ break;
+ }
+ return false;
+ }
+ }
+ return true;
+};
+# endif
+
+#endif
diff --git a/keyboards/drop/lib/mux.c b/keyboards/drop/lib/mux.c
new file mode 100644
index 000000000000..85a657544f65
--- /dev/null
+++ b/keyboards/drop/lib/mux.c
@@ -0,0 +1,94 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "keyboard.h"
+#include "analog.h"
+#include "gpio.h"
+#include "wait.h"
+
+#define S_UP B12
+#define E_UP_N B13
+#define S_DN1 B14
+#define E_DN1_N B15
+#define E_VBUS_1 A8
+#define E_VBUS_2 A15
+#define SRC_1 B8
+#define SRC_2 B9
+#define HUB_RESET_N D2
+#define IRST B1
+#define SDB_N B2
+#define C1_A5_SENSE A4
+#define C1_B5_SENSE A7
+#define C2_A5_SENSE C4
+#define C2_B5_SENSE B0
+
+static inline void digital_write(pin_t pin, uint8_t level) {
+ setPinOutput(pin);
+ writePin(pin, level);
+}
+
+uint16_t v_con_1 = 0;
+uint16_t v_con_2 = 0;
+uint16_t v_con_3 = 0;
+uint16_t v_con_4 = 0;
+
+void keyboard_USB_enable(void) {
+ // initial state
+ digital_write(S_UP, 0);
+ digital_write(E_UP_N, 1);
+ digital_write(S_DN1, 1);
+ digital_write(E_DN1_N, 1);
+ digital_write(E_VBUS_1, 0);
+ digital_write(E_VBUS_2, 0);
+ digital_write(SRC_1, 1);
+ digital_write(SRC_2, 1);
+
+ setPinInput(C1_A5_SENSE);
+ setPinInput(C1_B5_SENSE);
+ setPinInput(C2_A5_SENSE);
+ setPinInput(C2_B5_SENSE);
+
+ // reset hub
+ digital_write(HUB_RESET_N, 0);
+ wait_ms(100);
+ digital_write(HUB_RESET_N, 1);
+
+ wait_ms(500); // Allow power dissipation time on CC lines
+
+ v_con_1 = analogReadPin(C1_A5_SENSE);
+ v_con_2 = analogReadPin(C1_B5_SENSE);
+ v_con_3 = analogReadPin(C2_A5_SENSE);
+ v_con_4 = analogReadPin(C2_B5_SENSE);
+
+ // TODO: dynamic port port configure logic?
+ digital_write(E_UP_N, 0); // HOST enable
+ digital_write(E_DN1_N, 0); // EXTRA enable
+ digital_write(E_VBUS_1, 1); // USBC-1 enable full power I/O
+ digital_write(E_VBUS_2, 1); // USBC-2 enable full power I/O
+
+ if ((v_con_1 + v_con_2) > (v_con_3 + v_con_4)) {
+ digital_write(S_UP, 0); // HOST to USBC-1
+ digital_write(S_DN1, 1); // EXTRA to USBC-2
+ digital_write(SRC_1, 1); // HOST on USBC-1
+ digital_write(SRC_2, 0); // EXTRA available on USBC-2
+ } else {
+ digital_write(S_UP, 1); // EXTRA to USBC-1
+ digital_write(S_DN1, 0); // HOST to USBC-2
+ digital_write(SRC_1, 0); // EXTRA available on USBC-1
+ digital_write(SRC_2, 1); // HOST on USBC-2
+ }
+}
+
+void keyboard_ISSI_enable(void) {
+#ifdef RGB_MATRIX_ENABLE
+ digital_write(IRST, 0);
+ digital_write(SDB_N, 1);
+#endif
+}
+
+
+void keyboard_pre_init_kb(void) {
+ keyboard_USB_enable();
+ keyboard_ISSI_enable();
+
+ keyboard_pre_init_user();
+}
diff --git a/keyboards/drop/shift/keymaps/default/keymap.c b/keyboards/drop/shift/keymaps/default/keymap.c
new file mode 100644
index 000000000000..371908bb482a
--- /dev/null
+++ b/keyboards/drop/shift/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_1800_ansi(
+ 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_DEL, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+ 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_NUM, KC_PSLS, KC_PAST, KC_PSCR,
+ 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_PMNS,
+ 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_PPLS,
+ 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+ ),
+ [1] = LAYOUT_1800_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_MPLY, KC_MSTP, KC_VOLU, KC_MUTE,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_SCRL,
+ _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, EE_CLR, KC_APP, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/drop/shift/keymaps/via/config.h b/keyboards/drop/shift/keymaps/via/config.h
new file mode 100644
index 000000000000..616f8e329102
--- /dev/null
+++ b/keyboards/drop/shift/keymaps/via/config.h
@@ -0,0 +1,5 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/drop/shift/keymaps/via/keymap.c b/keyboards/drop/shift/keymaps/via/keymap.c
new file mode 100644
index 000000000000..371908bb482a
--- /dev/null
+++ b/keyboards/drop/shift/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_1800_ansi(
+ 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_DEL, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+ 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_NUM, KC_PSLS, KC_PAST, KC_PSCR,
+ 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_PMNS,
+ 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_PPLS,
+ 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_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
+ ),
+ [1] = LAYOUT_1800_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, KC_MPLY, KC_MSTP, KC_VOLU, KC_MUTE,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_SCRL,
+ _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, EE_CLR, KC_APP, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/drop/shift/keymaps/via/rules.mk b/keyboards/drop/shift/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/drop/shift/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/drop/shift/v2/board.h b/keyboards/drop/shift/v2/board.h
new file mode 100644
index 000000000000..ed3ea4b1f776
--- /dev/null
+++ b/keyboards/drop/shift/v2/board.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/drop/shift/v2/config.h b/keyboards/drop/shift/v2/config.h
new file mode 100644
index 000000000000..6c651d1f83a1
--- /dev/null
+++ b/keyboards/drop/shift/v2/config.h
@@ -0,0 +1,29 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define ADC_BUFFER_DEPTH 4
+#define ADC_SAMPLING_RATE ADC_SMPR_SMP_601P5
+#define ADC_RESOLUTION ADC_CFGR_RES_12BITS
+
+#define I2C_DRIVER I2CD2
+#define I2C1_SCL_PIN A9
+#define I2C1_SDA_PIN A10
+
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10101000
+#define EXTERNAL_EEPROM_WP_PIN B5
+#define EEPROM_I2C_24LC256
+
+#define DRIVER_ADDR_1 0b1010011
+#define DRIVER_ADDR_2 0b1011111
+#define DRIVER_ADDR_3 0b1010000
+#define DRIVER_COUNT 3
+#define RGB_MATRIX_LED_COUNT 166
+#define ISSI_PWM_FREQUENCY 0b010 // 26k
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_DEFAULT_VAL 100
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_MATRIX_CYCLE_ZONES_ENABLE
diff --git a/keyboards/drop/shift/v2/halconf.h b/keyboards/drop/shift/v2/halconf.h
new file mode 100644
index 000000000000..77495ecfa0d0
--- /dev/null
+++ b/keyboards/drop/shift/v2/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_I2C TRUE
+
+#include_next
diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/info.json
new file mode 100644
index 000000000000..f58b76e9d172
--- /dev/null
+++ b/keyboards/drop/shift/v2/info.json
@@ -0,0 +1,350 @@
+{
+ "keyboard_name": "SHIFT v2",
+ "manufacturer": "Drop Inc.",
+ "maintainer": "zvecr",
+ "processor": "STM32F303",
+ "bootloader": "tinyuf2",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["C0", "C1", "C2", "C3", "C6", "C7", "C8", "C9", "B3", "B4", "C13", "C14", "C15"],
+ "rows": ["A0", "A1", "A2", "A3", "B10", "C10", "C11", "C12"]
+ },
+ "usb": {
+ "vid": "0x359B",
+ "pid": "0x000C",
+ "device_version": "2.0.0"
+ },
+ "eeprom": {
+ "driver": "i2c"
+ },
+ "features": {
+ "rgb_matrix": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "layouts": {
+ "LAYOUT_1800_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [0, 1], "x":1.25, "y":0},
+ {"matrix": [0, 2], "x":2.25, "y":0},
+ {"matrix": [1, 2], "x":3.25, "y":0},
+ {"matrix": [0, 3], "x":4.25, "y":0},
+ {"matrix": [0, 4], "x":5.5, "y":0},
+ {"matrix": [0, 5], "x":6.5, "y":0},
+ {"matrix": [0, 6], "x":7.5, "y":0},
+ {"matrix": [1, 6], "x":8.5, "y":0},
+ {"matrix": [0, 7], "x":9.75, "y":0},
+ {"matrix": [1, 7], "x":10.75, "y":0},
+ {"matrix": [0, 8], "x":11.75, "y":0},
+ {"matrix": [1, 8], "x":12.75, "y":0},
+ {"matrix": [1, 9], "x":14, "y":0},
+ {"matrix": [0, 10], "x":15.5, "y":0},
+ {"matrix": [1, 10], "x":16.5, "y":0},
+ {"matrix": [0, 11], "x":17.5, "y":0},
+ {"matrix": [1, 11], "x":18.5, "y":0},
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [2, 1], "x":2, "y":1.25},
+ {"matrix": [2, 2], "x":3, "y":1.25},
+ {"matrix": [3, 2], "x":4, "y":1.25},
+ {"matrix": [1, 3], "x":5, "y":1.25},
+ {"matrix": [2, 3], "x":6, "y":1.25},
+ {"matrix": [1, 4], "x":7, "y":1.25},
+ {"matrix": [1, 5], "x":8, "y":1.25},
+ {"matrix": [2, 5], "x":9, "y":1.25},
+ {"matrix": [2, 6], "x":10, "y":1.25},
+ {"matrix": [3, 6], "x":11, "y":1.25},
+ {"matrix": [2, 7], "x":12, "y":1.25},
+ {"matrix": [2, 8], "x":13, "y":1.25, "w":2},
+ {"matrix": [2, 9], "x":15.5, "y":1.25},
+ {"matrix": [2, 10], "x":16.5, "y":1.25},
+ {"matrix": [2, 11], "x":17.5, "y":1.25},
+ {"matrix": [2, 12], "x":18.5, "y":1.25},
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [3, 1], "x":1.5, "y":2.25},
+ {"matrix": [4, 1], "x":2.5, "y":2.25},
+ {"matrix": [4, 2], "x":3.5, "y":2.25},
+ {"matrix": [3, 3], "x":4.5, "y":2.25},
+ {"matrix": [4, 3], "x":5.5, "y":2.25},
+ {"matrix": [2, 4], "x":6.5, "y":2.25},
+ {"matrix": [3, 4], "x":7.5, "y":2.25},
+ {"matrix": [3, 5], "x":8.5, "y":2.25},
+ {"matrix": [4, 5], "x":9.5, "y":2.25},
+ {"matrix": [4, 6], "x":10.5, "y":2.25},
+ {"matrix": [3, 7], "x":11.5, "y":2.25},
+ {"matrix": [3, 8], "x":12.5, "y":2.25},
+ {"matrix": [4, 8], "x":13.5, "y":2.25, "w":1.5},
+ {"matrix": [3, 9], "x":15.5, "y":2.25},
+ {"matrix": [3, 10], "x":16.5, "y":2.25},
+ {"matrix": [3, 11], "x":17.5, "y":2.25},
+ {"matrix": [3, 12], "x":18.5, "y":2.25},
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [5, 1], "x":1.75, "y":3.25},
+ {"matrix": [6, 1], "x":2.75, "y":3.25},
+ {"matrix": [5, 2], "x":3.75, "y":3.25},
+ {"matrix": [5, 3], "x":4.75, "y":3.25},
+ {"matrix": [6, 3], "x":5.75, "y":3.25},
+ {"matrix": [4, 4], "x":6.75, "y":3.25},
+ {"matrix": [5, 4], "x":7.75, "y":3.25},
+ {"matrix": [5, 5], "x":8.75, "y":3.25},
+ {"matrix": [5, 6], "x":9.75, "y":3.25},
+ {"matrix": [4, 7], "x":10.75, "y":3.25},
+ {"matrix": [5, 8], "x":11.75, "y":3.25},
+ {"matrix": [6, 8], "x":12.75, "y":3.25, "w":2.25},
+ {"matrix": [4, 9], "x":15.5, "y":3.25},
+ {"matrix": [4, 10], "x":16.5, "y":3.25},
+ {"matrix": [4, 11], "x":17.5, "y":3.25},
+ {"matrix": [4, 12], "x":18.5, "y":3.25},
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+ {"matrix": [7, 1], "x":2.25, "y":4.25},
+ {"matrix": [6, 2], "x":3.25, "y":4.25},
+ {"matrix": [7, 2], "x":4.25, "y":4.25},
+ {"matrix": [7, 3], "x":5.25, "y":4.25},
+ {"matrix": [6, 4], "x":6.25, "y":4.25},
+ {"matrix": [7, 5], "x":7.25, "y":4.25},
+ {"matrix": [6, 5], "x":8.25, "y":4.25},
+ {"matrix": [6, 6], "x":9.25, "y":4.25},
+ {"matrix": [5, 7], "x":10.25, "y":4.25},
+ {"matrix": [6, 7], "x":11.25, "y":4.25},
+ {"matrix": [7, 8], "x":12.25, "y":4.25, "w":1.75},
+ {"matrix": [6, 9], "x":14.25, "y":4.5},
+ {"matrix": [5, 9], "x":15.5, "y":4.25},
+ {"matrix": [5, 10], "x":16.5, "y":4.25},
+ {"matrix": [5, 11], "x":17.5, "y":4.25},
+ {"matrix": [5, 12], "x":18.5, "y":4.25, "h":2},
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.25},
+ {"matrix": [6, 0], "x":1.25, "y":5.25, "w":1.25},
+ {"matrix": [7, 0], "x":2.5, "y":5.25, "w":1.25},
+ {"matrix": [7, 4], "x":3.75, "y":5.25, "w":6.25},
+ {"matrix": [7, 6], "x":10, "y":5.25, "w":1.5},
+ {"matrix": [7, 7], "x":11.5, "y":5.25, "w":1.5},
+ {"matrix": [7, 9], "x":13.25, "y":5.5},
+ {"matrix": [7, 10], "x":14.25, "y":5.5},
+ {"matrix": [6, 10], "x":15.25, "y":5.5},
+ {"matrix": [6, 11], "x":16.5, "y":5.25},
+ {"matrix": [6, 12], "x":17.5, "y":5.25}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "driver": "IS31FL3733",
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "rainbow_moving_chevron": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "layout": [
+ { "flags": 4, "matrix": [0, 0], "x": 6, "y": 7 },
+ { "flags": 4, "matrix": [0, 1], "x": 20, "y": 7 },
+ { "flags": 4, "matrix": [0, 2], "x": 31, "y": 7 },
+ { "flags": 4, "matrix": [1, 2], "x": 43, "y": 7 },
+ { "flags": 4, "matrix": [0, 3], "x": 54, "y": 7 },
+ { "flags": 4, "matrix": [0, 4], "x": 69, "y": 7 },
+ { "flags": 4, "matrix": [0, 5], "x": 80, "y": 7 },
+ { "flags": 4, "matrix": [0, 6], "x": 91, "y": 7 },
+ { "flags": 4, "matrix": [1, 6], "x": 103, "y": 7 },
+ { "flags": 4, "matrix": [0, 7], "x": 117, "y": 7 },
+ { "flags": 4, "matrix": [1, 7], "x": 129, "y": 7 },
+ { "flags": 4, "matrix": [0, 8], "x": 140, "y": 7 },
+ { "flags": 4, "matrix": [1, 8], "x": 152, "y": 7 },
+ { "flags": 4, "matrix": [1, 9], "x": 166, "y": 7 },
+ { "flags": 4, "matrix": [0, 10], "x": 183, "y": 7 },
+ { "flags": 4, "matrix": [1, 10], "x": 194, "y": 7 },
+ { "flags": 4, "matrix": [0, 11], "x": 206, "y": 7 },
+ { "flags": 4, "matrix": [1, 11], "x": 217, "y": 7 },
+ { "flags": 4, "matrix": [1, 0], "x": 6, "y": 18 },
+ { "flags": 4, "matrix": [1, 1], "x": 17, "y": 18 },
+ { "flags": 4, "matrix": [2, 1], "x": 29, "y": 18 },
+ { "flags": 4, "matrix": [2, 2], "x": 40, "y": 18 },
+ { "flags": 4, "matrix": [3, 2], "x": 51, "y": 18 },
+ { "flags": 4, "matrix": [1, 3], "x": 63, "y": 18 },
+ { "flags": 4, "matrix": [2, 3], "x": 74, "y": 18 },
+ { "flags": 4, "matrix": [1, 4], "x": 86, "y": 18 },
+ { "flags": 4, "matrix": [1, 5], "x": 97, "y": 18 },
+ { "flags": 4, "matrix": [2, 5], "x": 109, "y": 18 },
+ { "flags": 4, "matrix": [2, 6], "x": 120, "y": 18 },
+ { "flags": 4, "matrix": [3, 6], "x": 132, "y": 18 },
+ { "flags": 4, "matrix": [2, 7], "x": 143, "y": 18 },
+ { "flags": 4, "matrix": [2, 8], "x": 160, "y": 18 },
+ { "flags": 4, "matrix": [2, 9], "x": 183, "y": 18 },
+ { "flags": 4, "matrix": [2, 10], "x": 194, "y": 18 },
+ { "flags": 4, "matrix": [2, 11], "x": 206, "y": 18 },
+ { "flags": 4, "matrix": [2, 12], "x": 217, "y": 18 },
+ { "flags": 4, "matrix": [2, 0], "x": 9, "y": 27 },
+ { "flags": 4, "matrix": [3, 1], "x": 23, "y": 27 },
+ { "flags": 4, "matrix": [4, 1], "x": 34, "y": 27 },
+ { "flags": 4, "matrix": [4, 2], "x": 46, "y": 27 },
+ { "flags": 4, "matrix": [3, 3], "x": 57, "y": 27 },
+ { "flags": 4, "matrix": [4, 3], "x": 69, "y": 27 },
+ { "flags": 4, "matrix": [2, 4], "x": 80, "y": 27 },
+ { "flags": 4, "matrix": [3, 4], "x": 91, "y": 27 },
+ { "flags": 4, "matrix": [3, 5], "x": 103, "y": 27 },
+ { "flags": 4, "matrix": [4, 5], "x": 114, "y": 27 },
+ { "flags": 4, "matrix": [4, 6], "x": 126, "y": 27 },
+ { "flags": 4, "matrix": [3, 7], "x": 137, "y": 27 },
+ { "flags": 4, "matrix": [3, 8], "x": 149, "y": 27 },
+ { "flags": 4, "matrix": [4, 8], "x": 163, "y": 27 },
+ { "flags": 4, "matrix": [3, 9], "x": 183, "y": 27 },
+ { "flags": 4, "matrix": [3, 10], "x": 194, "y": 27 },
+ { "flags": 4, "matrix": [3, 11], "x": 206, "y": 27 },
+ { "flags": 4, "matrix": [3, 12], "x": 217, "y": 27 },
+ { "flags": 4, "matrix": [3, 0], "x": 10, "y": 36 },
+ { "flags": 4, "matrix": [5, 1], "x": 26, "y": 36 },
+ { "flags": 4, "matrix": [6, 1], "x": 37, "y": 36 },
+ { "flags": 4, "matrix": [5, 2], "x": 49, "y": 36 },
+ { "flags": 4, "matrix": [5, 3], "x": 60, "y": 36 },
+ { "flags": 4, "matrix": [6, 3], "x": 71, "y": 36 },
+ { "flags": 4, "matrix": [4, 4], "x": 83, "y": 36 },
+ { "flags": 4, "matrix": [5, 4], "x": 94, "y": 36 },
+ { "flags": 4, "matrix": [5, 5], "x": 106, "y": 36 },
+ { "flags": 4, "matrix": [5, 6], "x": 117, "y": 36 },
+ { "flags": 4, "matrix": [4, 7], "x": 129, "y": 36 },
+ { "flags": 4, "matrix": [5, 8], "x": 140, "y": 36 },
+ { "flags": 4, "matrix": [6, 8], "x": 159, "y": 36 },
+ { "flags": 4, "matrix": [4, 9], "x": 183, "y": 36 },
+ { "flags": 4, "matrix": [4, 10], "x": 194, "y": 36 },
+ { "flags": 4, "matrix": [4, 11], "x": 206, "y": 36 },
+ { "flags": 4, "matrix": [4, 12], "x": 217, "y": 36 },
+ { "flags": 4, "matrix": [4, 0], "x": 13, "y": 46 },
+ { "flags": 4, "matrix": [7, 1], "x": 31, "y": 46 },
+ { "flags": 4, "matrix": [6, 2], "x": 43, "y": 46 },
+ { "flags": 4, "matrix": [7, 2], "x": 54, "y": 46 },
+ { "flags": 4, "matrix": [7, 3], "x": 66, "y": 46 },
+ { "flags": 4, "matrix": [6, 4], "x": 77, "y": 46 },
+ { "flags": 4, "matrix": [7, 5], "x": 89, "y": 46 },
+ { "flags": 4, "matrix": [6, 5], "x": 100, "y": 46 },
+ { "flags": 4, "matrix": [6, 6], "x": 112, "y": 46 },
+ { "flags": 4, "matrix": [5, 7], "x": 123, "y": 46 },
+ { "flags": 4, "matrix": [6, 7], "x": 134, "y": 46 },
+ { "flags": 4, "matrix": [7, 8], "x": 150, "y": 46 },
+ { "flags": 4, "matrix": [6, 9], "x": 169, "y": 48 },
+ { "flags": 4, "matrix": [5, 9], "x": 183, "y": 46 },
+ { "flags": 4, "matrix": [5, 10], "x": 194, "y": 46 },
+ { "flags": 4, "matrix": [5, 11], "x": 206, "y": 46 },
+ { "flags": 4, "matrix": [5, 12], "x": 214, "y": 50 },
+ { "flags": 4, "matrix": [5, 0], "x": 7, "y": 55 },
+ { "flags": 4, "matrix": [6, 0], "x": 21, "y": 55 },
+ { "flags": 4, "matrix": [7, 0], "x": 36, "y": 55 },
+ { "flags": 4, "matrix": [7, 4], "x": 79, "y": 55 },
+ { "flags": 4, "matrix": [7, 6], "x": 123, "y": 55 },
+ { "flags": 4, "matrix": [7, 7], "x": 140, "y": 55 },
+ { "flags": 4, "matrix": [7, 9], "x": 157, "y": 58 },
+ { "flags": 4, "matrix": [7, 10], "x": 169, "y": 58 },
+ { "flags": 4, "matrix": [6, 10], "x": 180, "y": 58 },
+ { "flags": 4, "matrix": [6, 11], "x": 194, "y": 55 },
+ { "flags": 4, "matrix": [6, 12], "x": 206, "y": 55 },
+ { "flags": 2, "x": 1, "y": 1 },
+ { "flags": 2, "x": 6, "y": 0 },
+ { "flags": 2, "x": 26, "y": 0 },
+ { "flags": 2, "x": 35, "y": 0 },
+ { "flags": 2, "x": 45, "y": 0 },
+ { "flags": 2, "x": 54, "y": 0 },
+ { "flags": 2, "x": 64, "y": 0 },
+ { "flags": 2, "x": 74, "y": 0 },
+ { "flags": 2, "x": 83, "y": 0 },
+ { "flags": 2, "x": 93, "y": 0 },
+ { "flags": 2, "x": 102, "y": 0 },
+ { "flags": 2, "x": 112, "y": 0 },
+ { "flags": 2, "x": 122, "y": 0 },
+ { "flags": 2, "x": 131, "y": 0 },
+ { "flags": 2, "x": 141, "y": 0 },
+ { "flags": 2, "x": 150, "y": 0 },
+ { "flags": 2, "x": 160, "y": 0 },
+ { "flags": 2, "x": 170, "y": 0 },
+ { "flags": 2, "x": 179, "y": 0 },
+ { "flags": 2, "x": 189, "y": 0 },
+ { "flags": 2, "x": 198, "y": 0 },
+ { "flags": 2, "x": 218, "y": 0 },
+ { "flags": 2, "x": 222, "y": 1 },
+ { "flags": 2, "x": 224, "y": 5 },
+ { "flags": 2, "x": 224, "y": 12 },
+ { "flags": 2, "x": 224, "y": 20 },
+ { "flags": 2, "x": 224, "y": 28 },
+ { "flags": 2, "x": 224, "y": 35 },
+ { "flags": 2, "x": 224, "y": 43 },
+ { "flags": 2, "x": 224, "y": 51 },
+ { "flags": 2, "x": 224, "y": 58 },
+ { "flags": 2, "x": 222, "y": 64 },
+ { "flags": 2, "x": 218, "y": 64 },
+ { "flags": 2, "x": 208, "y": 64 },
+ { "flags": 2, "x": 198, "y": 64 },
+ { "flags": 2, "x": 189, "y": 64 },
+ { "flags": 2, "x": 179, "y": 64 },
+ { "flags": 2, "x": 170, "y": 64 },
+ { "flags": 2, "x": 160, "y": 64 },
+ { "flags": 2, "x": 150, "y": 64 },
+ { "flags": 2, "x": 141, "y": 64 },
+ { "flags": 2, "x": 131, "y": 64 },
+ { "flags": 2, "x": 122, "y": 64 },
+ { "flags": 2, "x": 112, "y": 64 },
+ { "flags": 2, "x": 102, "y": 64 },
+ { "flags": 2, "x": 93, "y": 64 },
+ { "flags": 2, "x": 83, "y": 64 },
+ { "flags": 2, "x": 74, "y": 64 },
+ { "flags": 2, "x": 64, "y": 64 },
+ { "flags": 2, "x": 54, "y": 64 },
+ { "flags": 2, "x": 45, "y": 64 },
+ { "flags": 2, "x": 35, "y": 64 },
+ { "flags": 2, "x": 26, "y": 64 },
+ { "flags": 2, "x": 16, "y": 64 },
+ { "flags": 2, "x": 6, "y": 64 },
+ { "flags": 2, "x": 1, "y": 64 },
+ { "flags": 2, "x": 0, "y": 58 },
+ { "flags": 2, "x": 0, "y": 51 },
+ { "flags": 2, "x": 0, "y": 43 },
+ { "flags": 2, "x": 0, "y": 35 },
+ { "flags": 2, "x": 0, "y": 28 },
+ { "flags": 2, "x": 0, "y": 20 },
+ { "flags": 2, "x": 0, "y": 12 },
+ { "flags": 2, "x": 0, "y": 5 },
+ { "flags": 8, "x": 174, "y": 5 },
+ { "flags": 8, "x": 174, "y": 10 },
+ { "flags": 8, "x": 174, "y": 15 }
+ ]
+ }
+}
diff --git a/keyboards/drop/shift/v2/mcuconf.h b/keyboards/drop/shift/v2/mcuconf.h
new file mode 100644
index 000000000000..dc3e45dac054
--- /dev/null
+++ b/keyboards/drop/shift/v2/mcuconf.h
@@ -0,0 +1,20 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 16
+
+#undef STM32_PREDIV_VALUE
+#define STM32_PREDIV_VALUE 2
+
+#undef STM32_ADC_USE_ADC2
+#define STM32_ADC_USE_ADC2 TRUE
+
+#undef STM32_ADC_USE_ADC3
+#define STM32_ADC_USE_ADC3 TRUE
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/drop/shift/v2/readme.md b/keyboards/drop/shift/v2/readme.md
new file mode 100644
index 000000000000..c9ebc63468f6
--- /dev/null
+++ b/keyboards/drop/shift/v2/readme.md
@@ -0,0 +1,24 @@
+# SHIFT v2
+
+The Drop SHIFT v2 is a compact 1800 layout mechanical keyboard featuring dual USB-C connectors, an integrated Hi-Speed USB 2.0 hub, and fully customizable RGB backlighting and underlighting.
+
+* Keyboard Maintainer: [zvecr](https://github.com/zvecr)
+* Hardware Availability: [Drop SHIFT Mechanical Keyboard](https://drop.com/buy/drop-shift-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make drop/shift/v2:default
+
+Flashing example for this keyboard:
+
+ make drop/shift/v2: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Quickly double tap the button located under the spacebar
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/drop/shift/v2/rules.mk b/keyboards/drop/shift/v2/rules.mk
new file mode 100644
index 000000000000..aec83326d075
--- /dev/null
+++ b/keyboards/drop/shift/v2/rules.mk
@@ -0,0 +1,4 @@
+UF2_DEVICE_TYPE_ID = 0x9bc1e968
+UF2CONV_ARGS = --device-type $(UF2_DEVICE_TYPE_ID)
+
+SRC += analog.c lib/common.c lib/mux.c
diff --git a/keyboards/drop/shift/v2/v2.c b/keyboards/drop/shift/v2/v2.c
new file mode 100644
index 000000000000..3d96cdf7cba6
--- /dev/null
+++ b/keyboards/drop/shift/v2/v2.c
@@ -0,0 +1,189 @@
+// Copyright 2023 Massdrop, Inc.
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifdef RGB_MATRIX_ENABLE
+# include "rgb_matrix.h"
+
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+ { 0, K_1, J_1, L_1 },// LED1
+ { 0, K_2, J_2, L_2 },
+ { 0, K_3, J_3, L_3 },
+ { 0, K_4, J_4, L_4 },
+ { 0, K_5, J_5, L_5 },
+ { 0, K_7, J_7, L_7 },
+ { 0, K_8, J_8, L_8 },
+ { 0, K_9, J_9, L_9 },
+ { 0, K_10, J_10, L_10 },// LED9
+ { 1, K_1, J_1, L_1 },// LED10
+ { 1, K_2, J_2, L_2 },// LED11
+ { 1, K_3, J_3, L_3 },// LED12
+ { 1, K_4, J_4, L_4 },// LED13
+ { 1, K_9, J_9, L_9 },// LED18
+ { 1, K_5, J_5, L_5 },// LED15
+ { 1, K_6, J_6, L_6 },// LED19
+ { 1, K_7, J_7, L_7 },// LED16
+ { 1, K_8, J_8, L_8 },// LED20
+ { 0, H_1, G_1, I_1 },//start2
+ { 0, H_11, G_11, I_11 },
+ { 0, H_2, G_2, I_2 },
+ { 0, H_3, G_3, I_3 },
+ { 0, H_4, G_4, I_4 },
+ { 0, H_5, G_5, I_5 },
+ { 0, H_6, G_6, I_6 },
+ { 0, H_7, G_7, I_7 },
+ { 0, H_8, G_8, I_8 },
+ { 0, H_9, G_9, I_9 },
+ { 0, H_10, G_10, I_10 },
+ { 1, E_1, D_1, F_1 },
+ { 1, E_2, D_2, F_2 },
+ { 1, E_4, D_4, F_4 },
+ { 1, E_5, D_5, F_5 },
+ { 1, E_6, D_6, F_6 },
+ { 1, E_7, D_7, F_7 },
+ { 1, E_8, D_8, F_8 },
+ { 0, E_1, D_1, F_1 },
+ { 0, E_2, D_2, F_2 },
+ { 0, E_3, D_3, F_3 },
+ { 0, E_4, D_4, F_4 },
+ { 0, E_5, D_5, F_5 },
+ { 0, E_6, D_6, F_6 },
+ { 0, E_7, D_7, F_7 },
+ { 0, E_8, D_8, F_8 },
+ { 0, E_9, D_9, F_9 },
+ { 0, E_10, D_10, F_10 },
+ { 1, B_1, A_1, C_1 },
+ { 1, B_2, A_2, C_2 },
+ { 1, B_3, A_3, C_3 },
+ { 1, B_4, A_4, C_4 },
+ { 1, B_5, A_5, C_5 },
+ { 1, B_6, A_6, C_6 },
+ { 1, B_7, A_7, C_7 },
+ { 1, B_8, A_8, C_8 },
+ { 0, B_1, A_1, C_1 },
+ { 0, B_2, A_2, C_2 },
+ { 0, B_3, A_3, C_3 },
+ { 0, B_4, A_4, C_4 },
+ { 0, B_5, A_5, C_5 },
+ { 0, B_6, A_6, C_6 },
+ { 0, B_7, A_7, C_7 },
+ { 0, B_8, A_8, C_8 },
+ { 0, B_9, A_9, C_9 },
+ { 0, B_10, A_10, C_10 },
+ { 1, B_9, A_9, C_9 },
+ { 1, B_10, A_10, C_10 },
+ { 1, B_11, A_11, C_11 },
+ { 1, B_13, A_13, C_13 },
+ { 1, B_14, A_14, C_14 },
+ { 1, B_15, A_15, C_15 },
+ { 1, B_16, A_16, C_16 },
+ { 0, B_11, A_11, C_11 },
+ { 0, B_12, A_12, C_12 },
+ { 0, B_13, A_13, C_13 },
+ { 0, H_13, G_13, I_13 },
+ { 0, H_14, G_14, I_14 },
+ { 0, B_14, A_14, C_14 },
+ { 0, E_15, D_15, F_15 },
+ { 0, B_15, A_15, C_15 },
+ { 0, B_16, A_16, C_16 },
+ { 1, E_9, D_9, F_9 },
+ { 1, E_10, D_10, F_10 },
+ { 1, E_11, D_11, F_11 },
+ { 1, E_12, D_12, F_12 },
+ { 1, E_13, D_13, F_13 },
+ { 1, E_14, D_14, F_14 },
+ { 1, E_15, D_15, F_15 },
+ { 1, H_16, G_16, I_16 },
+ { 0, E_11, D_11, F_11 },//start6
+ { 0, E_12, D_12, F_12 },
+ { 0, E_13, D_13, F_13 },
+ { 0, E_14, D_14, F_14 },
+ { 1, H_9, G_9, I_9 },
+ { 1, H_10, G_10, I_10 },
+ { 1, H_11, G_11, I_11 },
+ { 1, H_12, G_12, I_12 },
+ { 1, H_13, G_13, I_13 },
+ { 1, H_14, G_14, I_14 },
+ { 1, H_15, G_15, I_15 },
+ { 2, H_1, G_1, I_1 },//start underglow
+ { 2, K_1, J_1, L_1 },
+ { 2, B_1, A_1, C_1 },
+ { 2, E_1, D_1, F_1 },
+ { 2, E_2, D_2, F_2 },
+ { 2, B_2, A_2, C_2 },
+ { 2, B_3, A_3, C_3 },
+ { 2, E_3, D_3, F_3 },
+ { 2, E_4, D_4, F_4 },
+ { 2, B_4, A_4, C_4 },
+ { 2, B_5, A_5, C_5 },
+ { 2, E_5, D_5, F_5 },
+ { 2, E_6, D_6, F_6 },
+ { 2, B_6, A_6, C_6 },
+ { 2, B_7, A_7, C_7 },
+ { 2, E_7, D_7, F_7 },
+ { 2, E_8, D_8, F_8 },
+ { 2, B_8, A_8, C_8 },
+ { 2, B_9, A_9, C_9 },
+ { 2, E_9, D_9, F_9 },
+ { 2, E_10, D_10, F_10 },
+ { 2, B_10, A_10, C_10 },
+ { 2, B_11, A_11, C_11 },//125
+ { 2, E_11, D_11, F_11 },
+ { 2, E_12, D_12, F_12 },
+ { 2, B_12, A_12, C_12 },
+ { 2, B_13, A_13, C_13 },
+ { 2, E_13, D_13, F_13 },
+ { 2, E_14, D_14, F_14 },
+ { 2, B_14, A_14, C_14 },
+ { 2, B_15, A_15, C_15 },
+ { 2, E_15, D_15, F_15 },
+ { 2, E_16, D_16, F_16 },
+ { 2, B_16, A_16, C_16 },
+ { 2, H_16, G_16, I_16 },
+ { 2, K_16, J_16, L_16 },
+ { 2, K_15, J_15, L_15 },
+ { 2, H_15, G_15, I_15 },
+ { 2, H_14, G_14, I_14 },
+ { 2, K_14, J_14, L_14 },
+ { 2, K_13, J_13, L_13 },
+ { 2, H_13, G_13, I_13 },
+ { 2, H_12, G_12, I_12 },
+ { 2, K_12, J_12, L_12 },
+ { 2, K_11, J_11, L_11 },
+ { 2, H_11, G_11, I_11 },
+ { 2, H_10, G_10, I_10 },
+ { 2, K_10, J_10, L_10 },
+ { 2, K_9, J_9, L_9 },
+ { 2, H_9, G_9, I_9 },
+ { 2, H_8, G_8, I_8 },
+ { 2, K_8, J_8, L_8 },
+ { 2, K_7, J_7, L_7 },
+ { 2, H_7, G_7, I_7 },
+ { 2, H_6, G_6, I_6 },
+ { 2, K_6, J_6, L_6 },
+ { 2, K_5, J_5, L_5 },
+ { 2, H_5, G_5, I_5 },
+ { 2, H_4, G_4, I_4 },
+ { 2, K_4, J_4, L_4 },
+ { 2, K_3, J_3, L_3 },
+ { 2, H_3, G_3, I_3 },
+ { 2, H_2, G_2, I_2 },
+ { 2, K_2, J_2, L_2 },
+ { 1, K_10, J_10, L_10 },
+ { 1, K_11, J_11, L_11 },
+ { 1, E_3, D_3, F_3 },
+};
+
+bool rgb_matrix_indicators_kb(void) {
+ if (!rgb_matrix_indicators_user()) {
+ return false;
+ }
+ uint8_t num_state = host_keyboard_led_state().num_lock ? 0xFF : 0;
+ uint8_t caps_state = host_keyboard_led_state().caps_lock ? 0xFF : 0;
+ uint8_t scroll_state = host_keyboard_led_state().scroll_lock ? 0xFF : 0;
+
+ rgb_matrix_set_color(163, num_state, num_state, num_state);
+ rgb_matrix_set_color(164, caps_state, caps_state, caps_state);
+ rgb_matrix_set_color(165, scroll_state, scroll_state, scroll_state);
+ return true;
+}
+
+#endif
diff --git a/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json
index 6be76652800a..e3b969149ac9 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json
+++ b/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "durgod/dgk6x/hades",
+ "keyboard": "durgod/dgk6x/hades_ansi",
"keymap": "default",
"layout": "LAYOUT_65_ansi",
"layers": [
diff --git a/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json
index 0cef377c841a..7c25f6efb07b 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json
+++ b/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "durgod/dgk6x/hades",
+ "keyboard": "durgod/dgk6x/hades_ansi",
"keymap": "via",
"layout": "LAYOUT_65_ansi",
"layers": [
diff --git a/keyboards/durgod/k320/keymaps/default_mac/keymap.json b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
index a0e83def3694..97fc214c7b73 100644
--- a/keyboards/durgod/k320/keymaps/default_mac/keymap.json
+++ b/keyboards/durgod/k320/keymaps/default_mac/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "durgod/k310/base",
+ "keyboard": "durgod/k320/base",
"keymap": "default_mac",
"layout": "LAYOUT_all",
"layers": [
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
index 08eade43c877..18271fb4d25d 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
@@ -17,13 +17,14 @@
#pragma once
#ifdef RGB_MATRIX_ENABLE
- #define RGB_MATRIX_TIMEOUT 1200000 // 20 minutes (20 * 60 * 1000ms)
- #define RGB_DISABLE_WHEN_USB_SUSPENDED
+# define RGB_MATRIX_TIMEOUT 1200000 // 20 minutes (20 * 60 * 1000ms)
+# define RGB_DISABLE_WHEN_USB_SUSPENDED
#endif
-// Setting DEBOUNCE to 8 to be a little conservative due to issues with Glorious' proprietary hot-swap sockets
+// A debounce of 8 represents a minimum key press time of just under 1 refresh at 120Hz
+// Slightly higher than the default because we are using sym_eager_pk
#ifdef DEBOUNCE
- #undef DEBOUNCE
+# undef DEBOUNCE
#endif
#define DEBOUNCE 8
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
index 6c467ff63653..3d2792b4a64c 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
@@ -17,26 +17,21 @@ along with this program. If not, see .
#include QMK_KEYBOARD_H
-enum layers {
- WIN_BASE = 0,
- WIN_FN,
- MAC_BASE,
- MAC_FN
-};
+enum layers { WIN_BASE = 0, WIN_FN, MAC_BASE, MAC_FN };
enum custom_keycodes {
- CMDQ_TOG = QK_KB_2 // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
+ CMDQ_TOG = QK_KB_2 // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
};
-#define KC_TASK LWIN(KC_TAB) // Open Task Manager
-#define KC_FLXP LWIN(KC_E) // Open File Explorer
-#define DF_WINB DF(WIN_BASE) // Switch to WIN_BASE layer
-#define MO_WINF MO(WIN_FN) // Toggle to WIN_FN layer
-#define DF_MACB DF(MAC_BASE) // Switch to MAX_BASE layer
-#define MO_MACF MO(MAC_FN) // Toggle to MAC_FN layer
+#define KC_TASK LWIN(KC_TAB) // Open Task Manager
+#define KC_FLXP LWIN(KC_E) // Open File Explorer
+#define DF_WINB DF(WIN_BASE) // Switch to WIN_BASE layer
+#define MO_WINF MO(WIN_FN) // Toggle to WIN_FN layer
+#define DF_MACB DF(MAC_BASE) // Switch to MAX_BASE layer
+#define MO_MACF MO(MAC_FN) // Toggle to MAC_FN layer
// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// The GMMK Pro default layout is:
//
@@ -103,111 +98,99 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
- [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [WIN_FN] = { ENCODER_CCW_CW(XXXXXXX, XXXXXXX) },
- [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [MAC_FN] = { ENCODER_CCW_CW(XXXXXXX, XXXXXXX) },
+ [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [WIN_FN] = {ENCODER_CCW_CW(XXXXXXX, XXXXXXX)},
+ [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [MAC_FN] = {ENCODER_CCW_CW(XXXXXXX, XXXXXXX)},
};
#endif
/* To record user preferences */
typedef union {
- uint32_t raw; // set to 32-bit of size
+ uint32_t raw; // set to 32-bit of size
struct {
- bool rgb_enabled :1; // Artificial RGB ON/OFF flag (1 bit)
- bool cmd_q_delay_enabled :1; // Toggle CMD+Q delay (1 bit)
+ bool rgb_enabled : 1; // Artificial RGB ON/OFF flag (1 bit)
+ bool cmd_q_delay_enabled : 1; // Toggle CMD+Q delay (1 bit)
};
} user_config_t;
user_config_t user_config;
/* Delayed keypresses variables and functions */
-static uint16_t delayed_press_delay = 0;
-static uint16_t delayed_press_keycode = KC_NO;
-static uint16_t delayed_press_start_time = 0;
-static uint16_t delayed_press_sent_keycode = KC_NO;
-static void start_delayed_press(const uint16_t delay, const uint16_t keycode);
-static bool is_any_delayed_press_pending(void);
-static bool is_delayed_press_pending(const uint16_t keycode);
-static bool is_delayed_press_sent(const uint16_t keycode);
-static void mark_delayed_press_sent(void);
-static void mark_delayed_release_sent(void);
-static void cancel_delayed_press(void);
+static fast_timer_t delayed_press_delay = 0;
+static uint16_t delayed_press_keycode = KC_NO;
+static fast_timer_t delayed_press_start_time = 0;
+static uint16_t delayed_press_sent_keycode = KC_NO;
+static void start_delayed_press(fast_timer_t delay, uint16_t keycode);
+static void mark_delayed_press_sent(void);
+static void mark_delayed_release_sent(void);
+static void cancel_delayed_press(void);
+
+#define IS_ANY_DELAYED_PRESS_PENDING() (delayed_press_start_time > 0 && delayed_press_keycode != KC_NO)
+#define IS_DELAYED_PRESS_PENDING(keycode) (delayed_press_start_time > 0 && delayed_press_keycode == (keycode))
+#define IS_DELAYED_PRESS_SENT(keycode) (delayed_press_sent_keycode != KC_NO && delayed_press_sent_keycode == (keycode))
/* CMD+Q delay */
#ifndef CMD_Q_DELAY
- #define CMD_Q_DELAY 1000
+# define CMD_Q_DELAY 1000
#endif
#if CMD_Q_DELAY <= 0 || CMD_Q_DELAY >= UINT16_MAX / 2
- #error "CMD_Q_DELAY must be a positive integer smaller than UINT16_MAX / 2"
+# error "CMD_Q_DELAY must be a positive integer smaller than UINT16_MAX / 2"
#endif
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-#define MAX(x, y) (((x) > (y)) ? (x) : (y))
-
#ifdef RGB_MATRIX_ENABLE
-#define CAPS_LOCK_COLOR RGB_RED
-#define WIN_BASE_COLOR RGB_BLUE
-#define WIN_FN_COLOR RGB_BLUE
-#define MAC_BASE_COLOR RGB_WHITE
-#define MAC_FN_COLOR RGB_WHITE
-#define UNKNOWN_LAYER_COLOR RGB_PINK
+# define CAPS_LOCK_COLOR RGB_RED
+# define WIN_BASE_COLOR RGB_BLUE
+# define WIN_FN_COLOR RGB_BLUE
+# define MAC_BASE_COLOR RGB_WHITE
+# define MAC_FN_COLOR RGB_WHITE
+# define UNKNOWN_LAYER_COLOR RGB_PINK
/* The maximum effects duration */
-#ifndef EFFECTS_DURATION
- #define EFFECTS_DURATION 2000
-#endif
-#if EFFECTS_DURATION <= 0 || EFFECTS_DURATION >= UINT16_MAX / 2
- #error "EFFECTS_DURATION must be a positive integer smaller than UINT16_MAX / 2"
-#endif
+# ifndef EFFECTS_DURATION
+# define EFFECTS_DURATION 2000
+# endif
+# if EFFECTS_DURATION <= 0 || EFFECTS_DURATION >= UINT16_MAX / 2
+# error "EFFECTS_DURATION must be a positive integer smaller than UINT16_MAX / 2"
+# endif
/* The interval for the flashing effect */
-#ifndef FLASHING_EFFECT_INTERVAL
- #define FLASHING_EFFECT_INTERVAL 250
-#endif
-#if FLASHING_EFFECT_INTERVAL <= 0 || FLASHING_EFFECT_INTERVAL >= UINT16_MAX / 2
- #error "FLASHING_EFFECT_INTERVAL must be a positive integer smaller than UINT16_MAX / 2"
-#endif
+# ifndef FLASHING_EFFECT_INTERVAL
+# define FLASHING_EFFECT_INTERVAL 250
+# endif
+# if FLASHING_EFFECT_INTERVAL <= 0 || FLASHING_EFFECT_INTERVAL >= UINT16_MAX / 2
+# error "FLASHING_EFFECT_INTERVAL must be a positive integer smaller than UINT16_MAX / 2"
+# endif
static void set_rgb_layer_winfn(void);
static void set_rgb_layer_macfn(void);
/* Effects functions */
-static float flashing_effect(const uint16_t delta_time);
-static float static_effect(const uint16_t delta_time);
-static float increasing_effect(const uint16_t delta_time);
+static float flashing_effect(fast_timer_t delta_time);
+static float static_effect(fast_timer_t delta_time);
+static float increasing_effect(fast_timer_t delta_time);
/* Effect variables and functions */
-static uint16_t effect_started_time = 0;
-static uint16_t effect_max_duration = EFFECTS_DURATION;
-static uint8_t effect_r = 0x0, effect_g = 0x0, effect_b = 0x0;
-static float (*effect_multiplier)(const uint16_t) = static_effect;
-static void start_effects(
- const uint16_t max_duration,
- const uint8_t r_color,
- const uint8_t g_color,
- const uint8_t b_color,
- const float (*multiplier)(const uint16_t));
+static fast_timer_t effect_started_time = 0;
+static fast_timer_t effect_max_duration = EFFECTS_DURATION;
+static uint8_t effect_r = 0x0, effect_g = 0x0, effect_b = 0x0;
+static float (*effect_multiplier)(fast_timer_t) = static_effect;
+static void start_effects(fast_timer_t max_duration, uint8_t r_color, uint8_t g_color, uint8_t b_color, float (*multiplier)(fast_timer_t));
static void stop_effects(void);
/* Delayed keypresses variables with RGB variant */
-static void start_delayed_press_with_effects(
- const uint16_t delay,
- const uint16_t keycode,
- const uint8_t r_color,
- const uint8_t g_color,
- const uint8_t b_color);
+static void start_delayed_press_with_effects(fast_timer_t delay, uint16_t keycode, uint8_t r_color, uint8_t g_color, uint8_t b_color);
#endif // RGB_MATRIX_ENABLE
-void eeconfig_init_user(void) { // EEPROM is getting reset!
- user_config.raw = 0;
- user_config.rgb_enabled = true; // We want this enabled by default
- user_config.cmd_q_delay_enabled = true; // We want this enabled by default
- eeconfig_update_user(user_config.raw); // Write default value to EEPROM now
+void eeconfig_init_user(void) { // EEPROM is getting reset!
+ user_config.raw = 0;
+ user_config.rgb_enabled = true; // We want this enabled by default
+ user_config.cmd_q_delay_enabled = true; // We want this enabled by default
+ eeconfig_update_user(user_config.raw); // Write default value to EEPROM now
}
void keyboard_post_init_user(void) {
- #ifdef RGB_MATRIX_ENABLE
+#ifdef RGB_MATRIX_ENABLE
// Enable the RGB matrix, if not enabled
if (!rgb_matrix_is_enabled()) {
rgb_matrix_enable();
@@ -216,15 +199,15 @@ void keyboard_post_init_user(void) {
if (rgb_matrix_get_flags() != LED_FLAG_ALL) {
rgb_matrix_set_flags(LED_FLAG_ALL);
}
- #endif
+#endif
// Read the user config from EEPROM
user_config.raw = eeconfig_read_user();
}
void matrix_scan_user(void) {
- if (is_any_delayed_press_pending()) {
- if (sync_timer_elapsed(delayed_press_start_time) > delayed_press_delay) {
+ if (IS_ANY_DELAYED_PRESS_PENDING()) {
+ if (timer_elapsed_fast(delayed_press_start_time) > delayed_press_delay) {
register_code(delayed_press_keycode);
mark_delayed_press_sent();
}
@@ -232,20 +215,20 @@ void matrix_scan_user(void) {
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if (is_delayed_press_sent(keycode)) {
+ if (IS_DELAYED_PRESS_SENT(keycode)) {
if (!record->event.pressed) {
/* Send key-up event and clear the keycode and stop processing */
unregister_code(keycode);
mark_delayed_release_sent();
return false;
}
- } else if (is_delayed_press_pending(keycode)) {
+ } else if (IS_DELAYED_PRESS_PENDING(keycode)) {
if (!record->event.pressed) {
/* Cancel the pending press and stop processing */
cancel_delayed_press();
return false;
}
- } else if (is_any_delayed_press_pending()) {
+ } else if (IS_ANY_DELAYED_PRESS_PENDING()) {
/* Cancel the pending press and resume processing */
cancel_delayed_press();
}
@@ -258,17 +241,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
case CMDQ_TOG:
if (record->event.pressed) {
+#ifdef RGB_MATRIX_ENABLE
if (user_config.cmd_q_delay_enabled) {
/* Turning delay OFF */
- #ifdef RGB_MATRIX_ENABLE
start_effects(EFFECTS_DURATION, RGB_RED, flashing_effect);
- #endif
} else {
/* Turning delay ON */
- #ifdef RGB_MATRIX_ENABLE
start_effects(EFFECTS_DURATION, RGB_GREEN, flashing_effect);
- #endif
}
+#endif
user_config.cmd_q_delay_enabled = !user_config.cmd_q_delay_enabled;
eeconfig_update_user(user_config.raw);
}
@@ -276,22 +257,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case KC_Q:
if (user_config.cmd_q_delay_enabled) {
if (layer_state_is(MAC_BASE)) {
- const uint8_t mods = get_mods();
+ uint8_t mods = get_mods();
if (mods == MOD_BIT(KC_LCMD) || mods == MOD_BIT(KC_RCMD)) {
if (record->event.pressed) {
- #ifdef RGB_MATRIX_ENABLE
+#ifdef RGB_MATRIX_ENABLE
start_delayed_press_with_effects(CMD_Q_DELAY, KC_Q, RGB_ORANGE);
- #else
+#else
start_delayed_press(CMD_Q_DELAY, KC_Q);
- #endif
+#endif
}
return false;
}
}
}
break;
- #ifdef RGB_MATRIX_ENABLE
- #ifdef NKRO_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+# ifdef NKRO_ENABLE
case NK_TOGG:
if (record->event.pressed) {
if (keymap_config.nkro) {
@@ -303,52 +284,31 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
}
break;
- #endif // NKRO_ENABLE
- case RGB_MOD:
- case RGB_RMOD:
- case RGB_HUI:
- case RGB_HUD:
- case RGB_SAI:
- case RGB_SAD:
- case RGB_VAI:
- case RGB_VAD:
- case RGB_SPI:
- case RGB_SPD:
- if (!user_config.rgb_enabled) {
- /* Ignore changes to RGB settings while only it's supposed to be OFF */
- return false; // Skip all further processing of this key
- }
- break;
+# endif // NKRO_ENABLE
case RGB_TOG:
if (record->event.pressed) {
user_config.rgb_enabled = !user_config.rgb_enabled;
eeconfig_update_user(user_config.raw);
}
return false;
- #endif // RGB_MATRIX_ENABLE
+ case RGB_MODE_FORWARD ... RGB_MODE_TWINKLE:
+ if (!user_config.rgb_enabled) {
+ /* Ignore changes to RGB settings while only it's supposed to be OFF */
+ return false; // Skip all further processing of this key
+ }
+ break;
+#endif // RGB_MATRIX_ENABLE
}
return true;
}
-static void start_delayed_press(const uint16_t delay, const uint16_t keycode) {
- delayed_press_delay = delay;
- delayed_press_keycode = keycode;
- delayed_press_start_time = sync_timer_read();
+static void start_delayed_press(fast_timer_t delay, uint16_t keycode) {
+ delayed_press_delay = delay;
+ delayed_press_keycode = keycode;
+ delayed_press_start_time = timer_read_fast();
delayed_press_sent_keycode = KC_NO;
}
-static bool is_any_delayed_press_pending(void) {
- return delayed_press_start_time > 0 && delayed_press_keycode != KC_NO;
-}
-
-static bool is_delayed_press_pending(const uint16_t keycode) {
- return delayed_press_start_time > 0 && delayed_press_keycode == keycode;
-}
-
-static bool is_delayed_press_sent(const uint16_t keycode) {
- return delayed_press_sent_keycode != KC_NO && delayed_press_sent_keycode == keycode;
-}
-
static void mark_delayed_press_sent(void) {
delayed_press_sent_keycode = delayed_press_keycode;
cancel_delayed_press();
@@ -359,22 +319,17 @@ static void mark_delayed_release_sent(void) {
}
static void cancel_delayed_press(void) {
- delayed_press_delay = 0;
- delayed_press_keycode = KC_NO;
+ delayed_press_delay = 0;
+ delayed_press_keycode = KC_NO;
delayed_press_start_time = 0;
- #ifdef RGB_MATRIX_ENABLE
+#ifdef RGB_MATRIX_ENABLE
stop_effects();
- #endif
+#endif
}
#ifdef RGB_MATRIX_ENABLE
-static void start_delayed_press_with_effects(
- const uint16_t delay,
- const uint16_t keycode,
- const uint8_t r_color,
- const uint8_t g_color,
- const uint8_t b_color) {
+static void start_delayed_press_with_effects(fast_timer_t delay, uint16_t keycode, uint8_t r_color, uint8_t g_color, uint8_t b_color) {
start_delayed_press(delay, keycode);
start_effects(delay, r_color, g_color, b_color, increasing_effect);
}
@@ -386,7 +341,7 @@ Effects when switching layers
static uint8_t previous_layer = UINT8_MAX;
layer_state_t default_layer_state_set_user(layer_state_t state) {
- const uint8_t current_layer = get_highest_layer(state);
+ uint8_t current_layer = get_highest_layer(state);
if (previous_layer != current_layer) {
// For some reason, setting the default layer alone doesn't change it fully
layer_move(current_layer);
@@ -407,50 +362,45 @@ layer_state_t default_layer_state_set_user(layer_state_t state) {
return state;
}
-static void start_effects(
- const uint16_t max_duration,
- const uint8_t r_color,
- const uint8_t g_color,
- const uint8_t b_color,
- const float (*multiplier)(const uint16_t)) {
- effect_r = r_color;
- effect_g = g_color;
- effect_b = b_color;
- effect_multiplier = multiplier;
+static void start_effects(fast_timer_t max_duration, uint8_t r_color, uint8_t g_color, uint8_t b_color, float (*multiplier)(fast_timer_t)) {
+ effect_r = r_color;
+ effect_g = g_color;
+ effect_b = b_color;
+ effect_multiplier = multiplier;
effect_max_duration = max_duration;
- effect_started_time = sync_timer_read();
+ effect_started_time = timer_read_fast();
}
static void stop_effects(void) {
- effect_r = 0x0;
- effect_g = 0x0;
- effect_b = 0x0;
- effect_multiplier = static_effect;
+ effect_r = 0x0;
+ effect_g = 0x0;
+ effect_b = 0x0;
+ effect_multiplier = static_effect;
effect_max_duration = EFFECTS_DURATION;
effect_started_time = 0;
}
-static float flashing_effect(const uint16_t delta_time) {
+static float flashing_effect(fast_timer_t delta_time) {
return ((delta_time / FLASHING_EFFECT_INTERVAL) + 1) & 0x01;
}
-static float static_effect(const uint16_t delta_time) {
+static float static_effect(fast_timer_t delta_time) {
return 1.0;
}
-static float increasing_effect(const uint16_t delta_time) {
- return MAX(0.0, MIN(1.0, ((float) delta_time) / effect_max_duration));
+static float increasing_effect(fast_timer_t delta_time) {
+ return ((float)delta_time) / effect_max_duration;
}
bool rgb_matrix_indicators_user(void) {
if (effect_started_time > 0) {
- const uint16_t delta_time = sync_timer_elapsed(effect_started_time);
+ fast_timer_t delta_time = timer_elapsed_fast(effect_started_time);
if (delta_time <= effect_max_duration) {
/* Render effect */
- const float multiplier = effect_multiplier(delta_time);
- const uint8_t val_r = multiplier * effect_r;
- const uint8_t val_g = multiplier * effect_g;
- const uint8_t val_b = multiplier * effect_b;
+ float multiplier = effect_multiplier(delta_time);
+ uint8_t val_r = multiplier * effect_r;
+ uint8_t val_g = multiplier * effect_g;
+ uint8_t val_b = multiplier * effect_b;
rgb_matrix_set_color_all(val_r, val_g, val_b);
return false;
} else {
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
index d095a6015482..14e410632183 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
@@ -3,9 +3,20 @@
# Disabling MouseKey because it breaks my KVM switch
MOUSEKEY_ENABLE = no
-# Ensure sym_defer_g is used.
-# It seems sym_defer_pk results in significant chattering, even with an 8ms debounce time.
-DEBOUNCE_TYPE = sym_defer_g
+# Use sym_eager_pk for better latency when gaming.
+#
+# Previous issues with sym_defer_pk (and sym_eager_pk and debounce times
+# shorter than 8ms) were due to Glorious' horrible hot-swap sockets.
+# These issues were 100% resolved after I replaced them with Gateron hot-swap sockets.
+#
+# The old sockets apparently didn't hold onto the legs of the switches at all.
+#
+# Using eager might not be a good idea with other switch types, but I only use
+# linears now, so this should be ok.
+#
+# asym_eager_defer_pk also works well and it is more resistant to chatter at
+# the cost of delay when releasing a key being slightly higher.
+DEBOUNCE_TYPE = sym_eager_pk
# Useful for debugging
# CONSOLE_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
index 3fdc4ef25e9b..80fa199cf832 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
@@ -43,19 +43,55 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT(
- _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
- _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
- _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______,
- _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+ KC_WFAV, KC_MYCM, KC_WHOM, KC_MAIL, KC_MSEL, KC_WBAK, KC_WFWD, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_FIND, KC_CALC, _______, KC_WREF,
+ BL_TOGG, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_INS,
+ RGB_TOG, PB_1, PB_2, PB_3, PB_4, PB_5, PB_6, PB_7, PB_8, PB_9, PB_10, PB_11, PB_12, RESET, KC_PSCR,
+ GUI_ON, PB_13, PB_14, PB_15, PB_16, PB_18, PB_19, PB_20, PB_21, PB_22, PB_23, PB_24, _______, KC_SCRL,
+ GUI_OFF, PB_25, PB_26, PB_27, PB_28, PB_29, PB_30, PB_31, PB_32, DM_REC1, DM_RSTP, DM_PLY1, _______, KC_PAUS,
+ KC_WAKE, OSL(2), KC_LOCK, _______, KC_UNDO, KC_TRNS, KC_AGIN, _______, _______, _______
+ ),
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______,
+ _______, _______, _______, _______, _______, KC_TRNS, _______, NK_TOGG, RGB_SPI, RGB_MOD
),
};
-// clang-format on
+bool encoder_update_user(uint8_t index, bool clockwise) {
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
-};
-#endif
+ if (index == 0) {
+ switch(biton32(layer_state)){
+ case 1:
+ if (clockwise){
+ tap_code16(KC_MS_WH_UP);
+ } else{
+ tap_code16(KC_MS_WH_DOWN);
+ }
+ break;
+ default:
+ if (clockwise) {
+ tap_code16(KC_VOLU);
+ } else {
+ tap_code16(KC_VOLD);
+ }
+ break;
+ }
+ }
+ return true;
+}
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(3, 255, 255, 255); //capslock key
+ }
+ if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(67, 0, 0, 255); //side led 01
+ RGB_MATRIX_INDICATOR_SET_COLOR(70, 0, 0, 255); //side led 02
+ RGB_MATRIX_INDICATOR_SET_COLOR(73, 0, 0, 255); //side led 03
+ RGB_MATRIX_INDICATOR_SET_COLOR(83, 255, 0, 255); //side led 06
+ RGB_MATRIX_INDICATOR_SET_COLOR(87, 255, 0, 255); //side led 07
+ RGB_MATRIX_INDICATOR_SET_COLOR(91, 255, 0, 255); //side led 08
+ }
+}
diff --git a/keyboards/gray_studio/think65v3/config.h b/keyboards/gray_studio/think65v3/config.h
new file mode 100644
index 000000000000..0a0596e64c61
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/config.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+#pragma once
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+/* 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
+
\ No newline at end of file
diff --git a/keyboards/gray_studio/think65v3/info.json b/keyboards/gray_studio/think65v3/info.json
new file mode 100644
index 000000000000..0fbab667d443
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/info.json
@@ -0,0 +1,275 @@
+{
+ "keyboard_name": "think65v3",
+ "url": "https://graystudio.club/products/testthink6-5-v3",
+ "maintainer": "edwardslau",
+ "manufacturer":"GrayStudio",
+ "processor": "STM32F072",
+ "diode_direction": "COL2ROW",
+ "bootloader": "stm32-dfu",
+ "usb": {
+ "vid":"0x4753",
+ "pid":"0x4003",
+ "device_version": "0.0.3"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "ws2812": {
+ "pin": "B10"
+ }
+ "matrix_pins": {
+ "cols": ["A3", "A5", "A4", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14", "B13"],
+ "rows": ["A6", "B12", "A2", "A0", "A1"]
+ },
+"rgblight": {
+ "led_count": 6,
+ "sleep": true,
+ "max_brightness": 150,
+ "layers": {
+ "enabled": true
+ "override_rgb": true
+ },
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0,0], "x": 0, "y": 0},
+ {"matrix": [0,1], "x": 1, "y": 0},
+ {"matrix": [0,2], "x": 2, "y": 0},
+ {"matrix": [0,3], "x": 3, "y": 0},
+ {"matrix": [0,4], "x": 4, "y": 0},
+ {"matrix": [0,5], "x": 5, "y": 0},
+ {"matrix": [0,6], "x": 6, "y": 0},
+ {"matrix": [0,7], "x": 7, "y": 0},
+ {"matrix": [0,8], "x": 8, "y": 0},
+ {"matrix": [0,9], "x": 9, "y": 0},
+ {"matrix": [0,10],"x": 10, "y": 0},
+ {"matrix": [0,11],"x": 11, "y": 0},
+ {"matrix": [0,12],"x": 12, "y": 0},
+ {"matrix": [0,13],"x": 13, "y": 0},
+ {"matrix": [0,14],"x": 14, "y": 0},
+ {"matrix": [0,15],"x": 15, "y": 0},
+
+ {"matrix": [1,0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1,2], "x": 1.5, "y": 1},
+ {"matrix": [1,3], "x": 2.5, "y": 1},
+ {"matrix": [1,4], "x": 3.5, "y": 1},
+ {"matrix": [1,5], "x": 4.5, "y": 1},
+ {"matrix": [1,6], "x": 5.5, "y": 1},
+ {"matrix": [1,7], "x": 6.5, "y": 1},
+ {"matrix": [1,8], "x": 7.5, "y": 1},
+ {"matrix": [1,9], "x": 8.5, "y": 1},
+ {"matrix": [1,10],"x": 9.5, "y": 1},
+ {"matrix": [1,11],"x": 10.5, "y": 1},
+ {"matrix": [1,12],"x": 11.5, "y": 1},
+ {"matrix": [1,13],"x": 12.5, "y": 1},
+ {"matrix": [1,14],"x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1,15],"x": 15, "y": 1},
+
+ {"matrix": [2,0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2,2], "x": 1.75, "y": 2},
+ {"matrix": [2,3], "x": 2.75, "y": 2},
+ {"matrix": [2,4], "x": 3.75, "y": 2},
+ {"matrix": [2,5], "x": 4.75, "y": 2},
+ {"matrix": [2,6], "x": 5.75, "y": 2},
+ {"matrix": [2,7], "x": 6.75, "y": 2},
+ {"matrix": [2,8], "x": 7.75, "y": 2},
+ {"matrix": [2,9], "x": 8.75, "y": 2},
+ {"matrix": [2,10],"x": 9.75, "y": 2},
+ {"matrix": [2,11],"x": 10.75, "y": 2},
+ {"matrix": [2,12],"x": 11.75, "y": 2},
+ {"matrix": [2,13],"x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3,0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3,1], "x": 1.25, "y": 3},
+ {"matrix": [3,2], "x": 2.25, "y": 3},
+ {"matrix": [3,3], "x": 3.25, "y": 3},
+ {"matrix": [3,4], "x": 4.25, "y": 3},
+ {"matrix": [3,5], "x": 5.25, "y": 3},
+ {"matrix": [3,6], "x": 6.25, "y": 3},
+ {"matrix": [3,7], "x": 7.25, "y": 3},
+ {"matrix": [3,8], "x": 8.25, "y": 3},
+ {"matrix": [3,9],"x": 9.25, "y": 3},
+ {"matrix": [3,10],"x": 10.25, "y": 3},
+ {"matrix": [3,11],"x": 11.25, "y": 3},
+ {"matrix": [3,13],"x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3,14],"x": 14, "y": 3},
+
+ {"matrix": [4,0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4,1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4,2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4,7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4,10],"x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4,11],"x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4,13],"x": 13, "y": 4},
+ {"matrix": [4,14],"x": 14, "y": 4},
+ {"matrix": [4,15],"x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_blocker": {
+ "layout": [
+ {"matrix": [0,0], "x": 0, "y": 0},
+ {"matrix": [0,1], "x": 1, "y": 0},
+ {"matrix": [0,2], "x": 2, "y": 0},
+ {"matrix": [0,3], "x": 3, "y": 0},
+ {"matrix": [0,4], "x": 4, "y": 0},
+ {"matrix": [0,5], "x": 5, "y": 0},
+ {"matrix": [0,6], "x": 6, "y": 0},
+ {"matrix": [0,7], "x": 7, "y": 0},
+ {"matrix": [0,8], "x": 8, "y": 0},
+ {"matrix": [0,9], "x": 9, "y": 0},
+ {"matrix": [0,10],"x": 10, "y": 0},
+ {"matrix": [0,11],"x": 11, "y": 0},
+ {"matrix": [0,12],"x": 12, "y": 0},
+ {"matrix": [0,13],"x": 13, "y": 0, "w": 2},
+ {"matrix": [0,15],"x": 15, "y": 0},
+
+ {"matrix": [1,0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1,2], "x": 1.5, "y": 1},
+ {"matrix": [1,3], "x": 2.5, "y": 1},
+ {"matrix": [1,4], "x": 3.5, "y": 1},
+ {"matrix": [1,5], "x": 4.5, "y": 1},
+ {"matrix": [1,6], "x": 5.5, "y": 1},
+ {"matrix": [1,7], "x": 6.5, "y": 1},
+ {"matrix": [1,8], "x": 7.5, "y": 1},
+ {"matrix": [1,9], "x": 8.5, "y": 1},
+ {"matrix": [1,10],"x": 9.5, "y": 1},
+ {"matrix": [1,11],"x": 10.5, "y": 1},
+ {"matrix": [1,12],"x": 11.5, "y": 1},
+ {"matrix": [1,13],"x": 12.5, "y": 1},
+ {"matrix": [1,14],"x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1,15],"x": 15, "y": 1},
+
+ {"matrix": [2,0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2,2], "x": 1.75, "y": 2},
+ {"matrix": [2,3], "x": 2.75, "y": 2},
+ {"matrix": [2,4], "x": 3.75, "y": 2},
+ {"matrix": [2,5], "x": 4.75, "y": 2},
+ {"matrix": [2,6], "x": 5.75, "y": 2},
+ {"matrix": [2,7], "x": 6.75, "y": 2},
+ {"matrix": [2,8], "x": 7.75, "y": 2},
+ {"matrix": [2,9], "x": 8.75, "y": 2},
+ {"matrix": [2,10],"x": 9.75, "y": 2},
+ {"matrix": [2,11],"x": 10.75, "y": 2},
+ {"matrix": [2,12],"x": 11.75, "y": 2},
+ {"matrix": [2,13],"x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3,0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3,2], "x": 2.25, "y": 3},
+ {"matrix": [3,3], "x": 3.25, "y": 3},
+ {"matrix": [3,4], "x": 4.25, "y": 3},
+ {"matrix": [3,5], "x": 5.25, "y": 3},
+ {"matrix": [3,6], "x": 6.25, "y": 3},
+ {"matrix": [3,7], "x": 7.25, "y": 3},
+ {"matrix": [3,8], "x": 8.25, "y": 3},
+ {"matrix": [3,9], "x": 9.25, "y": 3},
+ {"matrix": [3,10],"x": 10.25, "y": 3},
+ {"matrix": [3,11],"x": 11.25, "y": 3},
+ {"matrix": [3,13],"x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3,14],"x": 14, "y": 3},
+
+ {"matrix": [4,0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4,1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4,2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4,7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4,10],"x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4,11],"x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4,13],"x": 13, "y": 4},
+ {"matrix": [4,14],"x": 14, "y": 4},
+ {"matrix": [4,15],"x": 15, "y": 4}
+ ]
+ },
+ "LAYOUT_65_iso_blocker": {
+ "layout": [
+ {"matrix": [0,0], "x": 0, "y": 0},
+ {"matrix": [0,1], "x": 1, "y": 0},
+ {"matrix": [0,2], "x": 2, "y": 0},
+ {"matrix": [0,3], "x": 3, "y": 0},
+ {"matrix": [0,4], "x": 4, "y": 0},
+ {"matrix": [0,5], "x": 5, "y": 0},
+ {"matrix": [0,6], "x": 6, "y": 0},
+ {"matrix": [0,7], "x": 7, "y": 0},
+ {"matrix": [0,8], "x": 8, "y": 0},
+ {"matrix": [0,9], "x": 9, "y": 0},
+ {"matrix": [0,10],"x": 10, "y": 0},
+ {"matrix": [0,11],"x": 11, "y": 0},
+ {"matrix": [0,12],"x": 12, "y": 0},
+ {"matrix": [0,13],"x": 13, "y": 0, "w": 2},
+ {"matrix": [0,15],"x": 15, "y": 0},
+
+ {"matrix": [1,0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1,2], "x": 1.5, "y": 1},
+ {"matrix": [1,3], "x": 2.5, "y": 1},
+ {"matrix": [1,4], "x": 3.5, "y": 1},
+ {"matrix": [1,5], "x": 4.5, "y": 1},
+ {"matrix": [1,6], "x": 5.5, "y": 1},
+ {"matrix": [1,7], "x": 6.5, "y": 1},
+ {"matrix": [1,8], "x": 7.5, "y": 1},
+ {"matrix": [1,9], "x": 8.5, "y": 1},
+ {"matrix": [1,10],"x": 9.5, "y": 1},
+ {"matrix": [1,11],"x": 10.5, "y": 1},
+ {"matrix": [1,12],"x": 11.5, "y": 1},
+ {"matrix": [1,13],"x": 12.5, "y": 1},
+ {"matrix": [1,15],"x": 15, "y": 1},
+
+ {"matrix": [2,0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2,2], "x": 1.75, "y": 2},
+ {"matrix": [2,3], "x": 2.75, "y": 2},
+ {"matrix": [2,4], "x": 3.75, "y": 2},
+ {"matrix": [2,5], "x": 4.75, "y": 2},
+ {"matrix": [2,6], "x": 5.75, "y": 2},
+ {"matrix": [2,7], "x": 6.75, "y": 2},
+ {"matrix": [2,8], "x": 7.75, "y": 2},
+ {"matrix": [2,9], "x": 8.75, "y": 2},
+ {"matrix": [2,10],"x": 9.75, "y": 2},
+ {"matrix": [2,11],"x": 10.75, "y": 2},
+ {"matrix": [1,14],"x": 11.75, "y": 2},
+ {"matrix": [2,13],"x": 12.75, "y": 2},
+ {"matrix": [2,14],"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3,0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3,1],"x": 1.25, "y": 3},
+ {"matrix": [3,2], "x": 2.25, "y": 3},
+ {"matrix": [3,3], "x": 3.25, "y": 3},
+ {"matrix": [3,4], "x": 4.25, "y": 3},
+ {"matrix": [3,5], "x": 5.25, "y": 3},
+ {"matrix": [3,6], "x": 6.25, "y": 3},
+ {"matrix": [3,7], "x": 7.25, "y": 3},
+ {"matrix": [3,8], "x": 8.25, "y": 3},
+ {"matrix": [3,9], "x": 9.25, "y": 3},
+ {"matrix": [3,10],"x": 10.25, "y": 3},
+ {"matrix": [3,11],"x": 11.25, "y": 3},
+ {"matrix": [3,13],"x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3,14],"x": 14, "y": 3},
+
+ {"matrix": [4,0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4,1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4,2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4,7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4,10],"x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4,11],"x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4,13],"x": 13, "y": 4},
+ {"matrix": [4,14],"x": 14, "y": 4},
+ {"matrix": [4,15],"x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/gray_studio/think65v3/keymaps/default/keymap.c b/keyboards/gray_studio/think65v3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..82ff711808ed
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/keymaps/default/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2023 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ QK_GESC, 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_BSPC, KC_DEL,
+ 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_HOME,
+ 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_LSFT, 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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, QK_BOOT,
+ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+};
diff --git a/keyboards/gray_studio/think65v3/keymaps/via/keymap.c b/keyboards/gray_studio/think65v3/keymaps/via/keymap.c
new file mode 100644
index 000000000000..82ff711808ed
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/keymaps/via/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2023 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ QK_GESC, 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_BSPC, KC_DEL,
+ 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_HOME,
+ 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_LSFT, 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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, QK_BOOT,
+ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+};
diff --git a/keyboards/gray_studio/think65v3/keymaps/via/rules.mk b/keyboards/gray_studio/think65v3/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gray_studio/think65v3/readme.md b/keyboards/gray_studio/think65v3/readme.md
new file mode 100644
index 000000000000..dc09a00d1d2c
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/readme.md
@@ -0,0 +1,21 @@
+# Gray Studio think65v3
+
+ A 65% keyboard by Graystudio. PCB designed and manufactured by DEMO Studio.
+
+ * Keyboard Maintainer: [edwardslau](https://github.com/edwardslau)
+ * Hardware Support: Think6.5 V3
+ * Hardware Availability:
+
+ Make example for this keyboard (after setting up your build environment):
+
+ make gray_studio/think65v3:default
+
+ Flashing example for this keyboard:
+
+ make gray_studio/think65v3:default:flash
+
+## Bootloader
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+
+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 infromation. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/gray_studio/think65v3/rules.mk b/keyboards/gray_studio/think65v3/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/gray_studio/think65v3/think65v3.c b/keyboards/gray_studio/think65v3/think65v3.c
new file mode 100644
index 000000000000..04dd85406fb5
--- /dev/null
+++ b/keyboards/gray_studio/think65v3/think65v3.c
@@ -0,0 +1,22 @@
+// Copyright 2023 Yizhen Liu (@edwardslau)
+// SPDX-License-Identifier: GPL-2.0
+#include "quantum.h"
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,6, HSV_WHITE}
+);
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ my_capslock_layer
+);
+
+void keyboard_post_init_kb(void) {
+ // Enable the LED layers
+ rgblight_layers = my_rgb_layers;
+ keyboard_post_init_user();
+}
+bool led_update_kb(led_t led_state) {
+ bool res = led_update_user(led_state);
+ if (res) {
+ rgblight_set_layer_state(0, led_state.caps_lock);
+ }
+ return res;
+}
diff --git a/keyboards/handwired/dactyl_lightcycle/info.json b/keyboards/handwired/dactyl_lightcycle/info.json
index c8bf0b85fcb0..4a123e711d25 100644
--- a/keyboards/handwired/dactyl_lightcycle/info.json
+++ b/keyboards/handwired/dactyl_lightcycle/info.json
@@ -4,9 +4,9 @@
"url": "https://github.com/adereth/dactyl-keyboard",
"maintainer": "Matt Adereth",
"usb": {
- "vid": "0xFEED",
- "pid": "0x3060",
- "device_version": "0.0.1"
+ "vid": "0x444C",
+ "pid": "0xA460",
+ "device_version": "1.0.0"
},
"features": {
"bootmagic": true,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c
new file mode 100644
index 000000000000..337f332c5d97
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+// Copyright 2023 QMK Community
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+ _QWERTY,
+ _LOWER,
+ _RAISE,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_QWERTY] = LAYOUT_5x6(
+ KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC,
+ KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_MINS,
+ KC_LSFT, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT,
+ KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
+ KC_LBRC,KC_RBRC, KC_PLUS, KC_EQL,
+ RAISE,KC_SPC, KC_ENT, LOWER,
+ KC_TAB,KC_HOME, KC_END, KC_DEL,
+ KC_BSPC, KC_GRV, KC_LGUI, KC_LALT
+ ),
+
+ [_LOWER] = LAYOUT_5x6(
+ KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
+ _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
+ _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN, KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
+ _______,_______,_______,_______,_______,_______, _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
+ _______,KC_PSCR, _______, KC_P0,
+ _______,_______, _______,_______,
+ _______,_______, _______,_______,
+ _______,_______, _______,_______
+
+ ),
+
+ [_RAISE] = LAYOUT_5x6(
+ KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
+ _______,_______,_______,_______,_______,KC_LBRC, KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
+ _______,KC_LEFT,KC_UP ,KC_DOWN,KC_RGHT,KC_LPRN, KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,KC_VOLD,
+ _______,_______, KC_EQL ,_______,
+ _______,_______, _______,_______,
+ _______,_______, _______,_______,
+ _______,_______, _______,_______
+ )
+};
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_maximus/info.json b/keyboards/handwired/dactyl_maximus/info.json
index 424fde95622a..1d3c9443f313 100644
--- a/keyboards/handwired/dactyl_maximus/info.json
+++ b/keyboards/handwired/dactyl_maximus/info.json
@@ -4,9 +4,9 @@
"url": "",
"maintainer": "dunk2k",
"usb": {
- "vid": "0x444D",
- "pid": "0x3536",
- "device_version": "0.0.1"
+ "vid": "0x444C",
+ "pid": "0xA57B",
+ "device_version": "1.0.0"
},
"features": {
"bootmagic": true,
diff --git a/keyboards/handwired/pytest/macro/keymaps/default/keymap.json b/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
index 23c371aa3434..3bef21a0b21a 100644
--- a/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
+++ b/keyboards/handwired/pytest/macro/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "handwired/pytest/basic",
+ "keyboard": "handwired/pytest/macro",
"keymap": "default_json",
"layout": "LAYOUT_ortho_1x1",
"layers": [["QK_MACRO_0"]],
diff --git a/keyboards/handwired/scottokeebs/scotto34/info.json b/keyboards/handwired/scottokeebs/scotto34/info.json
new file mode 100644
index 000000000000..6fcce38d709f
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto34/info.json
@@ -0,0 +1,74 @@
+{
+ "manufacturer": "ScottoKeebs",
+ "keyboard_name": "Scotto34",
+ "maintainer": "joe-scotto",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["GP3", "GP2", "GP7", "GP8", "GP13", "GP16", "GP17", "GP18", "GP19", "GP20"],
+ "rows": ["GP0", "GP4", "GP9", "GP14"]
+ },
+ "processor": "RP2040",
+ "url": "https://scottokeebs.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0013",
+ "vid": "0xFEED"
+ },
+ "community_layouts": ["split_3x5_2"],
+ "layouts": {
+ "LAYOUT_split_3x5_2": {
+ "layout": [
+ // Row 1
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [0, 6], "x": 6, "y": 0 },
+ { "matrix": [0, 7], "x": 7, "y": 0 },
+ { "matrix": [0, 8], "x": 8, "y": 0 },
+ { "matrix": [0, 9], "x": 9, "y": 0 },
+
+ // Row 2
+ { "matrix": [1, 0], "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1, "y": 1 },
+ { "matrix": [1, 2], "x": 2, "y": 1 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1 },
+ { "matrix": [1, 5], "x": 5, "y": 1 },
+ { "matrix": [1, 6], "x": 6, "y": 1 },
+ { "matrix": [1, 7], "x": 7, "y": 1 },
+ { "matrix": [1, 8], "x": 8, "y": 1 },
+ { "matrix": [1, 9], "x": 9, "y": 1 },
+
+ // Row 3
+ { "matrix": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "y": 2 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2 },
+ { "matrix": [2, 5], "x": 5, "y": 2 },
+ { "matrix": [2, 6], "x": 6, "y": 2 },
+ { "matrix": [2, 7], "x": 7, "y": 2 },
+ { "matrix": [2, 8], "x": 8, "y": 2 },
+ { "matrix": [2, 9], "x": 9, "y": 2 },
+
+ // Row 4
+ { "matrix": [3, 3], "x": 3, "y": 3 },
+ { "matrix": [3, 4], "x": 4, "y": 3 },
+ { "matrix": [3, 5], "x": 5, "y": 3 },
+ { "matrix": [3, 6], "x": 6, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/scottokeebs/scotto34/keymaps/default/config.h b/keyboards/handwired/scottokeebs/scotto34/keymaps/default/config.h
new file mode 100644
index 000000000000..572a1b24ead9
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto34/keymaps/default/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2022 Joe Scotto
+
+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 options
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/scottokeebs/scotto34/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scotto34/keymaps/default/keymap.c
new file mode 100644
index 000000000000..8231ad94fc05
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto34/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2022 Joe Scotto
+
+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] = {
+ [0] = LAYOUT_split_3x5_2(
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT)
+ ),
+ [1] = LAYOUT_split_3x5_2(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [2] = LAYOUT_split_3x5_2(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT_split_3x5_2(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/config.h b/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/config.h
new file mode 100644
index 000000000000..1a6512052c1d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2022 Joe Scotto
+
+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 options
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/keymap.c b/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/keymap.c
new file mode 100644
index 000000000000..f65f6aa17af9
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/keymap.c
@@ -0,0 +1,196 @@
+/*
+Copyright 2022 Joe Scotto
+
+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
+
+// Tap dance declarations
+enum {
+ TD_ESC_LALT_LCTL_SPOTLIGHT_EMOJI,
+ TD_ESC_LCTL_LALT_WINDOWS_EMOJI
+};
+
+// Custom tapping term for multi function keys
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case TD(TD_ESC_LALT_LCTL_SPOTLIGHT_EMOJI) :
+ case TD(TD_ESC_LCTL_LALT_WINDOWS_EMOJI) :
+ case LGUI_T(KC_SPC) :
+ case LT(1, KC_SPC) :
+ case LT(1, KC_TAB) :
+ case LT(2, KC_ENT) :
+ return 200;
+ default:
+ return TAPPING_TERM;
+ }
+};
+
+// Begin quad TD
+typedef enum {
+ TD_NONE,
+ TD_UNKNOWN,
+ TD_SINGLE_HOLD,
+ TD_DOUBLE_HOLD,
+ TD_TRIPLE_HOLD,
+ TD_SINGLE_TAP,
+ TD_DOUBLE_TAP,
+ TD_TRIPLE_TAP
+} td_state_t;
+
+typedef struct {
+ bool is_press_action;
+ td_state_t state;
+} td_tap_t;
+
+// Create an instance of 'td_tap_t' for the 'x' tap dance.
+static td_tap_t xtap_state = {
+ .is_press_action = true,
+ .state = TD_NONE
+};
+
+td_state_t cur_dance(tap_dance_state_t *state) {
+ if (state->count == 1) {
+ if (state->interrupted || !state->pressed) {
+ return TD_SINGLE_TAP;
+ } else {
+ return TD_SINGLE_HOLD;
+ }
+ } else if (state->count == 2) {
+ if (state->interrupted || !state->pressed) {
+ return TD_DOUBLE_TAP;
+ } else {
+ return TD_DOUBLE_HOLD;
+ }
+ } else if (state->count == 3) {
+ if (state->interrupted || !state->pressed) {
+ return TD_TRIPLE_TAP;
+ } else {
+ return TD_TRIPLE_HOLD;
+ }
+ }
+
+ return TD_UNKNOWN;
+}
+
+void td_esc_lalt_lctl_spotlight_emoji_finished(tap_dance_state_t *state, void *user_data) {
+ xtap_state.state = cur_dance(state);
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: tap_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: register_code(KC_LALT); break;
+ case TD_DOUBLE_HOLD: register_code(KC_LCTL); break;
+ case TD_DOUBLE_TAP: tap_code16(G(KC_SPC)); break;
+ case TD_TRIPLE_TAP: tap_code16(C(G(KC_SPC))); break;
+ default: break;
+ }
+}
+
+void td_esc_lalt_lctl_spotlight_emoji_reset(tap_dance_state_t *state, void *user_data) {
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: unregister_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: unregister_code(KC_LALT); break;
+ case TD_DOUBLE_HOLD: unregister_code(KC_LCTL); break;
+ default: break;
+ }
+ xtap_state.state = TD_NONE;
+}
+
+void td_esc_lctl_lalt_windows_emoji_finished(tap_dance_state_t *state, void *user_data) {
+ xtap_state.state = cur_dance(state);
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: tap_code16(KC_ESC); break;
+ case TD_SINGLE_HOLD: register_code(KC_LCTL); break;
+ case TD_DOUBLE_HOLD: register_code(KC_LALT); break;
+ case TD_DOUBLE_TAP: tap_code(KC_LGUI); break;
+ case TD_TRIPLE_TAP: tap_code16(G(KC_DOT)); break;
+ default: break;
+ }
+}
+
+void td_esc_lctl_lalt_windows_emoji_reset(tap_dance_state_t *state, void *user_data) {
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: unregister_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: unregister_code(KC_LCTL); break;
+ case TD_DOUBLE_HOLD: unregister_code(KC_LALT); break;
+ default: break;
+ }
+ xtap_state.state = TD_NONE;
+}
+
+ // Tap Dance definitions
+tap_dance_action_t tap_dance_actions[] = {
+ [TD_ESC_LALT_LCTL_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_esc_lalt_lctl_spotlight_emoji_finished, td_esc_lalt_lctl_spotlight_emoji_reset),
+ [TD_ESC_LCTL_LALT_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_esc_lctl_lalt_windows_emoji_finished, td_esc_lctl_lalt_windows_emoji_reset)
+};
+// For the x tap dance. Put it here so it can be used in any keymap
+void x_finished(tap_dance_state_t *state, void *user_data);
+void x_reset(tap_dance_state_t *state, void *user_data);
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_split_3x5_2(
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_ESC_LALT_LCTL_SPOTLIGHT_EMOJI), LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT)
+ ),
+ [1] = LAYOUT_split_3x5_2(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [2] = LAYOUT_split_3x5_2(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT_split_3x5_2(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0), TO(5), TO(4),
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [4] = LAYOUT_split_3x5_2(
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_ESC_LCTL_LALT_WINDOWS_EMOJI), KC_SPC, LT(6, KC_TAB), LT(7, KC_ENT)
+ ),
+ [5] = LAYOUT_split_3x5_2(
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, KC_SLSH,
+ KC_LCTL, KC_SPC, LT(6, KC_TAB), LT(7, KC_ENT)
+ ),
+ [6] = LAYOUT_split_3x5_2(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [7] = LAYOUT_split_3x5_2(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(8), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [8] = LAYOUT_split_3x5_2(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(4), TO(5), TO(0),
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/rules.mk b/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/rules.mk
new file mode 100644
index 000000000000..e5ddcae8d927
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto34/keymaps/scotto/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/scottokeebs/scotto34/readme.md b/keyboards/handwired/scottokeebs/scotto34/readme.md
new file mode 100644
index 000000000000..88e9185ec20c
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scotto34/readme.md
@@ -0,0 +1,29 @@
+# Scotto34
+
+
+
+A low-profile 34-key split monoblock ortholinear keyboard that uses 18x17mm spaced Choc switches and an exposed controller in the middle. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+
+* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+* Hardware Supported: RP2040
+* Hardware Availability: [Amazon](https://amazon.com)
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/scottokeebs/scotto34:default
+
+Flashing example for this keyboard:
+
+ make handwired/scottokeebs/scotto34: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scotto34/rules.mk b/keyboards/handwired/scottokeebs/scotto34/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/handwired/scottokeebs/scottoergo/info.json b/keyboards/handwired/scottokeebs/scottoergo/info.json
new file mode 100644
index 000000000000..cc4fb126b6e3
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoergo/info.json
@@ -0,0 +1,76 @@
+{
+ "manufacturer": "ScottoKeebs",
+ "keyboard_name": "ScottoErgo",
+ "maintainer": "joe-scotto",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": [ "GP0", "GP1", "GP2", "GP3", "GP4", "GP22", "GP21", "GP20", "GP19", "GP18"],
+ "rows": ["GP12", "GP13", "GP14", "GP15"]
+ },
+ "processor": "RP2040",
+ "url": "https://scottokeebs.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0016",
+ "vid": "0xFEED"
+ },
+ "community_layouts": ["split_3x5_3"],
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ // Row 1
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [0, 6], "x": 6, "y": 0 },
+ { "matrix": [0, 7], "x": 7, "y": 0 },
+ { "matrix": [0, 8], "x": 8, "y": 0 },
+ { "matrix": [0, 9], "x": 9, "y": 0 },
+
+ // Row 2
+ { "matrix": [1, 0], "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1, "y": 1 },
+ { "matrix": [1, 2], "x": 2, "y": 1 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1 },
+ { "matrix": [1, 5], "x": 5, "y": 1 },
+ { "matrix": [1, 6], "x": 6, "y": 1 },
+ { "matrix": [1, 7], "x": 7, "y": 1 },
+ { "matrix": [1, 8], "x": 8, "y": 1 },
+ { "matrix": [1, 9], "x": 9, "y": 1 },
+
+ // Row 3
+ { "matrix": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "y": 2 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2 },
+ { "matrix": [2, 5], "x": 5, "y": 2 },
+ { "matrix": [2, 6], "x": 6, "y": 2 },
+ { "matrix": [2, 7], "x": 7, "y": 2 },
+ { "matrix": [2, 8], "x": 8, "y": 2 },
+ { "matrix": [2, 9], "x": 9, "y": 2 },
+
+ // Row 4
+ { "matrix": [3, 2], "x": 2, "y": 3 },
+ { "matrix": [3, 3], "x": 3, "y": 3 },
+ { "matrix": [3, 4], "x": 4, "y": 3 },
+ { "matrix": [3, 5], "x": 5, "y": 3 },
+ { "matrix": [3, 6], "x": 6, "y": 3 },
+ { "matrix": [3, 7], "x": 7, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/scottokeebs/scottoergo/keymaps/default/config.h b/keyboards/handwired/scottokeebs/scottoergo/keymaps/default/config.h
new file mode 100644
index 000000000000..1a6512052c1d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoergo/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2022 Joe Scotto
+
+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 options
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/scottokeebs/scottoergo/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottoergo/keymaps/default/keymap.c
new file mode 100644
index 000000000000..451f48a96870
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoergo/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2023 Joe Scotto
+
+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] = {
+ [0] = LAYOUT_split_3x5_3(
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ KC_LGUI, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC
+ ),
+ [1] = LAYOUT_split_3x5_3(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [2] = LAYOUT_split_3x5_3(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT_split_3x5_3(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/config.h b/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/config.h
new file mode 100644
index 000000000000..1a6512052c1d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2022 Joe Scotto
+
+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 options
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/keymap.c b/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/keymap.c
new file mode 100644
index 000000000000..f4d0a0c7bba3
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/keymap.c
@@ -0,0 +1,174 @@
+/*
+Copyright 2022 Joe Scotto
+
+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
+
+// Tap dance declarations
+enum {
+ TD_LCTL_ESC_SPOTLIGHT_EMOJI,
+ TD_LALT_ESC_WINDOWS_EMOJI
+};
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI) :
+ case TD(TD_LALT_ESC_WINDOWS_EMOJI) :
+ case LGUI_T(KC_SPC) :
+ case LT(1, KC_TAB) :
+ case LT(2, KC_ENT) :
+ return 200;
+ default:
+ return TAPPING_TERM;
+ }
+};
+
+// Begin quad TD
+typedef enum {
+ TD_NONE,
+ TD_UNKNOWN,
+ TD_SINGLE_HOLD,
+ TD_SINGLE_TAP,
+ TD_DOUBLE_TAP,
+ TD_TRIPLE_TAP
+} td_state_t;
+
+typedef struct {
+ bool is_press_action;
+ td_state_t state;
+} td_tap_t;
+
+// Create an instance of 'td_tap_t' for the 'x' tap dance.
+static td_tap_t xtap_state = {
+ .is_press_action = true,
+ .state = TD_NONE
+};
+
+td_state_t cur_dance(tap_dance_state_t *state) {
+ if (state->count == 1) {
+ if (state->interrupted || !state->pressed) {
+ return TD_SINGLE_TAP;
+ } else {
+ return TD_SINGLE_HOLD;
+ }
+ } else if (state->count == 2) {
+ return TD_DOUBLE_TAP;
+ } else if (state->count == 3) {
+ return TD_TRIPLE_TAP;
+ }
+
+ return TD_UNKNOWN;
+}
+
+void td_lctl_esc_spotlight_emoji_finished(tap_dance_state_t *state, void *user_data) {
+ xtap_state.state = cur_dance(state);
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: register_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: register_code(KC_LCTL); break;
+ case TD_DOUBLE_TAP: tap_code16(G(KC_SPC)); break;
+ case TD_TRIPLE_TAP: tap_code16(C(G(KC_SPC))); break;
+ default: break;
+ }
+}
+
+void td_lctl_esc_spotlight_emoji_reset(tap_dance_state_t *state, void *user_data) {
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: unregister_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: unregister_code(KC_LCTL); break;
+ default: break;
+ }
+ xtap_state.state = TD_NONE;
+}
+
+void td_lalt_esc_windowr_emoji_finished(tap_dance_state_t *state, void *user_data) {
+ xtap_state.state = cur_dance(state);
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: register_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: register_code(KC_LALT); break;
+ case TD_DOUBLE_TAP: tap_code(KC_LGUI); break;
+ case TD_TRIPLE_TAP: tap_code16(G(KC_DOT)); break;
+ default: break;
+ }
+}
+
+void td_lalt_esc_windowr_emoji_reset(tap_dance_state_t *state, void *user_data) {
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: unregister_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: unregister_code(KC_LALT); break;
+ default: break;
+ }
+ xtap_state.state = TD_NONE;
+}
+
+ // Tap Dance definitions
+tap_dance_action_t tap_dance_actions[] = {
+ [TD_LCTL_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_lctl_esc_spotlight_emoji_finished, td_lctl_esc_spotlight_emoji_reset),
+ [TD_LALT_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_lalt_esc_windowr_emoji_finished, td_lalt_esc_windowr_emoji_reset),
+};
+// For the x tap dance. Put it here so it can be used in any keymap
+void x_finished(tap_dance_state_t *state, void *user_data);
+void x_reset(tap_dance_state_t *state, void *user_data);
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_split_3x5_3(
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI)
+ ),
+ [1] = LAYOUT_split_3x5_3(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI)
+ ),
+ [2] = LAYOUT_split_3x5_3(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI)
+ ),
+ [3] = LAYOUT_split_3x5_3(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(4),
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI)
+ ),
+ [4] = LAYOUT_split_3x5_3(
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, LT(5, KC_TAB), LT(6, KC_ENT), TD(TD_LALT_ESC_WINDOWS_EMOJI)
+ ),
+ [5] = LAYOUT_split_3x5_3(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS, TD(TD_LALT_ESC_WINDOWS_EMOJI)
+ ),
+ [6] = LAYOUT_split_3x5_3(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(7), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS, TD(TD_LALT_ESC_WINDOWS_EMOJI)
+ ),
+ [7] = LAYOUT_split_3x5_3(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0),
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS, TD(TD_LALT_ESC_WINDOWS_EMOJI)
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/rules.mk b/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/rules.mk
new file mode 100644
index 000000000000..e5ddcae8d927
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoergo/keymaps/scotto/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/scottokeebs/scottoergo/readme.md b/keyboards/handwired/scottokeebs/scottoergo/readme.md
new file mode 100644
index 000000000000..8bbf388304ad
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoergo/readme.md
@@ -0,0 +1,27 @@
+# ScottoErgo
+
+
+
+A 36-key column staggered ortholinear ergonomic keyboard with an exposed controller, aviator connector for USB, 10° of tilt, and 20° of angle. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+
+* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+* Hardware Supported: RP2040
+* Hardware Availability: [Amazon](https://amazon.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/scottokeebs/scottoergo:default
+
+Flashing example for this keyboard:
+
+ make handwired/scottokeebs/scottoergo: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoergo/rules.mk b/keyboards/handwired/scottokeebs/scottoergo/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoergo/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/info.json b/keyboards/handwired/scottokeebs/scottoinvader/info.json
new file mode 100644
index 000000000000..89a4fca4b487
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoinvader/info.json
@@ -0,0 +1,78 @@
+{
+ "manufacturer": "ScottoKeebs",
+ "keyboard_name": "ScottoInvader",
+ "maintainer": "joe-scotto",
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ // 3, 4, 5, 6, 7, 8, 9, A3, A2, A1
+ "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6"]
+
+ // 15, 14, 16, 10
+ "rows": ["B1", "B3", "B2", "B6"]
+ },
+ "url": "https://scottokeebs.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0010",
+ "vid": "0xFEED"
+ },
+ "community_layouts": ["split_3x5_3"],
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ // Row 1
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [0, 6], "x": 6, "y": 0 },
+ { "matrix": [0, 7], "x": 7, "y": 0 },
+ { "matrix": [0, 8], "x": 8, "y": 0 },
+ { "matrix": [0, 9], "x": 9, "y": 0 },
+
+ // Row 2
+ { "matrix": [1, 0], "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1, "y": 1 },
+ { "matrix": [1, 2], "x": 2, "y": 1 },
+ { "matrix": [1, 3], "x": 3, "y": 1 },
+ { "matrix": [1, 4], "x": 4, "y": 1 },
+ { "matrix": [1, 5], "x": 5, "y": 1 },
+ { "matrix": [1, 6], "x": 6, "y": 1 },
+ { "matrix": [1, 7], "x": 7, "y": 1 },
+ { "matrix": [1, 8], "x": 8, "y": 1 },
+ { "matrix": [1, 9], "x": 9, "y": 1 },
+
+ // Row 3
+ { "matrix": [2, 0], "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1, "y": 2 },
+ { "matrix": [2, 2], "x": 2, "y": 2 },
+ { "matrix": [2, 3], "x": 3, "y": 2 },
+ { "matrix": [2, 4], "x": 4, "y": 2 },
+ { "matrix": [2, 5], "x": 5, "y": 2 },
+ { "matrix": [2, 6], "x": 6, "y": 2 },
+ { "matrix": [2, 7], "x": 7, "y": 2 },
+ { "matrix": [2, 8], "x": 8, "y": 2 },
+ { "matrix": [2, 9], "x": 9, "y": 2 },
+
+ // Row 4
+ { "matrix": [3, 2], "x": 2, "y": 3 },
+ { "matrix": [3, 3], "x": 3, "y": 3 },
+ { "matrix": [3, 4], "x": 4, "y": 3 },
+ { "matrix": [3, 5], "x": 5, "y": 3 },
+ { "matrix": [3, 6], "x": 6, "y": 3 },
+ { "matrix": [3, 7], "x": 7, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/keymaps/default/config.h b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/default/config.h
new file mode 100644
index 000000000000..1a6512052c1d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2022 Joe Scotto
+
+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 options
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2633845d509e
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2022 Joe Scotto
+
+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] = {
+ [0] = LAYOUT_split_3x5_3(
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ KC_LGUI, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC
+ ),
+ [1] = LAYOUT_split_3x5_3(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [2] = LAYOUT_split_3x5_3(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ ),
+ [3] = LAYOUT_split_3x5_3(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/config.h b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/config.h
new file mode 100644
index 000000000000..1a6512052c1d
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/config.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2022 Joe Scotto
+
+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 options
+#define TAPPING_TERM 135
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/keymap.c b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/keymap.c
new file mode 100644
index 000000000000..f4d0a0c7bba3
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/keymap.c
@@ -0,0 +1,174 @@
+/*
+Copyright 2022 Joe Scotto
+
+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
+
+// Tap dance declarations
+enum {
+ TD_LCTL_ESC_SPOTLIGHT_EMOJI,
+ TD_LALT_ESC_WINDOWS_EMOJI
+};
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI) :
+ case TD(TD_LALT_ESC_WINDOWS_EMOJI) :
+ case LGUI_T(KC_SPC) :
+ case LT(1, KC_TAB) :
+ case LT(2, KC_ENT) :
+ return 200;
+ default:
+ return TAPPING_TERM;
+ }
+};
+
+// Begin quad TD
+typedef enum {
+ TD_NONE,
+ TD_UNKNOWN,
+ TD_SINGLE_HOLD,
+ TD_SINGLE_TAP,
+ TD_DOUBLE_TAP,
+ TD_TRIPLE_TAP
+} td_state_t;
+
+typedef struct {
+ bool is_press_action;
+ td_state_t state;
+} td_tap_t;
+
+// Create an instance of 'td_tap_t' for the 'x' tap dance.
+static td_tap_t xtap_state = {
+ .is_press_action = true,
+ .state = TD_NONE
+};
+
+td_state_t cur_dance(tap_dance_state_t *state) {
+ if (state->count == 1) {
+ if (state->interrupted || !state->pressed) {
+ return TD_SINGLE_TAP;
+ } else {
+ return TD_SINGLE_HOLD;
+ }
+ } else if (state->count == 2) {
+ return TD_DOUBLE_TAP;
+ } else if (state->count == 3) {
+ return TD_TRIPLE_TAP;
+ }
+
+ return TD_UNKNOWN;
+}
+
+void td_lctl_esc_spotlight_emoji_finished(tap_dance_state_t *state, void *user_data) {
+ xtap_state.state = cur_dance(state);
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: register_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: register_code(KC_LCTL); break;
+ case TD_DOUBLE_TAP: tap_code16(G(KC_SPC)); break;
+ case TD_TRIPLE_TAP: tap_code16(C(G(KC_SPC))); break;
+ default: break;
+ }
+}
+
+void td_lctl_esc_spotlight_emoji_reset(tap_dance_state_t *state, void *user_data) {
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: unregister_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: unregister_code(KC_LCTL); break;
+ default: break;
+ }
+ xtap_state.state = TD_NONE;
+}
+
+void td_lalt_esc_windowr_emoji_finished(tap_dance_state_t *state, void *user_data) {
+ xtap_state.state = cur_dance(state);
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: register_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: register_code(KC_LALT); break;
+ case TD_DOUBLE_TAP: tap_code(KC_LGUI); break;
+ case TD_TRIPLE_TAP: tap_code16(G(KC_DOT)); break;
+ default: break;
+ }
+}
+
+void td_lalt_esc_windowr_emoji_reset(tap_dance_state_t *state, void *user_data) {
+ switch (xtap_state.state) {
+ case TD_SINGLE_TAP: unregister_code(KC_ESC); break;
+ case TD_SINGLE_HOLD: unregister_code(KC_LALT); break;
+ default: break;
+ }
+ xtap_state.state = TD_NONE;
+}
+
+ // Tap Dance definitions
+tap_dance_action_t tap_dance_actions[] = {
+ [TD_LCTL_ESC_SPOTLIGHT_EMOJI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_lctl_esc_spotlight_emoji_finished, td_lctl_esc_spotlight_emoji_reset),
+ [TD_LALT_ESC_WINDOWS_EMOJI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_lalt_esc_windowr_emoji_finished, td_lalt_esc_windowr_emoji_reset),
+};
+// For the x tap dance. Put it here so it can be used in any keymap
+void x_finished(tap_dance_state_t *state, void *user_data);
+void x_reset(tap_dance_state_t *state, void *user_data);
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_split_3x5_3(
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI)
+ ),
+ [1] = LAYOUT_split_3x5_3(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI)
+ ),
+ [2] = LAYOUT_split_3x5_3(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI)
+ ),
+ [3] = LAYOUT_split_3x5_3(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(4),
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI), KC_LALT, LGUI_T(KC_SPC), KC_TRNS, KC_TRNS, TD(TD_LCTL_ESC_SPOTLIGHT_EMOJI)
+ ),
+ [4] = LAYOUT_split_3x5_3(
+ KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_BSPC,
+ KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, LT(5, KC_TAB), LT(6, KC_ENT), TD(TD_LALT_ESC_WINDOWS_EMOJI)
+ ),
+ [5] = LAYOUT_split_3x5_3(
+ KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
+ KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
+ LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
+ TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS, TD(TD_LALT_ESC_WINDOWS_EMOJI)
+ ),
+ [6] = LAYOUT_split_3x5_3(
+ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
+ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, MO(7), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS, TD(TD_LALT_ESC_WINDOWS_EMOJI)
+ ),
+ [7] = LAYOUT_split_3x5_3(
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TO(0),
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
+ TD(TD_LALT_ESC_WINDOWS_EMOJI), KC_LCTL, KC_SPC, KC_TRNS, KC_TRNS, TD(TD_LALT_ESC_WINDOWS_EMOJI)
+ )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/rules.mk b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/rules.mk
new file mode 100644
index 000000000000..e5ddcae8d927
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoinvader/keymaps/scotto/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/readme.md b/keyboards/handwired/scottokeebs/scottoinvader/readme.md
new file mode 100644
index 000000000000..c04920498a86
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoinvader/readme.md
@@ -0,0 +1,27 @@
+# ScottoInvader
+
+
+
+A 36-key column-staggered ortholinear keyboard. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+
+* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
+* Hardware Supported: ATmega32U4
+* Hardware Availability: [Amazon](https://amazon.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make handwired/scottokeebs/scottoinvader:default
+
+Flashing example for this keyboard:
+
+ make handwired/scottokeebs/scottoinvader: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/rules.mk b/keyboards/handwired/scottokeebs/scottoinvader/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoinvader/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/inland/mk47/config.h b/keyboards/inland/mk47/config.h
new file mode 100644
index 000000000000..678686555ab9
--- /dev/null
+++ b/keyboards/inland/mk47/config.h
@@ -0,0 +1,40 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+/* SPI Config for spi flash*/
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)
+
+/* I2C Config for LED Driver */
+#define DRIVER_COUNT 1
+#define DRIVER_ADDR_1 0b1110100
+/* WB32 MCU has no default definition */
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 400000
+
+#define RGB_MATRIX_LED_COUNT 47
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+
diff --git a/keyboards/inland/mk47/halconf.h b/keyboards/inland/mk47/halconf.h
new file mode 100644
index 000000000000..55bfe5c97794
--- /dev/null
+++ b/keyboards/inland/mk47/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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 TRUE
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next
diff --git a/keyboards/inland/mk47/info.json b/keyboards/inland/mk47/info.json
new file mode 100644
index 000000000000..f88003b27f7f
--- /dev/null
+++ b/keyboards/inland/mk47/info.json
@@ -0,0 +1,159 @@
+{
+ "keyboard_name": "MK47",
+ "manufacturer": "Inland",
+ "maintainer": "jonylee@hfd",
+ "url":"",
+ "usb": {
+ "vid": "0xFFFE",
+ "pid": "0x0002",
+ "device_version": "0.0.1",
+ "force_nkro": true,
+ "suspend_wakeup_delay": 1000
+ },
+ "processor": "WB32FQ95",
+ "bootloader": "wb32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4"],
+ "rows": ["C6", "C7", "C8", "C9"]
+ },
+ "rgb_matrix": {
+ "driver": "IS31FL3733",
+ "max_brightness": 200,
+ "animations": {
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "raindrops": true,
+ "typing_heatmap": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "multisplash": true
+ },
+ "layout": [
+ { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
+ { "flags": 4, "matrix": [0, 1], "x": 20, "y": 0 },
+ { "flags": 4, "matrix": [0, 2], "x": 41, "y": 0 },
+ { "flags": 4, "matrix": [0, 3], "x": 61, "y": 0 },
+ { "flags": 4, "matrix": [0, 4], "x": 81, "y": 0 },
+ { "flags": 4, "matrix": [0, 5], "x": 102, "y": 0 },
+ { "flags": 4, "matrix": [0, 6], "x": 122, "y": 0 },
+ { "flags": 4, "matrix": [0, 7], "x": 143, "y": 0 },
+ { "flags": 4, "matrix": [0, 8], "x": 163, "y": 0 },
+ { "flags": 4, "matrix": [0, 9], "x": 183, "y": 0 },
+ { "flags": 4, "matrix": [0, 10], "x": 204, "y": 0 },
+ { "flags": 4, "matrix": [0, 11], "x": 224, "y": 0 },
+
+ { "flags": 4, "matrix": [1, 0], "x": 0, "y": 21},
+ { "flags": 4, "matrix": [1, 1], "x": 20, "y": 21},
+ { "flags": 4, "matrix": [1, 2], "x": 41, "y": 21},
+ { "flags": 4, "matrix": [1, 3], "x": 61, "y": 21},
+ { "flags": 4, "matrix": [1, 4], "x": 81, "y": 21},
+ { "flags": 4, "matrix": [1, 5], "x": 102, "y": 21},
+ { "flags": 4, "matrix": [1, 6], "x": 122, "y": 21},
+ { "flags": 4, "matrix": [1, 7], "x": 143, "y": 21},
+ { "flags": 4, "matrix": [1, 8], "x": 163, "y": 21},
+ { "flags": 4, "matrix": [1, 9], "x": 183, "y": 21},
+ { "flags": 4, "matrix": [1, 10], "x": 204, "y": 21},
+ { "flags": 4, "matrix": [1, 11], "x": 224, "y": 21},
+
+ { "flags": 4, "matrix": [2, 0], "x": 0, "y": 42},
+ { "flags": 4, "matrix": [2, 1], "x": 20, "y": 42},
+ { "flags": 4, "matrix": [2, 2], "x": 41, "y": 42},
+ { "flags": 4, "matrix": [2, 3], "x": 61, "y": 42},
+ { "flags": 4, "matrix": [2, 4], "x": 81, "y": 42},
+ { "flags": 4, "matrix": [2, 5], "x": 102, "y": 42},
+ { "flags": 4, "matrix": [2, 6], "x": 122, "y": 42},
+ { "flags": 4, "matrix": [2, 7], "x": 143, "y": 42},
+ { "flags": 4, "matrix": [2, 8], "x": 163, "y": 42},
+ { "flags": 4, "matrix": [2, 9], "x": 183, "y": 42},
+ { "flags": 4, "matrix": [2, 10], "x": 204, "y": 42},
+ { "flags": 4, "matrix": [2, 11], "x": 224, "y": 42},
+
+ { "flags": 4, "matrix": [3, 0], "x": 0, "y": 64},
+ { "flags": 1, "matrix": [3, 1], "x": 20, "y": 64},
+ { "flags": 4, "matrix": [3, 2], "x": 41, "y": 64},
+ { "flags": 4, "matrix": [3, 3], "x": 61, "y": 64},
+ { "flags": 4, "matrix": [3, 4], "x": 81, "y": 64},
+ { "flags": 4, "matrix": [3, 5], "x": 102, "y": 64},
+ { "flags": 4, "matrix": [3, 7], "x": 143, "y": 64},
+ { "flags": 4, "matrix": [3, 8], "x": 163, "y": 64},
+ { "flags": 4, "matrix": [3, 9], "x": 183, "y": 64},
+ { "flags": 4, "matrix": [3, 10], "x": 204, "y": 64},
+ { "flags": 4, "matrix": [3, 11], "x": 224, "y": 64}
+ ]
+ },
+ "diode_direction": "ROW2COL",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "Esc", "matrix": [0, 0],"x": 0, "y": 0 },
+ { "label": "Q", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "W", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "E", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "R", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "T", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "Y", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "U", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "I", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "O", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": "P", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "BackSpace", "matrix": [0, 11], "x": 11, "y": 0 },
+
+ { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "A", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "S", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "D", "matrix": [1, 3], "x": 3, "y": 1 },
+ { "label": "F", "matrix": [1, 4], "x": 4, "y": 1 },
+ { "label": "G", "matrix": [1, 5], "x": 5, "y": 1 },
+ { "label": "H", "matrix": [1, 6], "x": 6, "y": 1 },
+ { "label": "J", "matrix": [1, 7], "x": 7, "y": 1 },
+ { "label": "K", "matrix": [1, 8], "x": 8, "y": 1 },
+ { "label": "L", "matrix": [1, 9], "x": 9, "y": 1 },
+ { "label": ":", "matrix": [1, 10], "x": 10, "y": 1 },
+ { "label": "Enter", "matrix": [1, 11], "x": 11, "y": 1 },
+
+ { "label": "Shift", "matrix": [2, 0], "x": 0, "y": 2 },
+ { "label": "Z", "matrix": [2, 1], "x": 1, "y": 2 },
+ { "label": "X", "matrix": [2, 2], "x": 2, "y": 2 },
+ { "label": "C", "matrix": [2, 3], "x": 3, "y": 2 },
+ { "label": "V", "matrix": [2, 4], "x": 4, "y": 2 },
+ { "label": "B", "matrix": [2, 5], "x": 5, "y": 2 },
+ { "label": "N", "matrix": [2, 6], "x": 6, "y": 2 },
+ { "label": "M", "matrix": [2, 7], "x": 7, "y": 2 },
+ { "label": "<", "matrix": [2, 8], "x": 8, "y": 2 },
+ { "label": ">", "matrix": [2, 9], "x": 9, "y": 2 },
+ { "label": "Up", "matrix": [2, 10], "x": 10, "y": 2 },
+ { "label": "?", "matrix": [2, 11], "x": 11, "y": 2 },
+
+ { "label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3 },
+ { "label": "Win", "matrix": [3, 1],"x": 1, "y": 3 },
+ { "label": "Alt", "matrix": [3, 2],"x": 2, "y": 3 },
+ { "label": "Hyper", "matrix": [3, 3], "x": 3, "y": 3 },
+ { "label": "Lower", "matrix": [3, 4], "x": 4, "y": 3 },
+ { "label": "Space", "matrix": [3, 5], "w": 2, "x": 5, "y": 3 },
+ { "label": "Ralse", "matrix": [3, 7], "x": 7, "y": 3 },
+ { "label": "Fn", "matrix": [3, 8], "x": 8, "y": 3 },
+ { "label": "Left", "matrix": [3, 9], "x": 9, "y": 3 },
+ { "label": "Down", "matrix": [3, 10], "x": 10, "y": 3 },
+ { "label": "Right", "matrix": [3, 11], "x": 11, "y": 3 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/inland/mk47/keymaps/default/keymap.c b/keyboards/inland/mk47/keymaps/default/keymap.c
new file mode 100644
index 000000000000..f288d4e1feba
--- /dev/null
+++ b/keyboards/inland/mk47/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
+ KC_LCTL, MO(2), KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [1] = LAYOUT(
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RGB_MOD,
+ KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, RGB_VAI, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS),
+
+ [2] = LAYOUT(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_CAPS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
+ KC_LCTL, KC_NO, KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT)
+};
+// clang-format on
+
diff --git a/keyboards/inland/mk47/keymaps/inland/keymap.c b/keyboards/inland/mk47/keymaps/inland/keymap.c
new file mode 100644
index 000000000000..ff5de15c47f3
--- /dev/null
+++ b/keyboards/inland/mk47/keymaps/inland/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
+ KC_LCTL, MO(2), KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [1] = LAYOUT(
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RGB_MOD,
+ RGB_HUI, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSEL, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, RGB_VAI, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI),
+
+ [2] = LAYOUT(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_CAPS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
+ KC_LCTL, KC_NO, KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT)
+};
+// clang-format on
diff --git a/keyboards/inland/mk47/keymaps/inland/rules.mk b/keyboards/inland/mk47/keymaps/inland/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/inland/mk47/keymaps/inland/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/inland/mk47/keymaps/via/keymap.c b/keyboards/inland/mk47/keymaps/via/keymap.c
new file mode 100644
index 000000000000..53cabcc4770e
--- /dev/null
+++ b/keyboards/inland/mk47/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
+ KC_LCTL, MO(2), KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [1] = LAYOUT(
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RGB_MOD,
+ RGB_HUI, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSEL, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, RGB_VAI, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI),
+
+ [2] = LAYOUT(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ KC_CAPS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH,
+ KC_LCTL, KC_NO, KC_LALT, KC_DEL, KC_PGDN, KC_SPC, KC_PGUP, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT)
+};
+// clang-format on
+
diff --git a/keyboards/inland/mk47/keymaps/via/rules.mk b/keyboards/inland/mk47/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/inland/mk47/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/inland/mk47/mcuconf.h b/keyboards/inland/mk47/mcuconf.h
new file mode 100644
index 000000000000..b80eb833d3e2
--- /dev/null
+++ b/keyboards/inland/mk47/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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_next
+
+#undef WB32_I2C_USE_I2C1
+#define WB32_I2C_USE_I2C1 TRUE
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
diff --git a/keyboards/inland/mk47/mk47.c b/keyboards/inland/mk47/mk47.c
new file mode 100644
index 000000000000..f24785594424
--- /dev/null
+++ b/keyboards/inland/mk47/mk47.c
@@ -0,0 +1,92 @@
+/* Copyright (C) 2023 jonylee@hfd
+ *
+ * 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 "quantum.h"
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, D_1, E_1, F_1},
+ {0, D_2, E_2, F_2},
+ {0, D_3, E_3, F_3},
+ {0, D_4, E_4, F_4},
+ {0, D_5, E_5, F_5},
+ {0, D_6, E_6, F_6},
+ {0, D_7, E_7, F_7},
+ {0, D_8, E_8, F_8},
+ {0, D_9, E_9, F_9},
+ {0, D_10, E_10, F_10},
+ {0, D_11, E_11, F_11},
+ {0, D_12, E_12, F_12},
+
+ {0, G_1, H_1, I_1},
+ {0, G_2, H_2, I_2},
+ {0, G_3, H_3, I_3},
+ {0, G_4, H_4, I_4},
+ {0, G_5, H_5, I_5},
+ {0, G_6, H_6, I_6},
+ {0, G_7, H_7, I_7},
+ {0, G_8, H_8, I_8},
+ {0, G_9, H_9, I_9},
+ {0, G_10, H_10, I_10},
+ {0, G_11, H_11, I_11},
+ {0, G_12, H_12, I_12},
+
+ {0, J_1, K_1, L_1},
+ {0, J_2, K_2, L_2},
+ {0, J_3, K_3, L_3},
+ {0, J_4, K_4, L_4},
+ {0, J_5, K_5, L_5},
+ {0, J_6, K_6, L_6},
+ {0, J_7, K_7, L_7},
+ {0, J_8, K_8, L_8},
+ {0, J_9, K_9, L_9},
+ {0, J_10, K_10, L_10},
+ {0, J_11, K_11, L_11},
+ {0, J_12, K_12, L_12},
+
+ {0, J_13, K_13, L_13},
+ {0, J_14, K_14, L_14},
+ {0, J_15, K_15, L_15},
+ {0, J_16, K_16, L_16},
+ {0, D_13, E_13, F_13},
+ {0, D_14, E_14, F_14},
+ {0, D_15, E_15, F_15},
+ {0, G_13, H_13, I_13},
+ {0, G_14, H_14, I_14},
+ {0, G_15, H_15, I_15},
+ {0, G_16, H_16, I_16},
+};
+
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+ if (rgb_matrix_indicators_advanced_user(led_min, led_max) != true) {
+ return false;
+ }
+
+ if (host_keyboard_led_state().caps_lock) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(12, 255, 0, 0);
+ }
+
+ return true;
+}
+#endif
diff --git a/keyboards/inland/mk47/readme.md b/keyboards/inland/mk47/readme.md
new file mode 100644
index 000000000000..55b805678b61
--- /dev/null
+++ b/keyboards/inland/mk47/readme.md
@@ -0,0 +1,24 @@
+# mk47
+
+A customizable 40% keyboard.
+
+* Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986)
+* Hardware Supported: mk47
+* Hardware Availability: [Inland](https://www.microcenter.com/product/661264/inland-47-keys-hot-swappable-rgb-wired-mechanical-keyboard,)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make inland/mk47:default
+
+Flashing example for this keyboard:
+
+ make inland/mk47: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/inland/mk47/rules.mk b/keyboards/inland/mk47/rules.mk
new file mode 100644
index 000000000000..24d5f6f52ecc
--- /dev/null
+++ b/keyboards/inland/mk47/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json b/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
index b166c6771fff..2bd5581ac767 100644
--- a/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
+++ b/keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "jacky_studio/piggy60",
+ "keyboard": "jacky_studio/piggy60/rev1/solder",
"keymap": "via",
"layout": "LAYOUT_all",
"layers": [
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h
new file mode 100644
index 000000000000..0fa53c2d6786
--- /dev/null
+++ b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2023 @PoweredByPorridge
+ *
+ * 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 AUTO_SHIFT_TIMEOUT 210
+
+#define NO_AUTO_SHIFT_NUMERIC
+// #define NO_AUTO_SHIFT_SPECIAL
+
+// retro shift is auto shift on home row mods
+// I no longer use home row mods, but do find this setting helps
+// avoid 'fat fingered' keypresses.
+
+// If RETRO_SHIFT is defined to a value, hold times greater
+// than that value will not produce a tap on release. This enables
+// modifiers to be held for combining with mouse clicks without
+// generating taps on release.
+#define RETRO_SHIFT 425
+
+// can also be defined without a value
+// #define RETRO_SHIFT
+
+// Configure the global tapping term (default: 200ms)
+// Lower than 210 and I can't tap dance brackets without a run up.
+#define TAPPING_TERM 210
+
+#define TAPPING_TERM_PER_KEY
+
+// Apply the modifier on keys that are tapped during a short hold of a modtap
+// Prevents slurred typing (of home row mods)
+#define PERMISSIVE_HOLD
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c
new file mode 100644
index 000000000000..40c8b0b5aadf
--- /dev/null
+++ b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c
@@ -0,0 +1,224 @@
+/* Copyright 2023 @PoweredByPorridge
+ *
+ * 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
+
+// Tap Dance keycodes
+enum td_keycodes {
+ L_BRAX, // Used in the keymap, add additional keycodes for each tapdance.
+ R_BRAX,
+ QUOTS,
+ TACHE
+};
+
+// Define a type containing as many tapdance states as you need
+typedef enum {
+ SINGLE_TAP,
+ DOUBLE_TAP, // SINGLE_HOLD,
+ TRIPLE_TAP // DOUBLE_SINGLE_TAP
+} td_state_t;
+
+// Create a global instance of the tapdance state type
+static td_state_t td_state;
+
+// Declare your tapdance functions:
+
+// Function to determine the current tapdance state
+uint8_t cur_dance(tap_dance_state_t *state);
+
+// `finished` and `reset` functions for each tapdance keycode
+void lbrax_finished(tap_dance_state_t *state, void *user_data);
+void lbrax_reset(tap_dance_state_t *state, void *user_data);
+
+void rbrax_finished(tap_dance_state_t *state, void *user_data);
+void rbrax_reset(tap_dance_state_t *state, void *user_data);
+
+void quots_finished(tap_dance_state_t *state, void *user_data);
+void quots_reset(tap_dance_state_t *state, void *user_data);
+
+void tache_finished(tap_dance_state_t *state, void *user_data);
+void tache_reset(tap_dance_state_t *state, void *user_data);
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
+ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NUBS, KC_SLSH, KC_N, KC_M, KC_COMM, KC_DOT, KC_ENT,
+ LCTL_T(KC_ESC), KC_LALT, KC_LGUI, KC_LSFT, MO(1), KC_SPC, KC_SPC, MO(2), TD(QUOTS), KC_RSFT, KC_LALT, LCTL_T(KC_TAB)),
+
+ [1] = LAYOUT(KC_EXLM, KC_DQUO, LSFT(KC_3), KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_DEL, KC_BSPC,
+ KC_F24, LALT(KC_F3), KC_NO, KC_NO, TD(L_BRAX), TD(R_BRAX), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+ LCTL(KC_F12), LALT(KC_X), KC_NO, KC_NO, KC_NO, TD(QUOTS), TD(TACHE), KC_MINS, KC_EQL, KC_COMM, KC_DOT, KC_ENT,
+ KC_TRNS, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LSFT(KC_TAB)),
+
+ [2] = LAYOUT(KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+ KC_NO, LALT(KC_F3), KC_NO, KC_NO, TD(L_BRAX), TD(R_BRAX), KC_HOME, KC_PGDN, KC_PGUP, KC_END,
+ LCTL(KC_F12), LALT(KC_X), KC_NO, KC_NO, KC_NO, TD(QUOTS), TD(TACHE), KC_MINS, KC_EQL, KC_COMM, KC_DOT, KC_NO,
+ KC_TRNS, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_TRNS),
+
+ [3] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ AS_TOGG, KC_F24, KC_NO, KC_NO, KC_NO, KC_NO, LSA(KC_LEFT), LSA(KC_DOWN), LSA(KC_UP), LSA(KC_RGHT),
+ KC_LCTL, LALT(KC_DEL),KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLU, KC_NO, KC_F12, KC_F13, KC_F14, KC_NO,
+ KC_TRNS, KC_F23, KC_LCTL, KC_NO, KC_TRNS, KC_NO, KC_VOLD, KC_MPLY, KC_LSFT, KC_NO, KC_NO, KC_TRNS)
+};
+
+/*
+Notes on keys
+or, why on earth do I have keymap
+lower-shift-z is CTRL-F12 - Darkroom mode in emacs
+lower-x is ALT-X - emacs
+layer3-a is toggle autoshift
+layer3-s is F24 - i3 controls popup reminder
+lower-s is ALT-F3 - multi-select in Sublime text
+*/
+
+
+// Determine the tapdance state to return
+uint8_t cur_dance(tap_dance_state_t *state) {
+ if (state->count == 1) {
+ return SINGLE_TAP;
+ } else if (state->count == 2) {
+ return DOUBLE_TAP;
+ } else if (state->count == 3) {
+ return TRIPLE_TAP;
+ } else {
+ reset_tap_dance (state);
+ return 3;
+ }
+}
+
+
+// Handle the possible states for each tapdance keycode you define:
+
+void lbrax_finished(tap_dance_state_t *state, void *user_data) {
+ td_state = cur_dance(state);
+ switch (td_state) {
+ case SINGLE_TAP:
+ register_code16(LSFT(KC_9));
+ break;
+ case DOUBLE_TAP:
+ register_code16(KC_LBRC);
+ break;
+ case TRIPLE_TAP:
+ register_code16(LSFT(KC_LBRC));
+ }
+}
+
+void lbrax_reset(tap_dance_state_t *state, void *user_data) {
+ switch (td_state) {
+ case SINGLE_TAP:
+ unregister_code16(LSFT(KC_9));
+ break;
+ case DOUBLE_TAP:
+ unregister_code16(KC_LBRC);
+ break;
+ case TRIPLE_TAP:
+ unregister_code16(LSFT(KC_LBRC));
+ }
+}
+
+// Handle the possible states for each tapdance keycode you define:
+
+void rbrax_finished(tap_dance_state_t *state, void *user_data) {
+ td_state = cur_dance(state);
+ switch (td_state) {
+ case SINGLE_TAP:
+ register_code16(LSFT(KC_0));
+ break;
+ case DOUBLE_TAP:
+ register_code16(KC_RBRC);
+ break;
+ case TRIPLE_TAP:
+ register_code16(LSFT(KC_RBRC));
+ }
+}
+
+
+void rbrax_reset(tap_dance_state_t *state, void *user_data) {
+ switch (td_state) {
+ case SINGLE_TAP:
+ unregister_code16(LSFT(KC_0));
+ break;
+ case DOUBLE_TAP:
+ unregister_code16(KC_RBRC);
+ break;
+ case TRIPLE_TAP:
+ unregister_code16(LSFT(KC_RBRC));
+ }
+}
+
+void quots_finished(tap_dance_state_t *state, void *user_data) {
+ td_state = cur_dance(state);
+ switch (td_state) {
+ case SINGLE_TAP:
+ register_code16(KC_QUOT);
+ break;
+ case DOUBLE_TAP:
+ register_code16(KC_AT);
+ break;
+ case TRIPLE_TAP:
+ register_code16(KC_DQUO);
+ }
+}
+
+void quots_reset(tap_dance_state_t *state, void *user_data) {
+ switch (td_state) {
+ case SINGLE_TAP:
+ unregister_code16(KC_QUOT);
+ break;
+ case DOUBLE_TAP:
+ unregister_code16(KC_AT);
+ break;
+ case TRIPLE_TAP:
+ unregister_code16(KC_DQUO);
+ }
+}
+
+void tache_finished(tap_dance_state_t *state, void *user_data) {
+ td_state = cur_dance(state);
+ switch (td_state) {
+ case SINGLE_TAP:
+ register_code16(KC_NUHS);
+ break;
+ case DOUBLE_TAP:
+
+ register_code16(LSFT(KC_NUHS));
+ break;
+ case TRIPLE_TAP:
+ register_code16(KC_GRV);
+ }
+}
+
+void tache_reset(tap_dance_state_t *state, void *user_data) {
+ switch (td_state) {
+ case SINGLE_TAP:
+ unregister_code16(KC_NUHS);
+ break;
+ case DOUBLE_TAP:
+ unregister_code16(LSFT(KC_NUHS));
+ break;
+ case TRIPLE_TAP:
+ unregister_code16(KC_GRV);
+ }
+}
+
+// Define `ACTION_TAP_DANCE_FN_ADVANCED()` for each tapdance keycode, passing in `finished` and `reset` functions
+
+tap_dance_action_t tap_dance_actions[] = {
+ [L_BRAX] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lbrax_finished, lbrax_reset),
+ [R_BRAX] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rbrax_finished, rbrax_reset),
+ [QUOTS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, quots_finished, quots_reset),
+ [TACHE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tache_finished, tache_reset)
+};
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md
new file mode 100644
index 000000000000..619654186deb
--- /dev/null
+++ b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md
@@ -0,0 +1,35 @@
+# Keyboardio Atreus with an SLF layout from PoweredByPorridge
+
+SLF stands for [Stiff Little Fingers](https://en.wikipedia.org/wiki/Stiff_Little_Fingers) who were a great punk band from Belfast, Northern Ireland. Stiff Little Fingers is also a good way of describing my hands, a condition which I ascribe to too many winters cycling without gloves. So, I need a keyboard and layout to cope.
+
+I use a Keyboardio Atreus, in fact, they're so good, I use two. I tried all sorts of layouts, and finally came up with the one that suits my stiff fingers.
+
+It has four layers:
+
+0 - Normal - letters and punctuation.
+
+
+
+1 - Symbols (shifted numbers), arrow keys, assorted function keys, Del and Backspace.
+
+
+
+2 - Numbers, page up, page down, home, and end. Similar assorted functions.
+
+
+
+3 - F1 to F14, play/pause, volume up/down, Left-shift-Alt left, right, up, down.
+
+
+
+Autoshift is important, I use it all the time.
+
+I use tap dance (one, two, or three key presses) for:
+
+* Braces, brackets, and curly brackets. TD(L_BRAX) and TD(R_BRAX)
+* Hash (pound), tilde, and backtick. TD(TACHE)
+* Single quote, double quote, and @. TD(QUOTS)
+
+There are odd keys that are there for a particular reason:
+* F24 - my [I3](https://i3wm.org/) popup to remind me of stuff I always forget.
+* Alt-shift-left/right/up/down - multi-select in Sublime text.
\ No newline at end of file
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk
new file mode 100644
index 000000000000..3285414f97d2
--- /dev/null
+++ b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk
@@ -0,0 +1,7 @@
+BOOTMAGIC_ENABLE = no
+MOUSEKEY_ENABLE = no
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
+UNICODE_ENABLE = no
+AUTO_SHIFT_ENABLE = yes
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/linworks/favepada/config.h b/keyboards/linworks/favepada/config.h
new file mode 100644
index 000000000000..bee089bb436b
--- /dev/null
+++ b/keyboards/linworks/favepada/config.h
@@ -0,0 +1,11 @@
+// Copyright 2023 ziptyze (@ziptyze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Define RGB */
+#define RGB_MATRIX_LED_COUNT 37
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
diff --git a/keyboards/linworks/favepada/info.json b/keyboards/linworks/favepada/info.json
new file mode 100644
index 000000000000..f80e3802d552
--- /dev/null
+++ b/keyboards/linworks/favepada/info.json
@@ -0,0 +1,140 @@
+{
+ "manufacturer": "Lx3",
+ "keyboard_name": "favepada",
+ "maintainer": "keydler",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ },
+ "matrix_pins": {
+ "cols": ["A14", "A15", "B3", "B4"],
+ "rows": ["A9", "A8", "B15", "B14", "B13", "B12"]
+ },
+ "processor": "STM32F072",
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "driver": "WS2812",
+ "layout": [
+ { "flags": 1, "matrix": [5, 2], "x": 149, "y": 59 },
+ { "flags": 1, "matrix": [5, 0], "x": 0, "y": 59 },
+ { "flags": 1, "matrix": [4, 0], "x": 0, "y": 51 },
+ { "flags": 1, "matrix": [4, 1], "x": 74, "y": 51 },
+ { "flags": 1, "matrix": [4, 2], "x": 149, "y": 51 },
+ { "flags": 1, "matrix": [4, 3], "x": 224, "y": 51 },
+ { "flags": 1, "matrix": [3, 2], "x": 149, "y": 38 },
+ { "flags": 1, "matrix": [3, 1], "x": 74, "y": 38 },
+ { "flags": 1, "matrix": [3, 0], "x": 0, "y": 38 },
+ { "flags": 1, "matrix": [2, 0], "x": 0, "y": 26 },
+ { "flags": 1, "matrix": [2, 1], "x": 74, "y": 26 },
+ { "flags": 1, "matrix": [2, 2], "x": 149, "y": 26 },
+ { "flags": 1, "matrix": [2, 3], "x": 224, "y": 26 },
+ { "flags": 1, "matrix": [1, 3], "x": 224, "y": 13 },
+ { "flags": 1, "matrix": [1, 2], "x": 149, "y": 13 },
+ { "flags": 1, "matrix": [1, 1], "x": 74, "y": 13 },
+ { "flags": 9, "matrix": [1, 0], "x": 0, "y": 13 },
+ { "flags": 2, "matrix": [0, 0], "x": 0, "y": 0 },
+ { "flags": 2, "matrix": [0, 1], "x": 74, "y": 0 },
+ { "flags": 2, "matrix": [0, 2], "x": 149, "y": 0 },
+ { "flags": 2, "matrix": [0, 3], "x": 224, "y": 0 },
+ { "flags": 4, "x": 224, "y": 5 },
+ { "flags": 4, "x": 149, "y": 5 },
+ { "flags": 4, "x": 74, "y": 5 },
+ { "flags": 4, "x": 0, "y": 5 },
+ { "flags": 4, "x": 0, "y": 18 },
+ { "flags": 4, "x": 0, "y": 31 },
+ { "flags": 4, "x": 0, "y": 43 },
+ { "flags": 4, "x": 0, "y": 56 },
+ { "flags": 4, "x": 0, "y": 64 },
+ { "flags": 4, "x": 74, "y": 64 },
+ { "flags": 4, "x": 149, "y": 64 },
+ { "flags": 4, "x": 224, "y": 64 },
+ { "flags": 4, "x": 224, "y": 56 },
+ { "flags": 4, "x": 224, "y": 43 },
+ { "flags": 4, "x": 224, "y": 31 },
+ { "flags": 4, "x": 224, "y": 18 }
+ ],
+ "max_brightness": 120
+ },
+ "ws2812": {
+ "pin": "B1"
+ },
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x000B",
+ "vid": "0x4C58"
+ },
+ "community_layouts": ["numpad_6x4"],
+ "layouts": {
+ "LAYOUT_numpad_6x4": {
+ "layout": [
+ { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "Num Lock", "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "label": "/", "matrix": [1, 1], "x": 1, "y": 1.25 },
+ { "label": "*", "matrix": [1, 2], "x": 2, "y": 1.25 },
+ { "label": "-", "matrix": [1, 3], "x": 3, "y": 1.25 },
+ { "label": "7", "matrix": [2, 0], "x": 0, "y": 2.25 },
+ { "label": "8", "matrix": [2, 1], "x": 1, "y": 2.25 },
+ { "label": "9", "matrix": [2, 2], "x": 2, "y": 2.25 },
+ { "label": "4", "matrix": [3, 0], "x": 0, "y": 3.25 },
+ { "label": "5", "matrix": [3, 1], "x": 1, "y": 3.25 },
+ { "label": "6", "matrix": [3, 2], "x": 2, "y": 3.25 },
+ { "h": 2, "label": "+", "matrix": [2, 3], "x": 3, "y": 2.25 },
+ { "label": "1", "matrix": [4, 0], "x": 0, "y": 4.25 },
+ { "label": "2", "matrix": [4, 1], "x": 1, "y": 4.25 },
+ { "label": "3", "matrix": [4, 2], "x": 2, "y": 4.25 },
+ { "label": "0", "matrix": [5, 0], "w": 2, "x": 0, "y": 5.25 },
+ { "label": "Del", "matrix": [5, 2], "x": 2, "y": 5.25 },
+ { "h": 2, "label": "Enter", "matrix": [4, 3], "x": 3, "y": 4.25 }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/linworks/favepada/keymaps/default/keymap.c b/keyboards/linworks/favepada/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e17d76109ab0
--- /dev/null
+++ b/keyboards/linworks/favepada/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 noroadsleft
+ *
+ * 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] = {
+ [0] = LAYOUT_numpad_6x4(
+ MO(1), KC_A, KC_B, KC_C,
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3,
+ KC_P0, KC_PDOT, KC_PENT
+ ),
+ [1] = LAYOUT_numpad_6x4(
+ KC_TRNS, RGB_TOG, RGB_MOD, KC_D,
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3,
+ KC_P0, KC_PDOT, KC_PENT
+ )
+};
diff --git a/keyboards/linworks/favepada/keymaps/via/keymap.c b/keyboards/linworks/favepada/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e98ca5e74176
--- /dev/null
+++ b/keyboards/linworks/favepada/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 noroadsleft
+ *
+ * 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] = {
+ [0] = LAYOUT_numpad_6x4(
+ MO(1), KC_A, KC_B, KC_C,
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3,
+ KC_P0, KC_PDOT, KC_PENT
+ ),
+ [1] = LAYOUT_numpad_6x4(
+ KC_TRNS, RGB_TOG, RGB_MOD, KC_D,
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9,
+ KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_P1, KC_P2, KC_P3,
+ KC_P0, KC_PDOT, KC_PENT
+ )
+};
diff --git a/keyboards/linworks/favepada/keymaps/via/rules.mk b/keyboards/linworks/favepada/keymaps/via/rules.mk
new file mode 100644
index 000000000000..36b7ba9cbc98
--- /dev/null
+++ b/keyboards/linworks/favepada/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/linworks/favepada/readme.md b/keyboards/linworks/favepada/readme.md
new file mode 100644
index 000000000000..7f06ca90ca22
--- /dev/null
+++ b/keyboards/linworks/favepada/readme.md
@@ -0,0 +1,18 @@
+# linworks/favepada
+
+
+
+
+* Keyboard Maintainer: [keydler](https://github.com/duilchoi)
+* Hardware Supported:
+* Hardware Availability: None, feel free to order/manufacture parts yourself.
+
+Make example for this keyboard (after setting up your build environment):
+
+ make linworks/favepada:default
+
+Flashing example for this keyboard:
+
+ make linworks/favepada: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/linworks/favepada/rules.mk b/keyboards/linworks/favepada/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/moondrop/dash75/keymaps/default/keymap.json b/keyboards/moondrop/dash75/keymaps/default/keymap.json
index 67811c18a376..8e2797ebf51c 100644
--- a/keyboards/moondrop/dash75/keymaps/default/keymap.json
+++ b/keyboards/moondrop/dash75/keymaps/default/keymap.json
@@ -1,7 +1,7 @@
{
"version": 1,
"notes": "This file is a keymap.json file for moondrop/dash75",
- "keyboard": "moondrop/dash75",
+ "keyboard": "moondrop/dash75/r1",
"keymap": "default",
"layout": "LAYOUT",
"author": "vinorodrigues",
diff --git a/keyboards/moondrop/dash75/keymaps/via/keymap.json b/keyboards/moondrop/dash75/keymaps/via/keymap.json
index 6d43ee82c80f..d811aaa78034 100644
--- a/keyboards/moondrop/dash75/keymaps/via/keymap.json
+++ b/keyboards/moondrop/dash75/keymaps/via/keymap.json
@@ -1,7 +1,7 @@
{
"version": 1,
"notes": "This file is a keymap.json file for moondrop/dash75",
- "keyboard": "moondrop/dash75",
+ "keyboard": "moondrop/dash75/r1",
"keymap": "via",
"layout": "LAYOUT",
"author": "vinorodrigues",
diff --git a/keyboards/owlab/jelly_evolv/config.h b/keyboards/owlab/jelly_evolv/config.h
new file mode 100644
index 000000000000..95c5ca604837
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/config.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2023 owlab
+ *
+ * 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
+
+/* RGB Strip*/
+# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
+# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.0
+# define RGBLIGHT_EFFECT_BREATHE_MAX 100
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/625u/info.json b/keyboards/owlab/jelly_evolv/hotswap/625u/info.json
new file mode 100644
index 000000000000..ec25908b601e
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/625u/info.json
@@ -0,0 +1,93 @@
+{
+ "keyboard_name": "Jelly Evolv Hotswap_6.25U",
+ "usb": {
+ "pid": "0x3655",
+ "device_version": "0.0.1"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [0, 1], "x":1.5, "y":0},
+ {"matrix": [0, 2], "x":2.5, "y":0},
+ {"matrix": [0, 3], "x":3.5, "y":0},
+ {"matrix": [0, 4], "x":4.5, "y":0},
+ {"matrix": [0, 5], "x":6, "y":0},
+ {"matrix": [0, 6], "x":7, "y":0},
+ {"matrix": [0, 7], "x":8, "y":0},
+ {"matrix": [0, 8], "x":9, "y":0},
+ {"matrix": [0, 9], "x":10.5, "y":0},
+ {"matrix": [0, 10], "x":11.5, "y":0},
+ {"matrix": [0, 11], "x":12.5, "y":0},
+ {"matrix": [0, 12], "x":13.5, "y":0},
+ {"matrix": [0, 14], "x":15, "y":0},
+ {"matrix": [1, 0], "x":0, "y":1.5},
+ {"matrix": [1, 1], "x":1, "y":1.5},
+ {"matrix": [1, 2], "x":2, "y":1.5},
+ {"matrix": [1, 3], "x":3, "y":1.5},
+ {"matrix": [1, 4], "x":4, "y":1.5},
+ {"matrix": [1, 5], "x":5, "y":1.5},
+ {"matrix": [1, 6], "x":6, "y":1.5},
+ {"matrix": [1, 7], "x":7, "y":1.5},
+ {"matrix": [1, 8], "x":8, "y":1.5},
+ {"matrix": [1, 9], "x":9, "y":1.5},
+ {"matrix": [1, 10], "x":10, "y":1.5},
+ {"matrix": [1, 11], "x":11, "y":1.5},
+ {"matrix": [1, 12], "x":12, "y":1.5},
+ {"matrix": [1, 13], "x":13, "y":1.5, "w":2},
+ {"matrix": [1, 14], "x":15, "y":1.5},
+ {"matrix": [2, 0], "x":0, "y":2.5, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.5},
+ {"matrix": [2, 2], "x":2.5, "y":2.5},
+ {"matrix": [2, 3], "x":3.5, "y":2.5},
+ {"matrix": [2, 4], "x":4.5, "y":2.5},
+ {"matrix": [2, 5], "x":5.5, "y":2.5},
+ {"matrix": [2, 6], "x":6.5, "y":2.5},
+ {"matrix": [2, 7], "x":7.5, "y":2.5},
+ {"matrix": [2, 8], "x":8.5, "y":2.5},
+ {"matrix": [2, 9], "x":9.5, "y":2.5},
+ {"matrix": [2, 10], "x":10.5, "y":2.5},
+ {"matrix": [2, 11], "x":11.5, "y":2.5},
+ {"matrix": [2, 12], "x":12.5, "y":2.5},
+ {"matrix": [2, 13], "x":13.5, "y":2.5, "w":1.5},
+ {"matrix": [2, 14], "x":15, "y":2.5},
+ {"matrix": [3, 0], "x":0, "y":3.5, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.5},
+ {"matrix": [3, 2], "x":2.75, "y":3.5},
+ {"matrix": [3, 3], "x":3.75, "y":3.5},
+ {"matrix": [3, 4], "x":4.75, "y":3.5},
+ {"matrix": [3, 5], "x":5.75, "y":3.5},
+ {"matrix": [3, 6], "x":6.75, "y":3.5},
+ {"matrix": [3, 7], "x":7.75, "y":3.5},
+ {"matrix": [3, 8], "x":8.75, "y":3.5},
+ {"matrix": [3, 9], "x":9.75, "y":3.5},
+ {"matrix": [3, 10], "x":10.75, "y":3.5},
+ {"matrix": [3, 11], "x":11.75, "y":3.5},
+ {"matrix": [3, 13], "x":12.75, "y":3.5, "w":2.25},
+ {"matrix": [3, 14], "x":15, "y":3.5},
+ {"matrix": [4, 0], "x":0, "y":4.5, "w":2.25},
+ {"matrix": [4, 1], "x":2.25, "y":4.5},
+ {"matrix": [4, 2], "x":3.25, "y":4.5},
+ {"matrix": [4, 3], "x":4.25, "y":4.5},
+ {"matrix": [4, 4], "x":5.25, "y":4.5},
+ {"matrix": [4, 5], "x":6.25, "y":4.5},
+ {"matrix": [4, 6], "x":7.25, "y":4.5},
+ {"matrix": [4, 7], "x":8.25, "y":4.5},
+ {"matrix": [4, 8], "x":9.25, "y":4.5},
+ {"matrix": [4, 9], "x":10.25, "y":4.5},
+ {"matrix": [4, 10], "x":11.25, "y":4.5},
+ {"matrix": [4, 11], "x":12.25, "y":4.5, "w":1.75},
+ {"matrix": [4, 13], "x":14, "y":4.5},
+ {"matrix": [5, 0], "x":0, "y":5.5, "w":1.25},
+ {"matrix": [5, 1], "x":1.25, "y":5.5, "w":1.25},
+ {"matrix": [5, 2], "x":2.5, "y":5.5, "w":1.25},
+ {"matrix": [5, 5], "x":3.75, "y":5.5, "w":6.25},
+ {"matrix": [5, 9], "x":10, "y":5.5, "w":1.25},
+ {"matrix": [5, 10], "x":11.25, "y":5.5, "w":1.25},
+ {"matrix": [5, 12], "x":13, "y":5.5},
+ {"matrix": [5, 13], "x":14, "y":5.5},
+ {"matrix": [5, 14], "x":15, "y":5.5}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/default/keymap.c b/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/default/keymap.c
new file mode 100644
index 000000000000..27e63d44fc91
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 owlab
+ *
+ * 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] = {
+ [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_PSCR,
+ 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_DEL,
+ 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_PGUP,
+ 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_PGDN,
+ 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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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
+ )
+};
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/via/keymap.c b/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/via/keymap.c
new file mode 100644
index 000000000000..27e63d44fc91
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 owlab
+ *
+ * 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] = {
+ [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_PSCR,
+ 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_DEL,
+ 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_PGUP,
+ 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_PGDN,
+ 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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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
+ )
+};
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/via/rules.mk b/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/625u/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/625u/readme.md b/keyboards/owlab/jelly_evolv/hotswap/625u/readme.md
new file mode 100644
index 000000000000..9bbd09d2cd91
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/625u/readme.md
@@ -0,0 +1,21 @@
+# Jelly Evolv - Hotswap 6.25U PCB
+
+
+
+A 75% made by Owlab.
+
+* Keyboard Maintainer: [owlab](https://github.com/lizhenmingdirk)
+* Hardware Supported: Jelly Evolv Hotswap 6.25U PCB
+* Hardware Availability: Ended groupbuy: https://www.zfrontier.com/app/flow/W58MLYOGdVVQ
+
+Make example for this keyboard (after setting up your build environment):
+
+ make owlab/jelly_evolv/hotswap/625u:default
+
+Flashing example for this keyboard:
+
+ make owlab/jelly_evolv/hotswap/625u:default:flash
+
+**Bootloader:** Press the button B of the PCB while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/625u/rules.mk b/keyboards/owlab/jelly_evolv/hotswap/625u/rules.mk
new file mode 100644
index 000000000000..dfd7b8e20848
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/625u/rules.mk
@@ -0,0 +1,5 @@
+MCU_LDSCRIPT = STM32F103x8_0x08006000_bootloader
+DFU_ARGS = -d 1688:2220 -a 0 -s 0x08006000
+DFU_SUFFIX_ARGS = -v 1688 -p 2220
+BOOTLOADER_TYPE = stm32duino
+OPT_DEFS += -DBOOTLOADER_STM32DUINO
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/7u/info.json b/keyboards/owlab/jelly_evolv/hotswap/7u/info.json
new file mode 100644
index 000000000000..dc62266add22
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/7u/info.json
@@ -0,0 +1,92 @@
+{
+ "keyboard_name": "Jelly Evolv Hotswap_7U",
+ "usb": {
+ "pid": "0x3755",
+ "device_version": "0.0.1"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [0, 1], "x":1.5, "y":0},
+ {"matrix": [0, 2], "x":2.5, "y":0},
+ {"matrix": [0, 3], "x":3.5, "y":0},
+ {"matrix": [0, 4], "x":4.5, "y":0},
+ {"matrix": [0, 5], "x":6, "y":0},
+ {"matrix": [0, 6], "x":7, "y":0},
+ {"matrix": [0, 7], "x":8, "y":0},
+ {"matrix": [0, 8], "x":9, "y":0},
+ {"matrix": [0, 9], "x":10.5, "y":0},
+ {"matrix": [0, 10], "x":11.5, "y":0},
+ {"matrix": [0, 11], "x":12.5, "y":0},
+ {"matrix": [0, 12], "x":13.5, "y":0},
+ {"matrix": [0, 14], "x":15, "y":0},
+ {"matrix": [1, 0], "x":0, "y":1.5},
+ {"matrix": [1, 1], "x":1, "y":1.5},
+ {"matrix": [1, 2], "x":2, "y":1.5},
+ {"matrix": [1, 3], "x":3, "y":1.5},
+ {"matrix": [1, 4], "x":4, "y":1.5},
+ {"matrix": [1, 5], "x":5, "y":1.5},
+ {"matrix": [1, 6], "x":6, "y":1.5},
+ {"matrix": [1, 7], "x":7, "y":1.5},
+ {"matrix": [1, 8], "x":8, "y":1.5},
+ {"matrix": [1, 9], "x":9, "y":1.5},
+ {"matrix": [1, 10], "x":10, "y":1.5},
+ {"matrix": [1, 11], "x":11, "y":1.5},
+ {"matrix": [1, 12], "x":12, "y":1.5},
+ {"matrix": [1, 13], "x":13, "y":1.5, "w":2},
+ {"matrix": [1, 14], "x":15, "y":1.5},
+ {"matrix": [2, 0], "x":0, "y":2.5, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.5},
+ {"matrix": [2, 2], "x":2.5, "y":2.5},
+ {"matrix": [2, 3], "x":3.5, "y":2.5},
+ {"matrix": [2, 4], "x":4.5, "y":2.5},
+ {"matrix": [2, 5], "x":5.5, "y":2.5},
+ {"matrix": [2, 6], "x":6.5, "y":2.5},
+ {"matrix": [2, 7], "x":7.5, "y":2.5},
+ {"matrix": [2, 8], "x":8.5, "y":2.5},
+ {"matrix": [2, 9], "x":9.5, "y":2.5},
+ {"matrix": [2, 10], "x":10.5, "y":2.5},
+ {"matrix": [2, 11], "x":11.5, "y":2.5},
+ {"matrix": [2, 12], "x":12.5, "y":2.5},
+ {"matrix": [2, 13], "x":13.5, "y":2.5, "w":1.5},
+ {"matrix": [2, 14], "x":15, "y":2.5},
+ {"matrix": [3, 0], "x":0, "y":3.5, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.5},
+ {"matrix": [3, 2], "x":2.75, "y":3.5},
+ {"matrix": [3, 3], "x":3.75, "y":3.5},
+ {"matrix": [3, 4], "x":4.75, "y":3.5},
+ {"matrix": [3, 5], "x":5.75, "y":3.5},
+ {"matrix": [3, 6], "x":6.75, "y":3.5},
+ {"matrix": [3, 7], "x":7.75, "y":3.5},
+ {"matrix": [3, 8], "x":8.75, "y":3.5},
+ {"matrix": [3, 9], "x":9.75, "y":3.5},
+ {"matrix": [3, 10], "x":10.75, "y":3.5},
+ {"matrix": [3, 11], "x":11.75, "y":3.5},
+ {"matrix": [3, 13], "x":12.75, "y":3.5, "w":2.25},
+ {"matrix": [3, 14], "x":15, "y":3.5},
+ {"matrix": [4, 0], "x":0, "y":4.5, "w":2.25},
+ {"matrix": [4, 1], "x":2.25, "y":4.5},
+ {"matrix": [4, 2], "x":3.25, "y":4.5},
+ {"matrix": [4, 3], "x":4.25, "y":4.5},
+ {"matrix": [4, 4], "x":5.25, "y":4.5},
+ {"matrix": [4, 5], "x":6.25, "y":4.5},
+ {"matrix": [4, 6], "x":7.25, "y":4.5},
+ {"matrix": [4, 7], "x":8.25, "y":4.5},
+ {"matrix": [4, 8], "x":9.25, "y":4.5},
+ {"matrix": [4, 9], "x":10.25, "y":4.5},
+ {"matrix": [4, 10], "x":11.25, "y":4.5},
+ {"matrix": [4, 11], "x":12.25, "y":4.5, "w":1.75},
+ {"matrix": [4, 13], "x":14, "y":4.5},
+ {"matrix": [5, 0], "x":0, "y":5.5, "w":1.5},
+ {"matrix": [5, 1], "x":1.5, "y":5.5, "w":1.5},
+ {"matrix": [5, 2], "x":3.5, "y":5.5},
+ {"matrix": [5, 5], "x":4.5, "y":5.5, "w":7},
+ {"matrix": [5, 10], "x":11.5, "y":5.5},
+ {"matrix": [5, 12], "x":13, "y":5.5},
+ {"matrix": [5, 13], "x":14, "y":5.5},
+ {"matrix": [5, 14], "x":15, "y":5.5}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/default/keymap.c b/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/default/keymap.c
new file mode 100644
index 000000000000..1cf53b1fe509
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 owlab
+ *
+ * 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] = {
+ [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_PSCR,
+ 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_DEL,
+ 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_PGUP,
+ 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_PGDN,
+ 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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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
+ )
+};
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/via/keymap.c b/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/via/keymap.c
new file mode 100644
index 000000000000..1cf53b1fe509
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 owlab
+ *
+ * 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] = {
+ [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_PSCR,
+ 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_DEL,
+ 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_PGUP,
+ 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_PGDN,
+ 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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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
+ )
+};
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/via/rules.mk b/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/7u/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/7u/readme.md b/keyboards/owlab/jelly_evolv/hotswap/7u/readme.md
new file mode 100644
index 000000000000..31615a8486c2
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/7u/readme.md
@@ -0,0 +1,21 @@
+# Jelly Evolv - Hotswap 7U PCB
+
+
+
+A 75% made by Owlab.
+
+* Keyboard Maintainer: [owlab](https://github.com/lizhenmingdirk)
+* Hardware Supported: Jelly Evolv Hotswap 7U PCB
+* Hardware Availability: Ended groupbuy: https://www.zfrontier.com/app/flow/W58MLYOGdVVQ
+
+Make example for this keyboard (after setting up your build environment):
+
+ make owlab/jelly_evolv/hotswap/7u:default
+
+Flashing example for this keyboard:
+
+ make owlab/jelly_evolv/hotswap/7u:default:flash
+
+**Bootloader:** Press the button B of the PCB while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/hotswap/7u/rules.mk b/keyboards/owlab/jelly_evolv/hotswap/7u/rules.mk
new file mode 100644
index 000000000000..dfd7b8e20848
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/hotswap/7u/rules.mk
@@ -0,0 +1,5 @@
+MCU_LDSCRIPT = STM32F103x8_0x08006000_bootloader
+DFU_ARGS = -d 1688:2220 -a 0 -s 0x08006000
+DFU_SUFFIX_ARGS = -v 1688 -p 2220
+BOOTLOADER_TYPE = stm32duino
+OPT_DEFS += -DBOOTLOADER_STM32DUINO
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/info.json b/keyboards/owlab/jelly_evolv/info.json
new file mode 100644
index 000000000000..999bcca477dc
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/info.json
@@ -0,0 +1,44 @@
+{
+ "manufacturer": "OwLab",
+ "url": "",
+ "maintainer": "Owlab",
+ "usb": {
+ "vid": "0x4F53"
+ },
+ "matrix_pins": {
+ "cols": ["A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A15", "B4"],
+ "rows": ["A1", "A2", "A3", "A5", "A4", "A6"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "pin": "B3"
+ },
+ "indicators": {
+ "caps_lock": "A0",
+ "on_state": 0
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "processor": "STM32F103",
+ "board": "STM32_F103_STM32DUINO",
+ "rgblight": {
+ "animations": {
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "static_gradient": true
+ },
+ "brightness_steps": 10,
+ "led_count": 123,
+ "max_brightness": 100,
+ "saturation_steps": 8
+ }
+}
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/ld/STM32F103x8_0x08006000_bootloader.ld b/keyboards/owlab/jelly_evolv/ld/STM32F103x8_0x08006000_bootloader.ld
new file mode 100644
index 000000000000..a40e12668aa0
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/ld/STM32F103x8_0x08006000_bootloader.ld
@@ -0,0 +1,89 @@
+/*
+ ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+/*
+ * STM32F103x8 memory setup for use with the STM32Duino bootloader.
+ */
+f103_flash_size = 128k;
+
+MEMORY
+{
+ /*Here we give 22K flash to bootloader*/
+ /*0x08005800 : the application bin start address*/
+ flash0 : org = 0x08006000, len = f103_flash_size - 0x6000
+ flash1 : org = 0x00000000, len = 0
+ flash2 : org = 0x00000000, len = 0
+ flash3 : org = 0x00000000, len = 0
+ flash4 : org = 0x00000000, len = 0
+ flash5 : org = 0x00000000, len = 0
+ flash6 : org = 0x00000000, len = 0
+ flash7 : org = 0x00000000, len = 0
+ ram0 : org = 0x20000000, len = 20k
+ ram1 : org = 0x00000000, len = 0
+ ram2 : org = 0x00000000, len = 0
+ ram3 : org = 0x00000000, len = 0
+ ram4 : org = 0x00000000, len = 0
+ ram5 : org = 0x00000000, len = 0
+ ram6 : org = 0x00000000, len = 0
+ ram7 : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+ and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+ of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+ the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/solder/info.json b/keyboards/owlab/jelly_evolv/solder/info.json
new file mode 100644
index 000000000000..1c31904ecf51
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/solder/info.json
@@ -0,0 +1,95 @@
+{
+ "keyboard_name": "Jelly Evolv Solder",
+ "usb": {
+ "pid": "0x4A56",
+ "device_version": "0.0.1"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [0, 1], "x":1.5, "y":0},
+ {"matrix": [0, 2], "x":2.5, "y":0},
+ {"matrix": [0, 3], "x":3.5, "y":0},
+ {"matrix": [0, 4], "x":4.5, "y":0},
+ {"matrix": [0, 5], "x":6, "y":0},
+ {"matrix": [0, 6], "x":7, "y":0},
+ {"matrix": [0, 7], "x":8, "y":0},
+ {"matrix": [0, 8], "x":9, "y":0},
+ {"matrix": [0, 9], "x":10.5, "y":0},
+ {"matrix": [0, 10], "x":11.5, "y":0},
+ {"matrix": [0, 11], "x":12.5, "y":0},
+ {"matrix": [0, 12], "x":13.5, "y":0},
+ {"matrix": [0, 14], "x":15, "y":0},
+ {"matrix": [1, 0], "x":0, "y":1.5},
+ {"matrix": [1, 1], "x":1, "y":1.5},
+ {"matrix": [1, 2], "x":2, "y":1.5},
+ {"matrix": [1, 3], "x":3, "y":1.5},
+ {"matrix": [1, 4], "x":4, "y":1.5},
+ {"matrix": [1, 5], "x":5, "y":1.5},
+ {"matrix": [1, 6], "x":6, "y":1.5},
+ {"matrix": [1, 7], "x":7, "y":1.5},
+ {"matrix": [1, 8], "x":8, "y":1.5},
+ {"matrix": [1, 9], "x":9, "y":1.5},
+ {"matrix": [1, 10], "x":10, "y":1.5},
+ {"matrix": [1, 11], "x":11, "y":1.5},
+ {"matrix": [1, 12], "x":12, "y":1.5},
+ {"matrix": [2, 13], "x":13, "y":1.5},
+ {"matrix": [1, 13], "x":14, "y":1.5},
+ {"matrix": [1, 14], "x":15, "y":1.5},
+ {"matrix": [2, 0], "x":0, "y":2.5, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.5},
+ {"matrix": [2, 2], "x":2.5, "y":2.5},
+ {"matrix": [2, 3], "x":3.5, "y":2.5},
+ {"matrix": [2, 4], "x":4.5, "y":2.5},
+ {"matrix": [2, 5], "x":5.5, "y":2.5},
+ {"matrix": [2, 6], "x":6.5, "y":2.5},
+ {"matrix": [2, 7], "x":7.5, "y":2.5},
+ {"matrix": [2, 8], "x":8.5, "y":2.5},
+ {"matrix": [2, 9], "x":9.5, "y":2.5},
+ {"matrix": [2, 10], "x":10.5, "y":2.5},
+ {"matrix": [2, 11], "x":11.5, "y":2.5},
+ {"matrix": [2, 12], "x":12.5, "y":2.5},
+ {"matrix": [3, 12], "x":13.5, "y":2.5, "w":1.5},
+ {"matrix": [2, 14], "x":15, "y":2.5},
+ {"matrix": [3, 0], "x":0, "y":3.5, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.5},
+ {"matrix": [3, 2], "x":2.75, "y":3.5},
+ {"matrix": [3, 3], "x":3.75, "y":3.5},
+ {"matrix": [3, 4], "x":4.75, "y":3.5},
+ {"matrix": [3, 5], "x":5.75, "y":3.5},
+ {"matrix": [3, 6], "x":6.75, "y":3.5},
+ {"matrix": [3, 7], "x":7.75, "y":3.5},
+ {"matrix": [3, 8], "x":8.75, "y":3.5},
+ {"matrix": [3, 9], "x":9.75, "y":3.5},
+ {"matrix": [3, 10], "x":10.75, "y":3.5},
+ {"matrix": [3, 11], "x":11.75, "y":3.5},
+ {"matrix": [3, 13], "x":12.75, "y":3.5, "w":2.25},
+ {"matrix": [3, 14], "x":15, "y":3.5},
+ {"matrix": [4, 0], "x":0, "y":4.5, "w":1.25},
+ {"matrix": [5, 3], "x":1.25, "y":4.5},
+ {"matrix": [4, 1], "x":2.25, "y":4.5},
+ {"matrix": [4, 2], "x":3.25, "y":4.5},
+ {"matrix": [4, 3], "x":4.25, "y":4.5},
+ {"matrix": [4, 4], "x":5.25, "y":4.5},
+ {"matrix": [4, 5], "x":6.25, "y":4.5},
+ {"matrix": [4, 6], "x":7.25, "y":4.5},
+ {"matrix": [4, 7], "x":8.25, "y":4.5},
+ {"matrix": [4, 8], "x":9.25, "y":4.5},
+ {"matrix": [4, 9], "x":10.25, "y":4.5},
+ {"matrix": [4, 10], "x":11.25, "y":4.5},
+ {"matrix": [4, 11], "x":12.25, "y":4.5, "w":1.75},
+ {"matrix": [4, 13], "x":14, "y":4.5},
+ {"matrix": [5, 0], "x":0, "y":5.5, "w":1.25},
+ {"matrix": [5, 1], "x":1.25, "y":5.5, "w":1.25},
+ {"matrix": [5, 2], "x":2.5, "y":5.5, "w":1.25},
+ {"matrix": [5, 5], "x":3.75, "y":5.5, "w":6.25},
+ {"matrix": [5, 9], "x":10, "y":5.5, "w":1.25},
+ {"matrix": [5, 10], "x":11.25, "y":5.5, "w":1.25},
+ {"matrix": [5, 12], "x":13, "y":5.5},
+ {"matrix": [5, 13], "x":14, "y":5.5},
+ {"matrix": [5, 14], "x":15, "y":5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/owlab/jelly_evolv/solder/keymaps/default/keymap.c b/keyboards/owlab/jelly_evolv/solder/keymaps/default/keymap.c
new file mode 100644
index 000000000000..b45d40340a66
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/solder/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 owlab
+ *
+ * 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] = {
+ [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_PSCR,
+ 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_BSLS, KC_BSPC, KC_DEL,
+ 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_PGUP,
+ 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_PGDN,
+ 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, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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
+ )
+};
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/solder/keymaps/via/keymap.c b/keyboards/owlab/jelly_evolv/solder/keymaps/via/keymap.c
new file mode 100644
index 000000000000..b45d40340a66
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/solder/keymaps/via/keymap.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2023 owlab
+ *
+ * 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] = {
+ [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_PSCR,
+ 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_BSLS, KC_BSPC, KC_DEL,
+ 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_PGUP,
+ 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_PGDN,
+ 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, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ 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, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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
+ )
+};
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/solder/keymaps/via/rules.mk b/keyboards/owlab/jelly_evolv/solder/keymaps/via/rules.mk
new file mode 100644
index 000000000000..43061db1dd46
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/solder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/solder/readme.md b/keyboards/owlab/jelly_evolv/solder/readme.md
new file mode 100644
index 000000000000..89843dac2dc2
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/solder/readme.md
@@ -0,0 +1,21 @@
+# Jelly Evolv - soldered PCB
+
+
+
+A 75% made by Owlab.
+
+* Keyboard Maintainer: [owlab](https://github.com/lizhenmingdirk)
+* Hardware Supported: Jelly Evolv solder PCB
+* Hardware Availability: Ended groupbuy: https://www.zfrontier.com/app/flow/W58MLYOGdVVQ
+
+Make example for this keyboard (after setting up your build environment):
+
+ make owlab/jelly_evolv/solder:default
+
+Flashing example for this keyboard:
+
+ make owlab/jelly_evolv/solder:default:flash
+
+**Bootloader:** Press the button B of the PCB while plugging in the board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_evolv/solder/rules.mk b/keyboards/owlab/jelly_evolv/solder/rules.mk
new file mode 100644
index 000000000000..dfd7b8e20848
--- /dev/null
+++ b/keyboards/owlab/jelly_evolv/solder/rules.mk
@@ -0,0 +1,5 @@
+MCU_LDSCRIPT = STM32F103x8_0x08006000_bootloader
+DFU_ARGS = -d 1688:2220 -a 0 -s 0x08006000
+DFU_SUFFIX_ARGS = -v 1688 -p 2220
+BOOTLOADER_TYPE = stm32duino
+OPT_DEFS += -DBOOTLOADER_STM32DUINO
\ No newline at end of file
diff --git a/keyboards/pangorin/tan67/config.h b/keyboards/pangorin/tan67/config.h
new file mode 100644
index 000000000000..62ccc4f273f9
--- /dev/null
+++ b/keyboards/pangorin/tan67/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2023 Pangorin
+ *
+ * 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
+#ifdef RGB_MATRIX_ENABLE
+ /* RGB Matrix config */
+ #define RGB_MATRIX_LED_COUNT 84
+ #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+ #define RGB_MATRIX_KEYPRESSES
+ #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
diff --git a/keyboards/pangorin/tan67/info.json b/keyboards/pangorin/tan67/info.json
new file mode 100644
index 000000000000..4aab01aa8d3c
--- /dev/null
+++ b/keyboards/pangorin/tan67/info.json
@@ -0,0 +1,246 @@
+{
+ "keyboard_name": "Tan67",
+ "manufacturer": "Unknown",
+ "maintainer": "Pangorin",
+ "usb": {
+ "vid": "0x4D4B",
+ "pid": "0x6067",
+ "device_version": "0.0.1"
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["A5", "B10", "A3", "A2", "B0", "A9", "B1", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+ "rows": ["B12", "B11", "B14", "A8", "A1"]
+ },
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "ws2812": {
+ "pin": "B15"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812",
+ "max_brightness": 200,
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 202, "y": 0, "flags": 1},
+ {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
+
+ {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
+ {"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 127, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 142, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 157, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 172, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 187, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 205, "y": 16, "flags": 4},
+ {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
+
+ {"matrix": [2, 0], "x": 6, "y": 32, "flags": 8},
+ {"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 175, "y": 32, "flags": 4},
+ {"matrix": [2, 12], "x": 200, "y": 32, "flags": 1},
+ {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
+
+ {"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
+ {"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 63, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 78, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 93, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 108, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 123, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 138, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 153, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 168, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 189, "y": 48, "flags": 1},
+ {"matrix": [3, 12], "x": 209, "y": 48, "flags": 4},
+ {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
+
+ {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+ {"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
+ {"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
+ {"matrix": [4, 5], "x": 95, "y": 64, "flags": 4},
+ {"matrix": [4, 9], "x": 151, "y": 64, "flags": 1},
+ {"matrix": [4, 10], "x": 170, "y": 64, "flags": 1},
+ {"matrix": [4, 11], "x": 194, "y": 64, "flags": 4},
+ {"matrix": [4, 12], "x": 209, "y": 64, "flags": 4},
+ {"matrix": [4, 13], "x": 224, "y": 64, "flags": 4},
+
+ {"x": 220, "y": 56, "flags": 2},
+ {"x": 202, "y": 56, "flags": 2},
+ {"x": 179, "y": 56, "flags": 2},
+ {"x": 161, "y": 56, "flags": 2},
+ {"x": 131, "y": 56, "flags": 2},
+ {"x": 105, "y": 56, "flags": 2},
+ {"x": 82, "y": 56, "flags": 2},
+ {"x": 52, "y": 56, "flags": 2},
+ {"x": 30, "y": 56, "flags": 2},
+ {"x": 4, "y": 56, "flags": 2},
+ {"x": 19, "y": 8, "flags": 2},
+ {"x": 52, "y": 8, "flags": 2},
+ {"x": 90, "y": 8, "flags": 2},
+ {"x": 127, "y": 8, "flags": 2},
+ {"x": 164, "y": 8, "flags": 2},
+ {"x": 205, "y": 8, "flags": 2}
+ ]
+ },
+ "community_layouts": ["65_ansi_blocker"],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+ {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+ {"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+ {"matrix": [4, 9], "w": 1.25, "x": 10, "y": 4},
+ {"matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 12], "x": 14, "y": 4},
+ {"matrix": [4, 13], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/pangorin/tan67/keymaps/default/keymap.c b/keyboards/pangorin/tan67/keymaps/default/keymap.c
new file mode 100644
index 000000000000..2b46433eeff3
--- /dev/null
+++ b/keyboards/pangorin/tan67/keymaps/default/keymap.c
@@ -0,0 +1,80 @@
+/* Copyright 2023 Pangorin
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+ _BASE,
+ _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────────┐┌────┐
+│` ││1 ││2 ││3 ││4 ││5 ││6 ││7 ││8 ││9 ││0 ││- ││= ││Bksp ││Home│
+└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────────┘└────┘
+┌──────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌──────┐┌────┐
+│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[ ││] │|\ ││PgUp │
+└──────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└──────┘└────┘
+┌───────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌───────────┐┌────┐
+│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││; ││' ││Enter ││PgDn│
+└───────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└───────────┘└────┘
+┌───────────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌───────┐┌────┐┌────┐
+│Shift ││Z ││X ││C ││V ││B ││N ││M ││, ││. ││/ ││RShift ││Up ││End │
+└───────────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└───────┘└────┘└────┘
+┌─────┐┌─────┐┌─────┐┌─────────────────────────────────────┐┌─────┐┌─────┐ ┌────┐┌────┐┌────┐
+│LCtrl││Win ││LAlt ││Space ││MO(1)││RCtrl│ │Left││Down││Righ│
+└─────┘└─────┘└─────┘└─────────────────────────────────────┘└─────┘└─────┘ └────┘└────┘└────┘
+*/
+ /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
+ [_BASE] = LAYOUT_65_ansi_blocker(
+ 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_BSPC, KC_HOME,
+ 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_PGUP,
+ 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_PGDN,
+ 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_UP, KC_DEL,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+/*
+┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────────┐┌────┐
+│` ││F1 ││F2 ││F3 ││F4 ││F5 ││F6 ││F7 ││F8 ││F9 ││F10 ││F11 ││F12 ││Reset ││ │
+└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────────┘└────┘
+┌──────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌──────┐┌────┐
+│ ││ ││Togg││ ││ ││ ││ ││ ││ ││ ││ ││ ││ │| ││ │
+└──────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└──────┘└────┘
+┌───────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌───────────┐┌────┐
+│ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ │
+└───────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└───────────┘└────┘
+┌───────────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌───────┐┌────┐┌────┐
+│ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││Vai+││ │
+└───────────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└───────┘└────┘└────┘
+┌─────┐┌─────┐┌─────┐┌─────────────────────────────────────┐┌─────┐┌─────┐ ┌────┐┌────┐┌────┐
+│ ││ ││ ││ ││ ││ │ │ ││Vai-││ │
+└─────┘└─────┘└─────┘└─────────────────────────────────────┘└─────┘└─────┘ └────┘└────┘└────┘
+*/
+ /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
+ [_FN1] = LAYOUT_65_ansi_blocker(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______,
+ _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______,
+ _______, _______, _______, _______, _______, _______, _______, RGB_VAD, _______
+ )
+};
diff --git a/keyboards/pangorin/tan67/keymaps/via/keymap.c b/keyboards/pangorin/tan67/keymaps/via/keymap.c
new file mode 100644
index 000000000000..2b46433eeff3
--- /dev/null
+++ b/keyboards/pangorin/tan67/keymaps/via/keymap.c
@@ -0,0 +1,80 @@
+/* Copyright 2023 Pangorin
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+ _BASE,
+ _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────────┐┌────┐
+│` ││1 ││2 ││3 ││4 ││5 ││6 ││7 ││8 ││9 ││0 ││- ││= ││Bksp ││Home│
+└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────────┘└────┘
+┌──────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌──────┐┌────┐
+│Tab ││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││[ ││] │|\ ││PgUp │
+└──────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└──────┘└────┘
+┌───────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌───────────┐┌────┐
+│Caps ││A ││S ││D ││F ││G ││H ││J ││K ││L ││; ││' ││Enter ││PgDn│
+└───────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└───────────┘└────┘
+┌───────────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌───────┐┌────┐┌────┐
+│Shift ││Z ││X ││C ││V ││B ││N ││M ││, ││. ││/ ││RShift ││Up ││End │
+└───────────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└───────┘└────┘└────┘
+┌─────┐┌─────┐┌─────┐┌─────────────────────────────────────┐┌─────┐┌─────┐ ┌────┐┌────┐┌────┐
+│LCtrl││Win ││LAlt ││Space ││MO(1)││RCtrl│ │Left││Down││Righ│
+└─────┘└─────┘└─────┘└─────────────────────────────────────┘└─────┘└─────┘ └────┘└────┘└────┘
+*/
+ /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
+ [_BASE] = LAYOUT_65_ansi_blocker(
+ 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_BSPC, KC_HOME,
+ 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_PGUP,
+ 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_PGDN,
+ 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_UP, KC_DEL,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+/*
+┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────────┐┌────┐
+│` ││F1 ││F2 ││F3 ││F4 ││F5 ││F6 ││F7 ││F8 ││F9 ││F10 ││F11 ││F12 ││Reset ││ │
+└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────────┘└────┘
+┌──────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌──────┐┌────┐
+│ ││ ││Togg││ ││ ││ ││ ││ ││ ││ ││ ││ ││ │| ││ │
+└──────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└──────┘└────┘
+┌───────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌───────────┐┌────┐
+│ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ │
+└───────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└───────────┘└────┘
+┌───────────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌────┐┌───────┐┌────┐┌────┐
+│ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││ ││Vai+││ │
+└───────────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└────┘└───────┘└────┘└────┘
+┌─────┐┌─────┐┌─────┐┌─────────────────────────────────────┐┌─────┐┌─────┐ ┌────┐┌────┐┌────┐
+│ ││ ││ ││ ││ ││ │ │ ││Vai-││ │
+└─────┘└─────┘└─────┘└─────────────────────────────────────┘└─────┘└─────┘ └────┘└────┘└────┘
+*/
+ /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
+ [_FN1] = LAYOUT_65_ansi_blocker(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______,
+ _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______,
+ _______, _______, _______, _______, _______, _______, _______, RGB_VAD, _______
+ )
+};
diff --git a/keyboards/pangorin/tan67/keymaps/via/rules.mk b/keyboards/pangorin/tan67/keymaps/via/rules.mk
new file mode 100644
index 000000000000..16d33cd89fe4
--- /dev/null
+++ b/keyboards/pangorin/tan67/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+
diff --git a/keyboards/pangorin/tan67/readme.md b/keyboards/pangorin/tan67/readme.md
new file mode 100644
index 000000000000..6fdb4effbd54
--- /dev/null
+++ b/keyboards/pangorin/tan67/readme.md
@@ -0,0 +1,23 @@
+# TAN67 PCB
+
+A 65% PCB, which controlled by an STM32F072 chipset.
+
+* Keyboard Maintainer: [Pangorin](https://github.com/pangorin)
+* Hardware Supported: STM32F072
+
+Make example for this keyboard (after setting up your build environment):
+
+ make pangorin/tan67:default
+
+Flashing example for this keyboard:
+
+ make pangorin/tan67: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/pangorin/tan67/rules.mk b/keyboards/pangorin/tan67/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/pangorin/tan67/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/pangorin/tan67/tan67.c b/keyboards/pangorin/tan67/tan67.c
new file mode 100644
index 000000000000..574624c1576a
--- /dev/null
+++ b/keyboards/pangorin/tan67/tan67.c
@@ -0,0 +1,52 @@
+/* Copyright 2023 Pangorin
+ *
+ * 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case RGB_TOG:
+ if (record->event.pressed) {
+ switch (rgb_matrix_get_flags()) {
+ case LED_FLAG_ALL: {
+ rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+ rgb_matrix_set_color_all(0, 0, 0);
+ }
+ break;
+ case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+ rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+ rgb_matrix_set_color_all(0, 0, 0);
+ }
+ break;
+ case (LED_FLAG_UNDERGLOW): {
+ rgb_matrix_set_flags(LED_FLAG_NONE);
+ rgb_matrix_set_color_all(0, 0, 0);
+ }
+ break;
+ default: {
+ rgb_matrix_set_flags(LED_FLAG_ALL);
+ rgb_matrix_enable_noeeprom();
+ }
+ break;
+ }
+ }
+ return false;
+ }
+ return process_record_user(keycode, record);
+}
+#endif
+
diff --git a/keyboards/planck/keymaps/janat-t/config.h b/keyboards/planck/keymaps/janat-t/config.h
new file mode 100644
index 000000000000..5d7616f7ca32
--- /dev/null
+++ b/keyboards/planck/keymaps/janat-t/config.h
@@ -0,0 +1,48 @@
+/* Copyright 2023 Taerakul Janat
+ *
+ * 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
+
+#ifdef AUDIO_ENABLE
+# define STARTUP_SONG SONG(PLANCK_SOUND)
+# define DEFAULT_LAYER_SONGS \
+ { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(QWERTY_SOUND) }
+#endif
+
+#define MIDI_BASIC
+
+// Configure the global tapping term (default: 200ms)
+#define TAPPING_TERM 180
+
+// Prevent normal rollover on alphas from accidentally triggering mods.
+#define PERMISSIVE_HOLD
+
+#ifndef MOUSEKEY_INTERVAL
+#define MOUSEKEY_INTERVAL 10
+#endif
+#ifndef MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_MAX_SPEED 3
+#endif
+#ifndef MOUSEKEY_TIME_TO_MAX
+#define MOUSEKEY_TIME_TO_MAX 100
+#endif
+
+// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
+#define QUICK_TAP_TERM 0
+
+#define TRI_LAYER_LOWER_LAYER 3
+#define TRI_LAYER_UPPER_LAYER 4
+#define TRI_LAYER_ADJUST_LAYER 7
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/janat-t/keymap.c b/keyboards/planck/keymaps/janat-t/keymap.c
new file mode 100644
index 000000000000..27166091d260
--- /dev/null
+++ b/keyboards/planck/keymaps/janat-t/keymap.c
@@ -0,0 +1,328 @@
+/* Copyright 2023 Taerakul Janat
+ *
+ * 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
+
+#ifdef AUDIO_ENABLE
+# include "muse.h"
+#endif
+
+enum planck_layers {
+ _QWERTY,
+ _COLEMAK,
+ _NOMOD,
+ _LOWER,
+ _RAISE,
+ _NAV,
+ _MOUSE,
+ _ADJUST
+};
+
+enum planck_keycodes {
+ QWERTY = SAFE_RANGE,
+ COLEMAK,
+ NOMOD
+};
+
+#define MOU_Z LT(_MOUSE, KC_Z)
+#define MOU_SCLN LT(_MOUSE, KC_SCLN)
+#define NAV_SLSH LT(_NAV, KC_SLSH)
+#define NAV_Z LT(_NAV, KC_Z)
+
+// Left-hand home row mods QWERTY
+#define CTL_A LCTL_T(KC_A)
+#define ALT_S LALT_T(KC_S)
+#define GUI_D LGUI_T(KC_D)
+#define SFT_F LSFT_T(KC_F)
+
+// Right-hand home row mods QWERTY
+#define SFT_J RSFT_T(KC_J)
+#define GUI_K RGUI_T(KC_K)
+#define ALT_L LALT_T(KC_L)
+#define CTL_SCLN RCTL_T(KC_SCLN)
+
+// Left-hand home row mods COLEMAK
+#define CTL_A LCTL_T(KC_A)
+#define ALT_R LALT_T(KC_R)
+#define GUI_S LGUI_T(KC_S)
+#define SHFT_T LSFT_T(KC_T)
+
+// Right-hand home row mods COLEMAK
+#define SFT_N RSFT_T(KC_N)
+#define GUI_E RGUI_T(KC_E)
+#define ALT_I LALT_T(KC_I)
+#define CTL_O RCTL_T(KC_O)
+
+#define HYPER MEH(KC_LGUI)
+
+#define CT_ESC CTL_T(KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab | Q | W | E | R | T | Y | U | I | O | P | BS |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ESC |Ctl-A |Alt-S |GUI-D |Shft-F| G | H |Shft-J|GUI-K |Alt-L |Ctl-; | " |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | CW |MOU-Z | X | C | V | B | N | M | , | . |NAV-/ |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | HYPER| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid(
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ CT_ESC, CTL_A, ALT_S, GUI_D, SFT_F, KC_G, KC_H, SFT_J, GUI_K, ALT_L, CTL_SCLN,KC_QUOT,
+ CW_TOGG, MOU_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, NAV_SLSH,KC_ENT,
+ HYPER, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+),
+
+/* Colemak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab | Q | W | F | P | B | J | L | U | Y | ; | BS |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ESC |Ctl-A |Alt-R |GUI-S |Shft-T| G | M |Shft-N|GUI-E |Alt-I |Ctl-O | " |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | CW |MOU-Z | X | C | D | V | K | H | , | . |NAV-/ |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | HYPER| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_planck_grid(
+ KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
+ CT_ESC, CTL_A, ALT_R, GUI_S, SHFT_T, KC_G, KC_M, SFT_N, GUI_E, ALT_I, CTL_O, KC_QUOT,
+ CW_TOGG, MOU_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, NAV_SLSH,KC_ENT,
+ HYPER, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+),
+/* Qwerty without home row mod
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab | Q | W | E | R | T | Y | U | I | O | P | BS |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ESC | A | S | D | F | G | H | J | K | L | ; | " |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | HYPER| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_NOMOD] = LAYOUT_planck_grid(
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ CT_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
+ HYPER, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | BS |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del | F13 | F14 | F15 | F16 | F17 | F18 | _ | + | { | } | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | F19 | F20 | F21 | F22 | F23 | F24 |ISO ~ |ISO | | Home | End | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | |Adjust| Prev | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid(
+ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+ KC_DEL, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+ _______, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | |Adjust| | | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+ _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Nav
+ * /-----------------------------------------------------------------------------------\
+ * | | Home | PgUp | PgDn | End | | T1 | T← | T→ | T9 | | |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | | Ctrl | Alt | GUI |Shift | | ← | ↓ | ↑ | → | Del | |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | | | | | | | | | | |[Nav] | |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | | | | | | Shift | | | | | |
+ * \-----------------------------------------------------------------------------------/
+ */
+[_NAV] = LAYOUT_planck_grid(
+ _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, G(KC_1), SCMD(KC_LBRC), SCMD(KC_RBRC), G(KC_9), _______, _______,
+ _______, KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, KC_LSFT, KC_LSFT, _______, _______, _______, _______, _______
+),
+
+/* Mouse
+ * /-----------------------------------------------------------------------------------\
+ * | | | S↓ | M↑ | S↑ | | S← | S↓ | S↑ | S→ | | |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | | | M← | M↓ | M→ | | M← | M↓ | M↑ | M→ | | |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | |[Mou] | | | | M3 | M3 | | | | | |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | | | | | M2 | LeftClick | M2 | | | | |
+ * \-----------------------------------------------------------------------------------/
+ */
+[_MOUSE] = LAYOUT_planck_grid(
+ _______, _______, KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, _______, _______,
+ _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
+ _______, _______, _______, _______, _______, KC_BTN3, KC_BTN3, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, _______, _______, _______, _______
+),
+
+/* Adjust (Lower + Raise)
+ * v------------------------RGB CONTROL--------------------v
+ * ,-----------------------------------------------------------------------------------.
+ * | PWR | Reset|Debug | RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-| Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|NoMod | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | | | | | | | | | | | |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid(
+ KC_PWR, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
+ _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, NOMOD, _______, _______,
+ _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+ return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case QWERTY:
+ if (record->event.pressed) {
+ print("mode just switched to qwerty and this is a huge string\n");
+ set_single_persistent_default_layer(_QWERTY);
+ }
+ return false;
+ break;
+ case COLEMAK:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_COLEMAK);
+ }
+ return false;
+ break;
+ case NOMOD:
+ if (record->event.pressed) {
+ set_single_persistent_default_layer(_NOMOD);
+ }
+ return false;
+ break;
+
+ }
+ return true;
+}
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (muse_mode) {
+ if (IS_LAYER_ON(_RAISE)) {
+ if (clockwise) {
+ muse_offset++;
+ } else {
+ muse_offset--;
+ }
+ } else {
+ if (clockwise) {
+ muse_tempo+=1;
+ } else {
+ muse_tempo-=1;
+ }
+ }
+ } else {
+ if (clockwise) {
+ #ifdef MOUSEKEY_ENABLE
+ tap_code(KC_MS_WH_DOWN);
+ #else
+ tap_code(KC_PGDN);
+ #endif
+ } else {
+ #ifdef MOUSEKEY_ENABLE
+ tap_code(KC_MS_WH_UP);
+ #else
+ tap_code(KC_PGUP);
+ #endif
+ }
+ }
+ return true;
+}
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+ switch (index) {
+ case 0: {
+ if (active) {
+ layer_on(_ADJUST);
+ } else {
+ layer_off(_ADJUST);
+ }
+ break;
+ }
+ case 1:
+ if (active) {
+ muse_mode = true;
+ } else {
+ muse_mode = false;
+ }
+ }
+ return true;
+}
+
+void matrix_scan_user(void) {
+#ifdef AUDIO_ENABLE
+ if (muse_mode) {
+ if (muse_counter == 0) {
+ uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+ if (muse_note != last_muse_note) {
+ stop_note(compute_freq_for_midi_note(last_muse_note));
+ play_note(compute_freq_for_midi_note(muse_note), 0xF);
+ last_muse_note = muse_note;
+ }
+ }
+ muse_counter = (muse_counter + 1) % muse_tempo;
+ } else {
+ if (muse_counter) {
+ stop_all_notes();
+ muse_counter = 0;
+ }
+ }
+#endif
+}
diff --git a/keyboards/planck/keymaps/janat-t/readme.md b/keyboards/planck/keymaps/janat-t/readme.md
new file mode 100644
index 000000000000..159558d2351a
--- /dev/null
+++ b/keyboards/planck/keymaps/janat-t/readme.md
@@ -0,0 +1,112 @@
+# Janat's Planck Layout
+- MIT Layout
+- QWERTY and Colemak-DH with [Home Row Mods](https://precondition.github.io/home-row-mods)
+- QWERTY w/o mods for muggles
+- Lower + Uper + J/K/L: QWERTY/COLEMAK/NOMOD
+- Left Shift: [Caps Word](https://docs.qmk.fm/#/feature_caps_word)
+- Hold /: [Navigation Layer](#6-navigation-layer)
+- Hold Z: [Mouse Layer](#7-mouse-layer)
+
+## 1. QWERTY Layer - Qwerty with Home Row Mods
+```
+,-----------------------------------------------------------------------------------.
+| Tab | Q | W | E | R | T | Y | U | I | O | P | BS |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| ESC |Ctl-A |Alt-S |GUI-D |Shft-F| G | H |Shft-J|GUI-K |Alt-L |Ctl-; | " |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| CW |MOU-Z | X | C | V | B | N | M | , | . |NAV-/ |Enter |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| HYPER| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+`-----------------------------------------------------------------------------------'
+```
+
+## 2. COLEMAK Layer - Colemak-DH with Home Row Mods
+```
+,-----------------------------------------------------------------------------------.
+| Tab | Q | W | F | P | B | J | L | U | Y | ; | BS |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| ESC |Ctl-A |Alt-R |GUI-S |Shft-T| G | M |Shft-N|GUI-E |Alt-I |Ctl-O | " |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| CW |MOU-Z | X | C | D | V | K | H | , | . |NAV-/ |Enter |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| HYPER| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+`-----------------------------------------------------------------------------------'
+```
+
+## 3. NOMOD Layer - QWERTY without Home Row Mods
+```
+,-----------------------------------------------------------------------------------.
+| Tab | Q | W | E | R | T | Y | U | I | O | P | BS |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| ESC | A | S | D | F | G | H | J | K | L | ; | " |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| Shift| Z | X | C | V | B | N | M | , | . | / |Enter |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| HYPER| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right |
+`-----------------------------------------------------------------------------------'
+```
+
+## 4. Lower Layer
+```
+,-----------------------------------------------------------------------------------.
+| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | BS |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| Del | F13 | F14 | F15 | F16 | F17 | F18 | _ | + | { | } | | |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| | F19 | F20 | F21 | F22 | F23 | F24 |ISO ~ |ISO | | Home | End | |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| | | | | | |Adjust| Prev | Vol- | Vol+ | Play |
+`-----------------------------------------------------------------------------------'
+```
+
+## 5. Raise Layer
+```
+,-----------------------------------------------------------------------------------.
+| ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| Del | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| | F7 | F8 | F9 | F10 | F11 | F12 |ISO # |ISO / |Pg Up |Pg Dn | |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| | | | |Adjust| | | Next | Vol- | Vol+ | Play |
+`-----------------------------------------------------------------------------------'
+```
+## 6. Navigation Layer
+```
+/-----------------------------------------------------------------------------------\
+| | Home | PgUp | PgDn | End | | T1 | T← | T→ | T9 | | |
+|------+------+------+------+------+-------------+------+------+------+------+------|
+| | Ctrl | Alt | GUI |Shift | | ← | ↓ | ↑ | → | Del | |
+|------+------+------+------+------+------|------+------+------+------+------+------|
+| | | | | | | | | | |[Nav] | |
+|------+------+------+------+------+-------------+------+------+------+------+------|
+| | | | | | Shift | | | | | |
+\-----------------------------------------------------------------------------------/
+```
+
+## 7. Mouse Layer
+```
+/-----------------------------------------------------------------------------------\
+| | | S↓ | M↑ | S↑ | | S← | S↓ | S↑ | S→ | | |
+|------+------+------+------+------+-------------+------+------+------+------+------|
+| | | M← | M↓ | M→ | | M← | M↓ | M↑ | M→ | | |
+|------+------+------+------+------+------|------+------+------+------+------+------|
+| |[Mou] | | | | M3 | M3 | | | | | |
+|------+------+------+------+------+-------------+------+------+------+------+------|
+| | | | | M2 | LeftClick | M2 | | | | |
+\-----------------------------------------------------------------------------------/
+```
+
+## 8. Adjust Layer (Lower + Raise)
+```
+ v------------------------RGB CONTROL--------------------v
+,-----------------------------------------------------------------------------------.
+| PWR | Reset|Debug | RGB |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-| Del |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| | |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|NoMod | | |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| | | | | | | | | | | |
+`-----------------------------------------------------------------------------------'
+```
diff --git a/keyboards/planck/keymaps/janat-t/rules.mk b/keyboards/planck/keymaps/janat-t/rules.mk
new file mode 100644
index 000000000000..b0ed6ad92272
--- /dev/null
+++ b/keyboards/planck/keymaps/janat-t/rules.mk
@@ -0,0 +1,7 @@
+ifeq ($(strip $(AUDIO_ENABLE)), yes)
+ SRC += muse.c
+endif
+
+MIDI_ENABLE = yes
+CAPS_WORD_ENABLE = yes
+TRI_LAYER_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/badger/keymap.c b/keyboards/preonic/keymaps/badger/keymap.c
index 5a5ecc78cc5b..abaf611b0f6a 100644
--- a/keyboards/preonic/keymaps/badger/keymap.c
+++ b/keyboards/preonic/keymaps/badger/keymap.c
@@ -1,5 +1,5 @@
/*
-Copyright 2020 Dan White
+Copyright 2023 Dan White
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
@@ -13,8 +13,6 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
-#undef AUDIO_ENABLE
-
#include "ortho.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h
new file mode 100644
index 000000000000..312a72979f57
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/config.h
@@ -0,0 +1,42 @@
+/* Copyright 2023 GSKY
+ *
+ * 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
+
+/* 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
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* External spi flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
+#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN A5
+#define SPI_MOSI_PIN A7
+#define SPI_MISO_PIN A6
+
+#define DRIVER_1_CS A15
+#define DRIVER_2_CS B15
+#define DRIVER_1_EN C13
+#define DRIVER_2_EN C13
+
+#define DRIVER_COUNT 1
+#define RGB_MATRIX_LED_COUNT 71
diff --git a/keyboards/projectd/65/projectd_65_ansi/halconf.h b/keyboards/projectd/65/projectd_65_ansi/halconf.h
new file mode 100644
index 000000000000..64a184eb924e
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * 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_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next
diff --git a/keyboards/projectd/65/projectd_65_ansi/info.json b/keyboards/projectd/65/projectd_65_ansi/info.json
new file mode 100644
index 000000000000..41ac577c8d16
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/info.json
@@ -0,0 +1,235 @@
+{
+ "manufacturer": "ProjectD",
+ "keyboard_name": "ProjectD 65% ANSI",
+ "maintainer": "Gsky",
+ "bootloader": "wb32-dfu",
+ "bootmagic": {
+ "matrix": [1, 3]
+ },
+ "diode_direction": "COL2ROW",
+ "dynamic_keymap": {
+ "layer_count": 13
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+ "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
+ },
+ "processor": "WB32FQ95",
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "rainbow_moving_chevron": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "center_point": [76, 25],
+ "driver": "AW20216",
+ "layout": [
+ { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
+ { "flags": 4, "matrix": [1, 7], "x": 10, "y": 0 },
+ { "flags": 4, "matrix": [2, 7], "x": 20, "y": 0 },
+ { "flags": 4, "matrix": [3, 7], "x": 30, "y": 0 },
+ { "flags": 4, "matrix": [4, 7], "x": 40, "y": 0 },
+ { "flags": 4, "matrix": [4, 6], "x": 50, "y": 0 },
+ { "flags": 4, "matrix": [5, 6], "x": 60, "y": 0 },
+ { "flags": 4, "matrix": [5, 7], "x": 70, "y": 0 },
+ { "flags": 4, "matrix": [6, 7], "x": 80, "y": 0 },
+ { "flags": 4, "matrix": [7, 7], "x": 90, "y": 0 },
+ { "flags": 4, "matrix": [8, 7], "x": 100, "y": 0 },
+ { "flags": 4, "matrix": [8, 6], "x": 110, "y": 0 },
+ { "flags": 4, "matrix": [6, 6], "x": 120, "y": 0 },
+ { "flags": 4, "matrix": [7, 1], "x": 130, "y": 0 },
+ { "flags": 4, "matrix": [2, 3], "x": 150, "y": 0 },
+ { "flags": 4, "matrix": [1, 1], "x": 0, "y": 10 },
+ { "flags": 4, "matrix": [1, 0], "x": 15, "y": 10 },
+ { "flags": 4, "matrix": [2, 0], "x": 25, "y": 10 },
+ { "flags": 4, "matrix": [3, 0], "x": 35, "y": 10 },
+ { "flags": 4, "matrix": [4, 0], "x": 45, "y": 10 },
+ { "flags": 4, "matrix": [4, 1], "x": 55, "y": 10 },
+ { "flags": 4, "matrix": [5, 1], "x": 65, "y": 10 },
+ { "flags": 4, "matrix": [5, 0], "x": 75, "y": 10 },
+ { "flags": 4, "matrix": [6, 0], "x": 85, "y": 10 },
+ { "flags": 4, "matrix": [7, 0], "x": 95, "y": 10 },
+ { "flags": 4, "matrix": [8, 0], "x": 105, "y": 10 },
+ { "flags": 4, "matrix": [8, 1], "x": 115, "y": 10 },
+ { "flags": 4, "matrix": [6, 1], "x": 125, "y": 10 },
+ { "flags": 4, "matrix": [7, 5], "x": 135, "y": 10 },
+ { "flags": 4, "matrix": [7, 3], "x": 150, "y": 10 },
+ { "flags": 1, "matrix": [2, 1], "x": 0, "y": 20 },
+ { "flags": 4, "matrix": [1, 2], "x": 17.5, "y": 20 },
+ { "flags": 4, "matrix": [2, 2], "x": 27.5, "y": 20 },
+ { "flags": 4, "matrix": [3, 2], "x": 37.5, "y": 20 },
+ { "flags": 4, "matrix": [4, 2], "x": 47.5, "y": 20 },
+ { "flags": 4, "matrix": [4, 3], "x": 57.5, "y": 20 },
+ { "flags": 4, "matrix": [5, 3], "x": 67.5, "y": 20 },
+ { "flags": 4, "matrix": [5, 2], "x": 77.5, "y": 20 },
+ { "flags": 4, "matrix": [6, 2], "x": 87.5, "y": 20 },
+ { "flags": 4, "matrix": [7, 2], "x": 97.5, "y": 20 },
+ { "flags": 4, "matrix": [8, 2], "x": 107.5, "y": 20 },
+ { "flags": 4, "matrix": [8, 3], "x": 117.5, "y": 20 },
+ { "flags": 4, "matrix": [8, 4], "x": 127.5, "y": 20 },
+ { "flags": 4, "matrix": [2, 6], "x": 150, "y": 20 },
+ { "flags": 4, "matrix": [0, 0], "x": 0, "y": 30 },
+ { "flags": 4, "matrix": [1, 4], "x": 22.5, "y": 30 },
+ { "flags": 4, "matrix": [2, 4], "x": 32.5, "y": 30 },
+ { "flags": 4, "matrix": [3, 4], "x": 42.5, "y": 30 },
+ { "flags": 4, "matrix": [4, 4], "x": 52.5, "y": 30 },
+ { "flags": 4, "matrix": [4, 5], "x": 62.5, "y": 30 },
+ { "flags": 4, "matrix": [5, 5], "x": 72.5, "y": 30 },
+ { "flags": 4, "matrix": [5, 4], "x": 82.5, "y": 30 },
+ { "flags": 4, "matrix": [6, 4], "x": 92.5, "y": 30 },
+ { "flags": 4, "matrix": [7, 4], "x": 102.5, "y": 30 },
+ { "flags": 4, "matrix": [8, 5], "x": 112.5, "y": 30 },
+ { "flags": 4, "matrix": [0, 7], "x": 122.5, "y": 30 },
+ { "flags": 4, "matrix": [1, 6], "x": 140, "y": 30 },
+ { "flags": 4, "matrix": [6, 3], "x": 150, "y": 30 },
+ { "flags": 4, "matrix": [0, 6], "x": 0, "y": 40 },
+ { "flags": 4, "matrix": [0, 5], "x": 12.5, "y": 40 },
+ { "flags": 4, "matrix": [0, 2], "x": 25, "y": 40 },
+ { "flags": 4, "x": 61.5, "y": 40 },
+ { "flags": 4, "x": 62.5, "y": 40 },
+ { "flags": 4, "matrix": [0, 1], "x": 65, "y": 40 },
+ { "flags": 4, "x": 67.5, "y": 40 },
+ { "flags": 4, "x": 68.5, "y": 40 },
+ { "flags": 4, "matrix": [3, 6], "x": 100, "y": 40 },
+ { "flags": 4, "matrix": [3, 3], "x": 112.5, "y": 40 },
+ { "flags": 4, "matrix": [0, 3], "x": 130, "y": 40 },
+ { "flags": 4, "matrix": [1, 5], "x": 140, "y": 40 },
+ { "flags": 4, "matrix": [2, 5], "x": 150, "y": 40 }
+ ]
+ },
+ "url": "",
+ "usb": {
+ "device_version": "0.0.4",
+ "pid": "0x5319",
+ "vid": "0x3233"
+ },
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_65_ansi_blocker"
+ },
+ "community_layouts": ["65_ansi_blocker"],
+ "layouts": {
+ "LAYOUT_65_ansi_blocker": {
+ "layout": [
+ { "label": "Esc", "matrix": [1, 3], "x": 0, "y": 0 },
+ { "label": "1", "matrix": [1, 7], "x": 1, "y": 0 },
+ { "label": "2", "matrix": [2, 7], "x": 2, "y": 0 },
+ { "label": "3", "matrix": [3, 7], "x": 3, "y": 0 },
+ { "label": "4", "matrix": [4, 7], "x": 4, "y": 0 },
+ { "label": "5", "matrix": [4, 6], "x": 5, "y": 0 },
+ { "label": "6", "matrix": [5, 6], "x": 6, "y": 0 },
+ { "label": "7", "matrix": [5, 7], "x": 7, "y": 0 },
+ { "label": "8", "matrix": [6, 7], "x": 8, "y": 0 },
+ { "label": "9", "matrix": [7, 7], "x": 9, "y": 0 },
+ { "label": "0", "matrix": [8, 7], "x": 10, "y": 0 },
+ { "label": "-", "matrix": [8, 6], "x": 11, "y": 0 },
+ { "label": "=", "matrix": [6, 6], "x": 12, "y": 0 },
+ { "label": "Backspace", "matrix": [7, 1], "w": 2, "x": 13, "y": 0 },
+ { "label": "Del", "matrix": [2, 3], "x": 15, "y": 0 },
+ { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 1 },
+ { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 1 },
+ { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 1 },
+ { "label": "\\", "matrix": [7, 5], "w": 1.5, "x": 13.5, "y": 1 },
+ { "label": "PGUP", "matrix": [7, 3], "x": 15, "y": 1 },
+ { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 2 },
+ { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 2 },
+ { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 2 },
+ { "label": "Enter", "matrix": [8, 4], "w": 2.25, "x": 12.75, "y": 2 },
+ { "label": "PGDN", "matrix": [2, 6], "x": 15, "y": 2 },
+ { "label": "LShift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 3 },
+ { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 3 },
+ { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 3 },
+ { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 3 },
+ { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 3 },
+ { "label": "RShift", "matrix": [0, 7], "w": 1.75, "x": 12.25, "y": 3 },
+ { "label": "Up", "matrix": [1, 6], "x": 14, "y": 3 },
+ { "label": "End", "matrix": [6, 3], "x": 15, "y": 3 },
+ { "label": "LCtrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 4 },
+ { "label": "LWin", "matrix": [0, 5], "w": 1.25, "x": 1.25, "y": 4 },
+ { "label": "LAlt", "matrix": [0, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "label": "Space", "matrix": [0, 1], "w": 6.25, "x": 3.75, "y": 4 },
+ { "label": "RAlt", "matrix": [3, 6], "w": 1.25, "x": 10, "y": 4 },
+ { "label": "FN", "matrix": [3, 3], "w": 1.25, "x": 11.25, "y": 4 },
+ { "label": "Left", "matrix": [0, 3], "x": 13, "y": 4 },
+ { "label": "Down", "matrix": [1, 5], "x": 14, "y": 4 },
+ { "label": "Right", "matrix": [2, 5], "x": 15, "y": 4 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/projectd/65/projectd_65_ansi/keymaps/default/keymap.c b/keyboards/projectd/65/projectd_65_ansi/keymaps/default/keymap.c
new file mode 100644
index 000000000000..e7a34d3467d7
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/keymaps/default/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2023 GSKY
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+enum my_keycodes {
+ RGB_R = QK_USER,
+ RGB_G,
+ RGB_B,
+ RGB_W,
+ SW_cy,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+ switch (keycode) {
+
+ case RGB_R:
+ if (record->event.pressed) {
+ rgb_matrix_sethsv(0, 255, 255);
+ rgb_matrix_mode(1);
+ }
+ return false; /* Skip all further processing of this key */
+
+ case RGB_G:
+ if (record->event.pressed) {
+ rgb_matrix_sethsv(85, 255, 255);
+ rgb_matrix_mode(1);
+ }
+ return false; /* Skip all further processing of this key */
+
+ case RGB_B:
+ if (record->event.pressed) {
+ rgb_matrix_sethsv(170, 255, 255);
+ rgb_matrix_mode(1);
+ }
+ return false; /* Skip all further processing of this key */
+
+ case RGB_W:
+ if (record->event.pressed) {
+ rgb_matrix_sethsv(0, 0, 255);
+ rgb_matrix_mode(1);
+ }
+ return false; /* Skip all further processing of this key */
+
+ case SW_cy:
+ rgb_matrix_sethsv(0, 255, 255);
+ rgb_matrix_mode(13);
+ return false; /* Skip all further processing of this key */
+
+
+ default:
+ return true; /* Process all other keycodes normally */
+ }
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap _BL: Base Layer (Default Layer)
+ */
+[0] = LAYOUT(
+ QK_GESC, 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_DEL,
+ 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_PGUP,
+ 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_PGDN,
+ 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_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+[1] = LAYOUT(
+ KC_GRV, 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_DEL, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, 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_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, RGB_VAI, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI),
+[2] = LAYOUT(
+ 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,
+ QK_BOOT, 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, RGB_R, RGB_G, RGB_B, RGB_W, SW_cy, 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),
+};
\ No newline at end of file
diff --git a/keyboards/projectd/65/projectd_65_ansi/keymaps/via/keymap.c b/keyboards/projectd/65/projectd_65_ansi/keymaps/via/keymap.c
new file mode 100644
index 000000000000..035c038b7411
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/keymaps/via/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2023 GSKY
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+enum my_keycodes {
+ RGB_R = QK_USER,
+ RGB_G,
+ RGB_B,
+ RGB_W,
+ SW_cy,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+ switch (keycode) {
+
+ case RGB_R:
+ if (record->event.pressed) {
+ rgb_matrix_sethsv(0, 255, 255);
+ rgb_matrix_mode(1);
+ }
+ return false; /* Skip all further processing of this key */
+
+ case RGB_G:
+ if (record->event.pressed) {
+ rgb_matrix_sethsv(85, 255, 255);
+ rgb_matrix_mode(1);
+ }
+ return false; /* Skip all further processing of this key */
+
+ case RGB_B:
+ if (record->event.pressed) {
+ rgb_matrix_sethsv(170, 255, 255);
+ rgb_matrix_mode(1);
+ }
+ return false; /* Skip all further processing of this key */
+
+ case RGB_W:
+ if (record->event.pressed) {
+ rgb_matrix_sethsv(0, 0, 255);
+ rgb_matrix_mode(1);
+ }
+ return false; /* Skip all further processing of this key */
+
+ case SW_cy:
+ rgb_matrix_sethsv(0, 255, 255);
+ rgb_matrix_mode(13);
+ return false; /* Skip all further processing of this key */
+
+
+ default:
+ return true; /* Process all other keycodes normally */
+ }
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Keymap _BL: Base Layer (Default Layer)
+ */
+[0] = LAYOUT(
+ QK_GESC, 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_DEL,
+ 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_PGUP,
+ 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_PGDN,
+ 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_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+[1] = LAYOUT(
+ KC_GRV, 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_DEL, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, 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_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, RGB_VAI, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI),
+[2] = LAYOUT(
+ 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,
+ QK_BOOT, 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, RGB_R, RGB_G, RGB_B, RGB_W, SW_cy, 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/projectd/65/projectd_65_ansi/keymaps/via/rules.mk b/keyboards/projectd/65/projectd_65_ansi/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/projectd/65/projectd_65_ansi/mcuconf.h b/keyboards/projectd/65/projectd_65_ansi/mcuconf.h
new file mode 100644
index 000000000000..e4b8d1f97328
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * 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_next
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
new file mode 100644
index 000000000000..6027128a96ef
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
@@ -0,0 +1,143 @@
+/* Copyright 2023 GSKY
+ *
+ * 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 "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ //{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 0, Esc
+
+ {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, Esc
+ {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 1, 1
+ {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 2, 2
+ {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 3, 3
+ {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 4, 4
+ {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 5, 5
+ {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 6, 6
+ {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 7, 7
+ {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 8, 8
+ {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 9, 9
+ {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 10, 0
+ {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 11, -
+ {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 12, =
+ {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 13, Backspace
+ {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 14, Del
+
+ {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 15, Tab
+ {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 16, Q
+ {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 17, W
+ {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 18, E
+ {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 19, R
+ {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 20, T
+ {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 21, Y
+ {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 22, U
+ {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 23, I
+ {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 24, O
+ {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 25, P
+ {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 26, [
+ {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 27, ]
+ {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 28, "\\"
+ {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 29, PGUP
+
+ {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 30, CapsLock
+ {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 31, A
+ {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 32, S
+ {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 33, D
+ {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 34, F
+ {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 35, G
+ {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 36, H
+ {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 37, J
+ {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 38, K
+ {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 39, L
+ {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 40, ;
+ {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 41, '
+ {0, CS13_SW12, CS14_SW12, CS15_SW12}, // 42, Enter
+ {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 43, PGDN
+
+ {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 44, LShift
+ {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 45, Z
+ {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 46, X
+ {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 47, C
+ {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 48, V
+ {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 49, B
+ {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 50, N
+ {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 51, M
+ {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 52, ,
+ {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 53, .
+ {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 54, /
+ {0, CS16_SW8, CS17_SW8, CS18_SW8}, // 55, RShift
+ {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 56, Up
+ {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 57, END
+
+ {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 58, LCtrl
+ {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 59, LWin
+ {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 60, LAlt
+ {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 61, LED71
+ {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 62, LED72
+ {0, CS16_SW4, CS17_SW4, CS18_SW4}, // 63, Space
+ {0, CS16_SW7, CS17_SW7, CS18_SW7}, // 64, LED73
+ {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 65, LED74
+ {0, CS16_SW5, CS17_SW5, CS18_SW5}, // 66, RAlt
+ {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 67, FN
+
+ {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 68, Left
+ {0, CS16_SW11, CS17_SW11, CS18_SW11}, // 69, Down
+ {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 70, Right
+
+};
+
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+ static bool is_initialised = false;
+ if (!is_initialised) {
+ is_initialised = true;
+
+ // Try releasing special pins for a short time
+ setPinInput(SPI_SCK_PIN);
+ setPinInput(SPI_MOSI_PIN);
+ setPinInput(SPI_MISO_PIN);
+
+ chThdSleepMilliseconds(10);
+
+ palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+ palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+ palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+ }
+}
+
+#endif
+
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+ if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+ return false;
+}
+ if (host_keyboard_led_state().caps_lock) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(30, 255, 255, 255); // assuming caps lock is at led #30
+ }
+ return false;
+}
diff --git a/keyboards/projectd/65/projectd_65_ansi/readme.md b/keyboards/projectd/65/projectd_65_ansi/readme.md
new file mode 100644
index 000000000000..56e7e4d5591d
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/readme.md
@@ -0,0 +1,23 @@
+# ProjectD 65% ANSI
+
+A 65% keyboard, Equipped with the WestBerry Q95 microcontroller.
+
+* Keyboard Maintainer: [GSKY](https://github.com/gksygithub)
+* Hardware Supported: projectd_65_ansi
+* Hardware Availability: [GSKY](https://github.com/gksygithub/projectd_65_ansi)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make projectd/65/projectd_65_ansi:default
+
+Flashing example for this keyboard:
+
+ make projectd/65/projectd_65_ansi:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted under the space key after the USB cable is connected
+* Hold the Esc key while connecting the USB cable (also erases persistent settings)
+* Fn+Alt+Tab will reset the board to bootloader mode
+
+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/projectd/65/projectd_65_ansi/rules.mk b/keyboards/projectd/65/projectd_65_ansi/rules.mk
new file mode 100644
index 000000000000..24d5f6f52ecc
--- /dev/null
+++ b/keyboards/projectd/65/projectd_65_ansi/rules.mk
@@ -0,0 +1,2 @@
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = spi_flash
diff --git a/keyboards/raindrop/config.h b/keyboards/raindrop/config.h
new file mode 100644
index 000000000000..1f083ec616b7
--- /dev/null
+++ b/keyboards/raindrop/config.h
@@ -0,0 +1,10 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* 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
diff --git a/keyboards/raindrop/info.json b/keyboards/raindrop/info.json
new file mode 100644
index 000000000000..738e1719ea97
--- /dev/null
+++ b/keyboards/raindrop/info.json
@@ -0,0 +1,315 @@
+{
+ "keyboard_name": "Raindrop",
+ "manufacturer": "Laneware Peripherals",
+ "url": "https://lanewareperipherals.com/collections/raindrop-60",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4C50",
+ "pid": "0x3333",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "F7", "F6", "F5", "F4", "F1", "F0", "D5"],
+ "rows": ["E6", "B7", "D0", "D1", "D2"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "backlight": false,
+ "audio": false,
+ "rgblight": false,
+ "sleep_led": false
+ },
+ "community_layouts": ["60_hhkb", "60_ansi", "64_ansi"],
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [0, 1], "x":1, "y":0},
+ {"matrix": [0, 2], "x":2, "y":0},
+ {"matrix": [0, 3], "x":3, "y":0},
+ {"matrix": [0, 4], "x":4, "y":0},
+ {"matrix": [0, 5], "x":5, "y":0},
+ {"matrix": [0, 6], "x":6, "y":0},
+ {"matrix": [0, 7], "x":7, "y":0},
+ {"matrix": [0, 8], "x":8, "y":0},
+ {"matrix": [0, 9], "x":9, "y":0},
+ {"matrix": [0, 10], "x":10, "y":0},
+ {"matrix": [0, 11], "x":11, "y":0},
+ {"matrix": [0, 12], "x":12, "y":0},
+ {"matrix": [0, 13], "x":13, "y":0, "w":2},
+
+ {"matrix": [1, 0], "x":0, "y":1, "w":1.5},
+ {"matrix": [1, 1], "x":1.5, "y":1},
+ {"matrix": [1, 2], "x":2.5, "y":1},
+ {"matrix": [1, 3], "x":3.5, "y":1},
+ {"matrix": [1, 4], "x":4.5, "y":1},
+ {"matrix": [1, 5], "x":5.5, "y":1},
+ {"matrix": [1, 6], "x":6.5, "y":1},
+ {"matrix": [1, 7], "x":7.5, "y":1},
+ {"matrix": [1, 8], "x":8.5, "y":1},
+ {"matrix": [1, 9], "x":9.5, "y":1},
+ {"matrix": [1, 10], "x":10.5, "y":1},
+ {"matrix": [1, 11], "x":11.5, "y":1},
+ {"matrix": [1, 12], "x":12.5, "y":1},
+ {"matrix": [1, 13], "x":13.5, "y":1, "w":1.5},
+
+ {"matrix": [2, 0], "x":0, "y":2, "w":1.75},
+ {"matrix": [2, 1], "x":1.75, "y":2},
+ {"matrix": [2, 2], "x":2.75, "y":2},
+ {"matrix": [2, 3], "x":3.75, "y":2},
+ {"matrix": [2, 4], "x":4.75, "y":2},
+ {"matrix": [2, 5], "x":5.75, "y":2},
+ {"matrix": [2, 6], "x":6.75, "y":2},
+ {"matrix": [2, 7], "x":7.75, "y":2},
+ {"matrix": [2, 8], "x":8.75, "y":2},
+ {"matrix": [2, 9], "x":9.75, "y":2},
+ {"matrix": [2, 10], "x":10.75, "y":2},
+ {"matrix": [2, 11], "x":11.75, "y":2},
+ {"matrix": [2, 12], "x":12.75, "y":2, "w":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3, "w":2.25},
+ {"matrix": [3, 1], "x":2.25, "y":3},
+ {"matrix": [3, 2], "x":3.25, "y":3},
+ {"matrix": [3, 3], "x":4.25, "y":3},
+ {"matrix": [3, 4], "x":5.25, "y":3},
+ {"matrix": [3, 5], "x":6.25, "y":3},
+ {"matrix": [3, 6], "x":7.25, "y":3},
+ {"matrix": [3, 7], "x":8.25, "y":3},
+ {"matrix": [3, 8], "x":9.25, "y":3},
+ {"matrix": [3, 9], "x":10.25, "y":3},
+ {"matrix": [3, 10], "x":11.25, "y":3},
+ {"matrix": [3, 11], "x":12.25, "y":3, "w":2.75},
+
+ {"matrix": [4, 0], "x":0, "y":4, "w":1.25},
+ {"matrix": [4, 1], "x":1.25, "y":4, "w":1.25},
+ {"matrix": [4, 2], "x":2.5, "y":4, "w":1.25},
+ {"matrix": [4, 3], "x":3.75, "y":4, "w":6.25},
+ {"matrix": [4, 4], "x":10, "y":4, "w":1.25},
+ {"matrix": [4, 5], "x":11.25, "y":4, "w":1.25},
+ {"matrix": [4, 6], "x":12.5, "y":4, "w":1.25},
+ {"matrix": [4, 7], "x":13.75, "y":4, "w":1.25}
+ ]
+ },
+ "LAYOUT_60_hhkb": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [0, 1], "x":1, "y":0},
+ {"matrix": [0, 2], "x":2, "y":0},
+ {"matrix": [0, 3], "x":3, "y":0},
+ {"matrix": [0, 4], "x":4, "y":0},
+ {"matrix": [0, 5], "x":5, "y":0},
+ {"matrix": [0, 6], "x":6, "y":0},
+ {"matrix": [0, 7], "x":7, "y":0},
+ {"matrix": [0, 8], "x":8, "y":0},
+ {"matrix": [0, 9], "x":9, "y":0},
+ {"matrix": [0, 10], "x":10, "y":0},
+ {"matrix": [0, 11], "x":11, "y":0},
+ {"matrix": [0, 12], "x":12, "y":0},
+ {"matrix": [0, 13], "x":13, "y":0},
+ {"matrix": [0, 14], "x":14, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1, "w":1.5},
+ {"matrix": [1, 1], "x":1.5, "y":1},
+ {"matrix": [1, 2], "x":2.5, "y":1},
+ {"matrix": [1, 3], "x":3.5, "y":1},
+ {"matrix": [1, 4], "x":4.5, "y":1},
+ {"matrix": [1, 5], "x":5.5, "y":1},
+ {"matrix": [1, 6], "x":6.5, "y":1},
+ {"matrix": [1, 7], "x":7.5, "y":1},
+ {"matrix": [1, 8], "x":8.5, "y":1},
+ {"matrix": [1, 9], "x":9.5, "y":1},
+ {"matrix": [1, 10], "x":10.5, "y":1},
+ {"matrix": [1, 11], "x":11.5, "y":1},
+ {"matrix": [1, 12], "x":12.5, "y":1},
+ {"matrix": [1, 13], "x":13.5, "y":1, "w":1.5},
+
+ {"matrix": [2, 0], "x":0, "y":2, "w":1.75},
+ {"matrix": [2, 1], "x":1.75, "y":2},
+ {"matrix": [2, 2], "x":2.75, "y":2},
+ {"matrix": [2, 3], "x":3.75, "y":2},
+ {"matrix": [2, 4], "x":4.75, "y":2},
+ {"matrix": [2, 5], "x":5.75, "y":2},
+ {"matrix": [2, 6], "x":6.75, "y":2},
+ {"matrix": [2, 7], "x":7.75, "y":2},
+ {"matrix": [2, 8], "x":8.75, "y":2},
+ {"matrix": [2, 9], "x":9.75, "y":2},
+ {"matrix": [2, 10], "x":10.75, "y":2},
+ {"matrix": [2, 11], "x":11.75, "y":2},
+ {"matrix": [2, 12], "x":12.75, "y":2, "w":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3, "w":2.25},
+ {"matrix": [3, 1], "x":2.25, "y":3},
+ {"matrix": [3, 2], "x":3.25, "y":3},
+ {"matrix": [3, 3], "x":4.25, "y":3},
+ {"matrix": [3, 4], "x":5.25, "y":3},
+ {"matrix": [3, 5], "x":6.25, "y":3},
+ {"matrix": [3, 6], "x":7.25, "y":3},
+ {"matrix": [3, 7], "x":8.25, "y":3},
+ {"matrix": [3, 8], "x":9.25, "y":3},
+ {"matrix": [3, 9], "x":10.25, "y":3},
+ {"matrix": [3, 10], "x":11.25, "y":3},
+ {"matrix": [3, 11], "x":12.25, "y":3, "w":1.75},
+ {"matrix": [3, 13], "x":14, "y":3},
+
+ {"matrix": [4, 1], "x": 1.75, "y": 4},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 6.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 12, "y": 4}
+ ]
+ },
+ "LAYOUT_64_ansi": {
+ "layout" : [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4},
+ {"matrix": [4, 5], "x": 11, "y": 4},
+ {"matrix": [4, 6], "x": 12, "y": 4},
+ {"matrix": [4, 7], "x": 13, "y": 4},
+ {"matrix": [4, 8], "x": 14, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "y":0},
+ {"matrix": [0, 1], "x":1, "y":0},
+ {"matrix": [0, 2], "x":2, "y":0},
+ {"matrix": [0, 3], "x":3, "y":0},
+ {"matrix": [0, 4], "x":4, "y":0},
+ {"matrix": [0, 5], "x":5, "y":0},
+ {"matrix": [0, 6], "x":6, "y":0},
+ {"matrix": [0, 7], "x":7, "y":0},
+ {"matrix": [0, 8], "x":8, "y":0},
+ {"matrix": [0, 9], "x":9, "y":0},
+ {"matrix": [0, 10], "x":10, "y":0},
+ {"matrix": [0, 11], "x":11, "y":0},
+ {"matrix": [0, 12], "x":12, "y":0},
+ {"matrix": [0, 13], "x":13, "y":0},
+ {"matrix": [0, 14], "x":14, "y":0},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [1, 0], "x":0, "y":1, "w":1.5},
+ {"matrix": [1, 1], "x":1.5, "y":1},
+ {"matrix": [1, 2], "x":2.5, "y":1},
+ {"matrix": [1, 3], "x":3.5, "y":1},
+ {"matrix": [1, 4], "x":4.5, "y":1},
+ {"matrix": [1, 5], "x":5.5, "y":1},
+ {"matrix": [1, 6], "x":6.5, "y":1},
+ {"matrix": [1, 7], "x":7.5, "y":1},
+ {"matrix": [1, 8], "x":8.5, "y":1},
+ {"matrix": [1, 9], "x":9.5, "y":1},
+ {"matrix": [1, 10], "x":10.5, "y":1},
+ {"matrix": [1, 11], "x":11.5, "y":1},
+ {"matrix": [1, 12], "x":12.5, "y":1},
+ {"matrix": [1, 13], "x":13.5, "y":1, "w":1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+ {"matrix": [3, 6], "x": 7, "y": 3},
+ {"matrix": [3, 7], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3},
+ {"matrix": [3, 12], "x": 13, "y": 3},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 4], "x": 10, "y": 4},
+ {"matrix": [4, 5], "x": 11, "y": 4},
+ {"matrix": [4, 6], "x": 12, "y": 4},
+ {"matrix": [4, 7], "x": 13, "y": 4},
+ {"matrix": [4, 8], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/raindrop/keymaps/arrows/keymap.c b/keyboards/raindrop/keymaps/arrows/keymap.c
new file mode 100644
index 000000000000..a13614f75118
--- /dev/null
+++ b/keyboards/raindrop/keymaps/arrows/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define RS_GRV RSFT_T(KC_GRV)
+#define RG_DEL RGUI_T(KC_DEL)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_64_ansi(
+ 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_BSPC,
+ 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RS_GRV, KC_UP, RG_DEL,
+ KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_64_ansi(
+ QK_BOOT, 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_DEL,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO,
+ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_RSFT, KC_NO, KC_RGUI,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+ )
+};
diff --git a/keyboards/raindrop/keymaps/default/keymap.c b/keyboards/raindrop/keymaps/default/keymap.c
new file mode 100644
index 000000000000..8456863bb0d4
--- /dev/null
+++ b/keyboards/raindrop/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_60_ansi(
+ 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_BSPC,
+ 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+ KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_RALT, KC_RGUI, KC_APP, KC_RCTL
+ ),
+ [1] = LAYOUT_60_ansi(
+ QK_BOOT, 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_DEL,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_INS, KC_NO, KC_HOME, KC_END, KC_NO, KC_NO, KC_PGUP, KC_PGDN, KC_NO, KC_SCRL, KC_NO, KC_NO,
+ KC_TRNS, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/raindrop/keymaps/hhkb/keymap.c b/keyboards/raindrop/keymaps/hhkb/keymap.c
new file mode 100644
index 000000000000..b08984c9aa75
--- /dev/null
+++ b/keyboards/raindrop/keymaps/hhkb/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_60_hhkb(
+ 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_BSPC, 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_BSLS,
+ KC_LSFT, 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_LCTL, 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_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI
+ ),
+ [1] = LAYOUT_60_hhkb(
+ QK_BOOT, 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_NO, KC_NO,
+ KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_INS, KC_HOME, KC_PGUP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/raindrop/readme.md b/keyboards/raindrop/readme.md
new file mode 100644
index 000000000000..2741cfafa75f
--- /dev/null
+++ b/keyboards/raindrop/readme.md
@@ -0,0 +1,38 @@
+# Raindrop
+
+
+*Casing*
+
+*PCB Front*
+
+60% sized keyboard with a gasket mounted plate and aluminium case, made by Laneware Peripherals.
+
+* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
+* Hardware Supported: Raindrop PCB
+* Hardware Availability: Group Buy
+
+## Layouts
+The Raindrop PCB can be configured in the following key layouts:
+| Key Layout | Keymap | Diagram |
+| :---: | :---: | :---: |
+| Standard 60% | default |  |
+| 2u Left Shift with Arrow Keys | arrows |  |
+| HHKB with 6.25 Spacebar | hhkb |  |
+
+Make example for this keyboard (after setting up your build environment):
+
+ make raindrop:default
+
+Flashing example for this keyboard:
+
+ make raindrop: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/raindrop/rules.mk b/keyboards/raindrop/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/keyboards/shostudio/arc/info.json b/keyboards/shostudio/arc/info.json
new file mode 100644
index 000000000000..0e7f21464961
--- /dev/null
+++ b/keyboards/shostudio/arc/info.json
@@ -0,0 +1,297 @@
+{
+ "keyboard_name": "ARC",
+ "manufacturer": "Mechlovin Studio",
+ "url": "",
+ "maintainer": "Shostudio",
+ "usb": {
+ "vid": "0x5050",
+ "pid": "0x65AC",
+ "device_version": "0.0.1"
+ },
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A15", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3"],
+ "rows": ["B13", "B14", "A8", "A9", "A2"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "B12",
+ "on_state": 0
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "nkro": true,
+ "mousekey": true
+ },
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [4, 7], "x": 8.25, "y": 0},
+ {"matrix": [0, 8], "x": 10.75, "y": 0},
+ {"matrix": [0, 9], "x": 11.75, "y": 0},
+ {"matrix": [0, 10], "x": 12.75, "y": 0},
+ {"matrix": [0, 11], "x": 13.75, "y": 0},
+ {"matrix": [0, 12], "x": 14.75, "y": 0},
+ {"matrix": [0, 13], "x": 15.75, "y": 0},
+ {"matrix": [0, 14], "x": 16.75, "y": 0},
+ {"matrix": [0, 15], "x": 17.75, "y": 0},
+ {"matrix": [0, 16], "x": 18.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.25, "y": 1},
+ {"matrix": [1, 9], "x": 11.25, "y": 1},
+ {"matrix": [1, 10], "x": 12.25, "y": 1},
+ {"matrix": [1, 11], "x": 13.25, "y": 1},
+ {"matrix": [1, 12], "x": 14.25, "y": 1},
+ {"matrix": [1, 13], "x": 15.25, "y": 1},
+ {"matrix": [1, 14], "x": 16.25, "y": 1},
+ {"matrix": [1, 15], "x": 17.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 16], "x": 18.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 10.5, "y": 2},
+ {"matrix": [2, 9], "x": 11.5, "y": 2},
+ {"matrix": [2, 10], "x": 12.5, "y": 2},
+ {"matrix": [2, 11], "x": 13.5, "y": 2},
+ {"matrix": [2, 12], "x": 14.5, "y": 2},
+ {"matrix": [2, 13], "x": 15.5, "y": 2},
+ {"matrix": [2, 14], "x": 16.5, "y": 2},
+ {"matrix": [2, 15], "x": 17.5, "y": 2, "w": 1.25},
+ {"matrix": [2, 16], "x": 18.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+ {"matrix": [3, 7], "x": 8.5, "y": 3},
+ {"matrix": [3, 8], "x": 10, "y": 3},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3},
+ {"matrix": [3, 11], "x": 13, "y": 3},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+ {"matrix": [3, 13], "x": 15, "y": 3},
+ {"matrix": [3, 14], "x": 16, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 17.75, "y": 3},
+ {"matrix": [3, 16], "x": 18.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.75, "y": 4},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 16.75, "y": 4},
+ {"matrix": [4, 15], "x": 17.75, "y": 4},
+ {"matrix": [4, 16], "x": 18.75, "y": 4}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [4, 7], "x": 8.25, "y": 0},
+ {"matrix": [0, 8], "x": 10.75, "y": 0},
+ {"matrix": [0, 9], "x": 11.75, "y": 0},
+ {"matrix": [0, 10], "x": 12.75, "y": 0},
+ {"matrix": [0, 11], "x": 13.75, "y": 0},
+ {"matrix": [0, 12], "x": 14.75, "y": 0},
+ {"matrix": [0, 13], "x": 15.75, "y": 0},
+ {"matrix": [0, 14], "x": 16.75, "y": 0, "w": 2},
+ {"matrix": [0, 16], "x": 18.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.25, "y": 1},
+ {"matrix": [1, 9], "x": 11.25, "y": 1},
+ {"matrix": [1, 10], "x": 12.25, "y": 1},
+ {"matrix": [1, 11], "x": 13.25, "y": 1},
+ {"matrix": [1, 12], "x": 14.25, "y": 1},
+ {"matrix": [1, 13], "x": 15.25, "y": 1},
+ {"matrix": [1, 14], "x": 16.25, "y": 1},
+ {"matrix": [1, 15], "x": 17.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 16], "x": 18.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 10.5, "y": 2},
+ {"matrix": [2, 9], "x": 11.5, "y": 2},
+ {"matrix": [2, 10], "x": 12.5, "y": 2},
+ {"matrix": [2, 11], "x": 13.5, "y": 2},
+ {"matrix": [2, 12], "x": 14.5, "y": 2},
+ {"matrix": [2, 13], "x": 15.5, "y": 2},
+ {"matrix": [2, 15], "x": 16.5, "y": 2, "w": 2.25},
+ {"matrix": [2, 16], "x": 18.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+ {"matrix": [3, 7], "x": 8.5, "y": 3},
+ {"matrix": [3, 8], "x": 10, "y": 3},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3},
+ {"matrix": [3, 11], "x": 13, "y": 3},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+ {"matrix": [3, 13], "x": 15, "y": 3},
+ {"matrix": [3, 14], "x": 16, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 17.75, "y": 3},
+ {"matrix": [3, 16], "x": 18.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.75, "y": 4},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 16.75, "y": 4},
+ {"matrix": [4, 15], "x": 17.75, "y": 4},
+ {"matrix": [4, 16], "x": 18.75, "y": 4}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [4, 7], "x": 8.25, "y": 0},
+ {"matrix": [0, 8], "x": 10.75, "y": 0},
+ {"matrix": [0, 9], "x": 11.75, "y": 0},
+ {"matrix": [0, 10], "x": 12.75, "y": 0},
+ {"matrix": [0, 11], "x": 13.75, "y": 0},
+ {"matrix": [0, 12], "x": 14.75, "y": 0},
+ {"matrix": [0, 13], "x": 15.75, "y": 0},
+ {"matrix": [0, 14], "x": 16.75, "y": 0, "w": 2},
+ {"matrix": [0, 16], "x": 18.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 10.25, "y": 1},
+ {"matrix": [1, 9], "x": 11.25, "y": 1},
+ {"matrix": [1, 10], "x": 12.25, "y": 1},
+ {"matrix": [1, 11], "x": 13.25, "y": 1},
+ {"matrix": [1, 12], "x": 14.25, "y": 1},
+ {"matrix": [1, 13], "x": 15.25, "y": 1},
+ {"matrix": [1, 14], "x": 16.25, "y": 1},
+ {"matrix": [2, 15], "x": 17.5, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [1, 16], "x": 18.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 10.5, "y": 2},
+ {"matrix": [2, 9], "x": 11.5, "y": 2},
+ {"matrix": [2, 10], "x": 12.5, "y": 2},
+ {"matrix": [2, 11], "x": 13.5, "y": 2},
+ {"matrix": [2, 12], "x": 14.5, "y": 2},
+ {"matrix": [2, 13], "x": 15.5, "y": 2},
+ {"matrix": [2, 14], "x": 16.5, "y": 2},
+ {"matrix": [2, 16], "x": 18.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+ {"matrix": [3, 7], "x": 8.5, "y": 3},
+ {"matrix": [3, 8], "x": 10, "y": 3},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3},
+ {"matrix": [3, 11], "x": 13, "y": 3},
+ {"matrix": [3, 12], "x": 14, "y": 3},
+ {"matrix": [3, 13], "x": 15, "y": 3},
+ {"matrix": [3, 14], "x": 16, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 17.75, "y": 3},
+ {"matrix": [3, 16], "x": 18.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8.75, "y": 4},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 16.75, "y": 4},
+ {"matrix": [4, 15], "x": 17.75, "y": 4},
+ {"matrix": [4, 16], "x": 18.75, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/shostudio/arc/keymaps/default/keymap.c b/keyboards/shostudio/arc/keymaps/default/keymap.c
new file mode 100644
index 000000000000..591f1928a156
--- /dev/null
+++ b/keyboards/shostudio/arc/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * 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
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ansi(
+ KC_F1, KC_F2, 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_BSPC, KC_INS,
+ KC_F3, KC_F4, 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_PGUP,
+ KC_F5, KC_F6, LT1_CAP, 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_PGDN,
+ KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(1),
+ KC_F9, KC_F10, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_ansi(
+ KC_TRNS, KC_TRNS, KC_TRNS, 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_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/shostudio/arc/keymaps/via/keymap.c b/keyboards/shostudio/arc/keymaps/via/keymap.c
new file mode 100644
index 000000000000..663823d915ba
--- /dev/null
+++ b/keyboards/shostudio/arc/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * 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
+
+#define LT1_CAP LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ansi(
+ KC_F1, KC_F2, 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_BSPC, KC_INS,
+ KC_F3, KC_F4, 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_PGUP,
+ KC_F5, KC_F6, LT1_CAP, 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_PGDN,
+ KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, TO(1),
+ KC_F9, KC_F10, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPACE, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_ansi(
+ KC_TRNS, KC_TRNS, KC_TRNS, 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_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/shostudio/arc/keymaps/via/rules.mk b/keyboards/shostudio/arc/keymaps/via/rules.mk
new file mode 100644
index 000000000000..036bd6d1c3ec
--- /dev/null
+++ b/keyboards/shostudio/arc/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/shostudio/arc/readme.md b/keyboards/shostudio/arc/readme.md
new file mode 100644
index 000000000000..b84d77e0b76f
--- /dev/null
+++ b/keyboards/shostudio/arc/readme.md
@@ -0,0 +1,27 @@
+# arc
+
+
+
+ARC PCB, An ergonomic 65% keyboard PCB.
+* Keyboard Maintainer: [shostudios](https://shostudios.co/)
+* Hardware Supported: ARC, APM32F103
+* Hardware Availability: [shostudios](https://shostudios.co/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make shostudio/arc:default
+
+Flashing example for this keyboard:
+
+ make shostudio/arc:default:flash
+
+## Bootloader
+
+Enter the bootloader in 4 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+* **Bootloader**: Hold down the key at (0,13) in the matrix (Backspace) and plug in the keyboard
+
+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/shostudio/arc/rules.mk b/keyboards/shostudio/arc/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/shostudio/arc/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/splitkb/aurora/sofle_v2/keymaps/default/keymap.json b/keyboards/splitkb/aurora/sofle_v2/keymaps/default/keymap.json
index c93d28815208..226952964b9c 100644
--- a/keyboards/splitkb/aurora/sofle_v2/keymaps/default/keymap.json
+++ b/keyboards/splitkb/aurora/sofle_v2/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
{
- "keyboard": "splitkb/aurora/sofle_v2",
+ "keyboard": "splitkb/aurora/sofle_v2/rev1",
"keymap": "default",
"version": 1,
"layout": "LAYOUT",
diff --git a/keyboards/studiokestra/galatea/readme.md b/keyboards/studiokestra/galatea/readme.md
index 580815fa6304..d336855bc263 100644
--- a/keyboards/studiokestra/galatea/readme.md
+++ b/keyboards/studiokestra/galatea/readme.md
@@ -9,6 +9,7 @@ TKL H87/88c compatible PCB with support for the most common layouts.
* Hardware Availability: https://RNDKBD.com; https://geon.works/
* Rev1 firmware is used for Galatea PCBs with no RGB underglow.
* Rev2 firmware is used for Galatea PCBs with RGB underglow.
+* Rev3 firmware is used for Galatea PCBs with RP2040 chip w/ RGB underglow.
Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/studiokestra/galatea/rev2/config.h b/keyboards/studiokestra/galatea/rev2/config.h
deleted file mode 100644
index 7199179a4dee..000000000000
--- a/keyboards/studiokestra/galatea/rev2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2023 studiokestra (@studiokestra)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLED_NUM 24
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#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
-#define RGBLIGHT_MODE_TWINKLE
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index a050f88d7dc3..7b29ba6ae9a0 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -33,7 +33,23 @@
"pin": "D4"
},
"rgblight": {
- "max_brightness": 200
+ "led_count": 24,
+ "hue_steps": 8,
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "max_brightness": 200,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/studiokestra/galatea/rev3/info.json b/keyboards/studiokestra/galatea/rev3/info.json
new file mode 100644
index 000000000000..1669e3a18361
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev3/info.json
@@ -0,0 +1,374 @@
+{
+ "manufacturer": "Studio Kestra",
+ "keyboard_name": "Galatea",
+ "maintainer": "studiokestra",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "matrix_pins": {
+ "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP14", "GP6"],
+ "rows": ["GP3", "GP4", "GP1", "GP2", "GP5", "GP29", "GP20", "GP19", "GP17", "GP16", "GP13", "GP12"]
+ },
+ "processor": "RP2040",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x8803",
+ "vid": "0x7C10"
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP15"
+ },
+ "rgblight": {
+ "led_count": 24,
+ "hue_steps": 8,
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "max_brightness": 200,
+ "animations": {
+ "alternating": true,
+ "breathing": true,
+ "christmas": true,
+ "knight": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "rgb_test": true,
+ "snake": true,
+ "static_gradient": true,
+ "twinkle": true
+ }
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.5, "y": 0},
+ {"matrix": [1, 3], "x": 6.5, "y": 0},
+ {"matrix": [0, 4], "x": 7.5, "y": 0},
+ {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 9.75, "y": 0},
+ {"matrix": [1, 5], "x": 10.75, "y": 0},
+ {"matrix": [0, 6], "x": 11.75, "y": 0},
+ {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 14, "y": 0},
+
+ {"matrix": [1, 7], "x": 15.25, "y": 0},
+ {"matrix": [0, 8], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25},
+ {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+ {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+ {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+ {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+ {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+ {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_f13_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.5, "y": 0},
+ {"matrix": [1, 3], "x": 6.5, "y": 0},
+ {"matrix": [0, 4], "x": 7.5, "y": 0},
+ {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 9.75, "y": 0},
+ {"matrix": [1, 5], "x": 10.75, "y": 0},
+ {"matrix": [0, 6], "x": 11.75, "y": 0},
+ {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 14, "y": 0},
+
+ {"matrix": [1, 7], "x": 15.25, "y": 0},
+ {"matrix": [0, 8], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+ {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+ {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+ {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+ ]
+ },
+ "LAYOUT_tkl_f13_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.5, "y": 0},
+ {"matrix": [1, 3], "x": 6.5, "y": 0},
+ {"matrix": [0, 4], "x": 7.5, "y": 0},
+ {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 9.75, "y": 0},
+ {"matrix": [1, 5], "x": 10.75, "y": 0},
+ {"matrix": [0, 6], "x": 11.75, "y": 0},
+ {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 14, "y": 0},
+
+ {"matrix": [1, 7], "x": 15.25, "y": 0},
+ {"matrix": [0, 8], "x": 16.25, "y": 0},
+ {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+ {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+ {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+ {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+ {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+ {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+ {"matrix": [4, 7], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+ {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+ {"matrix": [11, 8], "x": 17.25, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/studiokestra/galatea/rev3/keymaps/default/keymap.c b/keyboards/studiokestra/galatea/rev3/keymaps/default/keymap.c
new file mode 100644
index 000000000000..32db99b386d0
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev3/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+ * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │LBk│RBk│ │Ins│Hom│PgU│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+ * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐
+ * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Mo1│ │ ↑ │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐
+ * │Ctrl│GUI │Alt │ │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ */
+ [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_F13, KC_PSCR, KC_SCRL, KC_PAUS,
+ 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_BSPC, KC_INS, KC_HOME, KC_PGUP,
+ 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_DEL, KC_END, KC_PGDN,
+ 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_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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ),
+
+ [1] = LAYOUT(
+ QK_BOOT, 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, 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/studiokestra/galatea/rev3/keymaps/via/keymap.c b/keyboards/studiokestra/galatea/rev3/keymaps/via/keymap.c
new file mode 100644
index 000000000000..c0d093334932
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev3/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2023 studiokestra (@studiokestra)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ /*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ * │Esc││F1 │F2 │F3 │F4 ││F5 │F6 │F7 │F8 ││F9 │F10│F11│F12││F13│ │PSc│Scr│Pse│
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+ * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │LBk│RBk│ │Ins│Hom│PgU│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤
+ * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐
+ * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Mo1│ │ ↑ │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐
+ * │Ctrl│GUI │Alt │ │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ */
+
+ [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_F13, KC_PSCR, KC_SCRL, KC_PAUS,
+ 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_BSPC, KC_INS, KC_HOME, KC_PGUP,
+ 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_DEL, KC_END, KC_PGDN,
+ 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_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_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ),
+
+ [1] = LAYOUT(
+ QK_BOOT, 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, 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/studiokestra/galatea/rev3/keymaps/via/rules.mk b/keyboards/studiokestra/galatea/rev3/keymaps/via/rules.mk
new file mode 100644
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/studiokestra/galatea/rev3/rules.mk b/keyboards/studiokestra/galatea/rev3/rules.mk
new file mode 100644
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/studiokestra/galatea/rev3/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/synthandkeys/bento_box/bento_box.c b/keyboards/synthandkeys/bento_box/bento_box.c
new file mode 100644
index 000000000000..5ef0678f5ec5
--- /dev/null
+++ b/keyboards/synthandkeys/bento_box/bento_box.c
@@ -0,0 +1,37 @@
+// Copyright 2023 Synth-and-Keys (@Synth-and-Keys)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+ if (!encoder_update_user(index, clockwise)) {
+ return false;
+ }
+ /*Main Encoder*/
+ if (index == 0) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ }
+ /* TOP LEFT*/
+ else if (index == 1) {
+ if (clockwise) {
+ tap_code16(C(KC_EQUAL));
+ } else {
+ tap_code16(C(KC_MINUS));
+ }
+ }
+ /* TOP RIGHT*/
+ else if (index == 2) {
+ if (clockwise) {
+ tap_code16(C(KC_Y));
+ } else {
+ tap_code16(C(KC_Z));
+ }
+ }
+ return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/synthandkeys/bento_box/info.json b/keyboards/synthandkeys/bento_box/info.json
new file mode 100644
index 000000000000..3cdc7a587083
--- /dev/null
+++ b/keyboards/synthandkeys/bento_box/info.json
@@ -0,0 +1,64 @@
+{
+ "manufacturer": "Synth-and-Keys",
+ "keyboard_name": "bento_box",
+ "maintainer": "Synth-and-Keys",
+ "bootloader": "stm32-dfu",
+ "bootmagic": {
+ "matrix": [2, 0]
+ },
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B2","pin_b": "B1"},
+ {"pin_a": "A13","pin_b": "A14"},
+ {"pin_a": "A15","pin_b": "B3"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "direct": [
+ [ "A9", "A8", "B10", "B9", "B6", "B0"],
+ [ "A5", "A2", "A7", "A4", "A1", "B8"],
+ [ "B5", "A6", "A3", "A0", "B7", "B4"]
+ ]
+ },
+ "processor": "STM32F072",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0000",
+ "vid": "0xFEED"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "matrix": [0, 0], "x": 3.5, "y": 0 },
+ { "matrix": [0, 1], "x": 4.5, "y": 0 },
+ { "matrix": [0, 2], "x": 1, "y": 0.5 },
+ { "matrix": [0, 3], "x": 3.5, "y": 1 },
+ { "matrix": [0, 4], "x": 4.5, "y": 1 },
+ { "matrix": [0, 5], "x": 0, "y": 2 },
+ { "matrix": [1, 0], "x": 1, "y": 2 },
+ { "matrix": [1, 1], "x": 2, "y": 2 },
+ { "matrix": [1, 2], "x": 0, "y": 3 },
+ { "matrix": [1, 3], "x": 1, "y": 3 },
+ { "matrix": [1, 4], "x": 2, "y": 3 },
+ { "matrix": [1, 5], "x": 3.5, "y": 2.5 },
+ { "matrix": [2, 0], "x": 4.5, "y": 2.5 },
+ { "matrix": [2, 1], "x": 0, "y": 4 },
+ { "matrix": [2, 2], "x": 1, "y": 4 },
+ { "matrix": [2, 3], "x": 2, "y": 4 },
+ { "matrix": [2, 4], "x": 3.5, "y": 3.5, "h": 1.5},
+ { "matrix": [2, 5], "x": 4.5, "y": 3.5, "h": 1.5}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c
new file mode 100644
index 000000000000..bf8f26984bf8
--- /dev/null
+++ b/keyboards/synthandkeys/bento_box/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2023 Synth-and-Keys (@Synth-and-Keys)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /*
+ * ----------------------------------------------------------------
+ * | | | | Ctrl+0 | GUI+Shift+S |
+ * ----------------------------------------------------------------
+ * | | Mute | | Copy | Paste |
+ * ----------------------------------------------------------------
+ * | Prev | Pause | Next | | |
+ * ----------------------------------------------------------------
+ * | Home | Up | End | Ctrl+T | Ctrl+W |
+ * ----------------------------------------------------------------
+ * | Left | Down | Right | Shift+Alt+Tab | Alt+Tab |
+ * ----------------------------------------------------------------
+ */
+ [0] = LAYOUT(
+ C(KC_0), G(S(KC_S)),
+ KC_MUTE, C(KC_C), C(KC_V),
+ KC_MPRV, KC_MPLY, KC_MNXT,
+ KC_HOME, KC_UP, KC_END, C(KC_T), C(KC_W),
+ KC_LEFT, KC_DOWN, KC_RIGHT, S(C(KC_TAB)), C(KC_TAB)
+ )
+};
+
+ /* LAYER TEMPLATE
+ * ------------------------------------
+ * | | | | | |
+ * ------------------------------------
+ * | | | | | |
+ * ------------------------------------
+ * | | | | | |
+ * ------------------------------------
+ * | | | | | |
+ * ------------------------------------
+ * | | | | | |
+ * ------------------------------------
+ */
\ No newline at end of file
diff --git a/keyboards/synthandkeys/bento_box/readme.md b/keyboards/synthandkeys/bento_box/readme.md
new file mode 100644
index 000000000000..32ce47a01374
--- /dev/null
+++ b/keyboards/synthandkeys/bento_box/readme.md
@@ -0,0 +1,26 @@
+# synthandkeys/bento_box
+
+
+
+The Bento Box is a 15-key, 3-encoder macropad running on QMK.
+
+* Keyboard Maintainer: [Synth-and-Keys](https://github.com/Synth-and-Keys)
+* Hardware Supported: Bento Box PCB
+* Hardware Availability: https://www.etsy.com/shop/SynthandKeys
+
+Make example for this keyboard (after setting up your build environment):
+
+ make synthandkeys/bento_box:default
+
+Flashing example for this keyboard:
+
+ make synthandkeys/bento_box: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the top left key in the group of 9 and plug in the keyboard
+* **Physical reset button**: Hold down the reset button on the back of the PCB for 5 seconds and release
diff --git a/keyboards/synthandkeys/bento_box/rules.mk b/keyboards/synthandkeys/bento_box/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/synthandkeys/bento_box/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/wuque/nemui65/info.json b/keyboards/wuque/nemui65/info.json
index b56df19efd98..65cfebf9b40d 100644
--- a/keyboards/wuque/nemui65/info.json
+++ b/keyboards/wuque/nemui65/info.json
@@ -14,10 +14,10 @@
"features": {
"bootmagic": true,
"command": false,
- "console": false
+ "console": false,
"extrakey": true,
"mousekey": true,
- "nkro": true
+ "nkro": true,
"rbglight": true
},
"diode_direction": "COL2ROW",
diff --git a/layouts/default/tkl_f13_jis/default_tkl_f13_jis/keymaps.c b/layouts/default/tkl_f13_jis/default_tkl_f13_jis/keymap.c
similarity index 100%
rename from layouts/default/tkl_f13_jis/default_tkl_f13_jis/keymaps.c
rename to layouts/default/tkl_f13_jis/default_tkl_f13_jis/keymap.c