aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/akb/vero/board.h (renamed from keyboards/nix_studio/lilith/config.h)7
-rw-r--r--keyboards/akb/vero/config.h23
-rw-r--r--keyboards/akko/5087/5087.c2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json4
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json4
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json4
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/dilemma/4x6_4/keyboard.json4
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/keyboard.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json4
-rw-r--r--keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json4
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json4
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json4
-rw-r--r--keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json4
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c105
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h11
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c17
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c2
-rw-r--r--keyboards/cannonkeys/satisfaction75/config.h5
-rw-r--r--keyboards/cannonkeys/satisfaction75_hs/config.h5
-rw-r--r--keyboards/cipulot/common/ec_board.c4
-rw-r--r--keyboards/cipulot/common/eeprom_tools.h26
-rw-r--r--keyboards/cipulot/common/via_ec.c7
-rw-r--r--keyboards/cipulot/ec_980c/ec_980c.c4
-rw-r--r--keyboards/cipulot/ec_typek/ec_typek.c4
-rw-r--r--keyboards/contra/keymaps/default/keymap.c4
-rw-r--r--keyboards/dm9records/plaid/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/dactyl_cc/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_kinesis/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_lightcycle/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_maximus/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_minidox/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_promicro/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_rah/keyboard.json4
-rw-r--r--keyboards/handwired/dactyl_tracer/keyboard.json4
-rw-r--r--keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json329
-rw-r--r--keyboards/handwired/jankrp2040dactyl/keyboard.json4
-rw-r--r--keyboards/handwired/onekey/keymaps/battery/config.h6
-rw-r--r--keyboards/handwired/onekey/keymaps/battery/keymap.c28
-rw-r--r--keyboards/handwired/onekey/keymaps/battery/keymap.json7
-rw-r--r--keyboards/handwired/onekey/keymaps/battery/rules.mk1
-rw-r--r--keyboards/handwired/onekey/keymaps/via_ci/config.h4
-rw-r--r--keyboards/handwired/onekey/keymaps/via_ci/keymap.c30
-rw-r--r--keyboards/handwired/onekey/keymaps/via_ci/keymap.json7
-rw-r--r--keyboards/handwired/onekey/teensy_32/rules.mk1
-rw-r--r--keyboards/handwired/onekey/teensy_lc/rules.mk2
-rw-r--r--keyboards/handwired/ortho_brass/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/skakunm_dactyl/keyboard.json4
-rw-r--r--keyboards/handwired/splittest/promicro/keyboard.json4
-rw-r--r--keyboards/handwired/splittest/teensy_2/keyboard.json4
-rw-r--r--keyboards/handwired/symmetric70_proto/promicro/info.json4
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json4
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json4
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json4
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json4
-rw-r--r--keyboards/helix/pico/info.json4
-rw-r--r--keyboards/helix/rev2/info.json4
-rw-r--r--keyboards/helix/rev2/rev2.c2
-rw-r--r--keyboards/helix/rev3_4rows/keyboard.json4
-rw-r--r--keyboards/helix/rev3_4rows/rev3_4rows.c2
-rw-r--r--keyboards/helix/rev3_5rows/keyboard.json4
-rw-r--r--keyboards/helix/rev3_5rows/rev3_5rows.c2
-rw-r--r--keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h3
-rw-r--r--keyboards/ibm/model_m_4th_gen/overnumpad_1xb/board.h8
-rw-r--r--keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h2
-rw-r--r--keyboards/icebreaker/hotswap/keyboard.json240
-rw-r--r--keyboards/icebreaker/hotswap/keymaps/default/keymap.c43
-rw-r--r--keyboards/icebreaker/hotswap/keymaps/default/rules.mk1
-rw-r--r--keyboards/icebreaker/readme.md26
-rw-r--r--keyboards/inland/kb83/kb83.c2
-rw-r--r--keyboards/jian/keymaps/advanced/keymap.c4
-rw-r--r--keyboards/keychron/c1_pro_v2/board.h8
-rw-r--r--keyboards/keychron/c1_pro_v2/mcuconf.h3
-rw-r--r--keyboards/keychron/c2_pro_v2/board.h8
-rw-r--r--keyboards/keychron/c2_pro_v2/mcuconf.h3
-rw-r--r--keyboards/keychron/c3_pro/board.h8
-rw-r--r--keyboards/keychron/c3_pro/mcuconf.h3
-rw-r--r--keyboards/mechlovin/olly/octagon/keyboard.json751
-rw-r--r--keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c6
-rw-r--r--keyboards/mechlovin/olly/octagon/matrix_diagram.md26
-rw-r--r--keyboards/monsgeek/m1/m1.c2
-rw-r--r--keyboards/monsgeek/m3/m3.c2
-rw-r--r--keyboards/neson_design/810e/board.h8
-rw-r--r--keyboards/neson_design/810e/config.h21
-rw-r--r--keyboards/nix_studio/lilith/board.h8
-rw-r--r--keyboards/omnikeyish/dynamic_macro.c1
-rw-r--r--keyboards/planck/keymaps/default/keymap.c4
-rw-r--r--keyboards/planck/rev7/keymaps/default/keymap.c4
-rw-r--r--keyboards/plywrks/ply8x/hotswap/config.h (renamed from keyboards/plywrks/ply8x/config.h)0
-rw-r--r--keyboards/plywrks/ply8x/hotswap/halconf.h (renamed from keyboards/plywrks/ply8x/halconf.h)0
-rw-r--r--keyboards/plywrks/ply8x/hotswap/keyboard.json560
-rw-r--r--keyboards/plywrks/ply8x/hotswap/keymaps/default/keymap.c32
-rw-r--r--keyboards/plywrks/ply8x/hotswap/mcuconf.h (renamed from keyboards/plywrks/ply8x/mcuconf.h)0
-rw-r--r--keyboards/plywrks/ply8x/solder/config.h10
-rw-r--r--keyboards/plywrks/ply8x/solder/halconf.h8
-rw-r--r--keyboards/plywrks/ply8x/solder/keyboard.json (renamed from keyboards/plywrks/ply8x/keyboard.json)494
-rw-r--r--keyboards/plywrks/ply8x/solder/keymaps/default/keymap.c (renamed from keyboards/plywrks/ply8x/keymaps/default/keymap.c)0
-rw-r--r--keyboards/plywrks/ply8x/solder/mcuconf.h9
-rw-r--r--keyboards/rocketboard_16/keycode_lookup.c1
-rw-r--r--keyboards/splitography/keymaps/default/keymap.c4
-rw-r--r--keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c4
-rw-r--r--keyboards/splitography/keymaps/dvorak/keymap.c4
-rw-r--r--keyboards/system76/launch_1/launch_1.c3
-rw-r--r--keyboards/teleport/native/board.h8
-rw-r--r--keyboards/teleport/native/config.h3
-rw-r--r--keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/board.h8
-rw-r--r--keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h2
-rw-r--r--keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/board.h8
-rw-r--r--keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h2
-rw-r--r--keyboards/unicomp/pc122/overnumpad_1xb/board.h8
-rw-r--r--keyboards/unicomp/pc122/overnumpad_1xb/config.h2
-rw-r--r--keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/board.h8
-rw-r--r--keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h2
-rw-r--r--keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/board.h8
-rw-r--r--keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h2
-rw-r--r--keyboards/vitamins_included/rev2/rev2.c2
-rw-r--r--keyboards/werk_technica/one/board.h8
-rw-r--r--keyboards/werk_technica/one/config.h7
-rw-r--r--keyboards/wilba_tech/wt_main.c59
-rw-r--r--keyboards/wilba_tech/wt_mono_backlight.c2
-rw-r--r--keyboards/wilba_tech/wt_rgb_backlight.c2
-rw-r--r--keyboards/xelus/la_plus/rgb_matrix_kb.inc2
-rw-r--r--keyboards/xelus/rs108/board.h8
-rw-r--r--keyboards/xelus/rs108/config.h3
-rw-r--r--keyboards/xelus/rs60/rev2_0/board.h8
-rw-r--r--keyboards/xelus/rs60/rev2_0/config.h3
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev2_0/board.h8
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev2_0/config.h19
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev2_1/board.h8
-rw-r--r--keyboards/xelus/valor_frl_tkl/rev2_1/config.h19
167 files changed, 2966 insertions, 508 deletions
diff --git a/keyboards/nix_studio/lilith/config.h b/keyboards/akb/vero/board.h
index 225e6ac51b..2a370fe2e0 100644
--- a/keyboards/nix_studio/lilith/config.h
+++ b/keyboards/akb/vero/board.h
@@ -1,7 +1,8 @@
// Copyright 2022 Martin Arnstad (@arnstadm)
// SPDX-License-Identifier: GPL-2.0-or-later
-
#pragma once
-/* Set HSE clock since it differs from F411 default */
-#define STM32_HSECLK 16000000
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/akb/vero/config.h b/keyboards/akb/vero/config.h
deleted file mode 100644
index bb6d15d92c..0000000000
--- a/keyboards/akb/vero/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2022 Martin Arnstad (@arnstadm)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/* Set HSE clock since it differs from F411 default */
-#define STM32_HSECLK 16000000
diff --git a/keyboards/akko/5087/5087.c b/keyboards/akko/5087/5087.c
index 996f8c2585..27439c20ef 100644
--- a/keyboards/akko/5087/5087.c
+++ b/keyboards/akko/5087/5087.c
@@ -164,7 +164,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
if (record->event.pressed) {
set_single_persistent_default_layer(MAC_B);
keymap_config.no_gui = 0;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
case QK_RGB_MATRIX_TOGGLE:
diff --git a/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json
index 4a94d023d4..2fd99fb5ab 100644
--- a/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v1/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2",
+ "serial": {
+ "pin": "D2"
+ },
"matrix_pins": {
"right": {
"cols": ["C7", "B7", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json
index bc95061ced..51f6cedf51 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json
index cc990d3f21..cf800062b3 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json
index 6719b21196..d9039f7591 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json
index 2de77b07f0..ca48cc0f3c 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/keyboard.json
@@ -30,7 +30,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}
diff --git a/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
index dcc454366c..cef4eab72f 100644
--- a/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v1/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2",
+ "serial": {
+ "pin": "D2"
+ },
"matrix_pins": {
"right": {
"cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
index ce74b2dc6d..fdfd2c38f9 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
index 825508475c..650bf46481 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
index 4d9cfb616d..b2a4890f56 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
index 05d82b2445..a405395438 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/keyboard.json
@@ -30,7 +30,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}
diff --git a/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
index b90b144c8b..6b0caff82e 100644
--- a/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v1/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2",
+ "serial": {
+ "pin": "D2"
+ },
"matrix_pins": {
"right": {
"cols": ["F1", "C7", "B7", "D7", "E6", "B4"],
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
index 8ae66d083b..4163f9d476 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/elitec/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
index b0c98389f7..0da7d0b442 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
index 1e072db85b..026684eb92 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/keyboard.json
@@ -20,7 +20,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
index ab145e0f95..ed929f7fb7 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/keyboard.json
@@ -30,7 +30,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
index ac52a86eb5..366deac293 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
@@ -13,7 +13,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"processor": "RP2040",
"bootloader": "rp2040"
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
index 3c4c559cb6..e954f4f657 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
@@ -13,7 +13,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"processor": "RP2040",
"bootloader": "rp2040"
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keyboard.json b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json
index 12e336f023..3ae31d0b46 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keyboard.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json
@@ -14,7 +14,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1",
+ "serial": {
+ "pin": "GP1"
+ },
"bootmagic": {
"matrix": [4, 0]
},
diff --git a/keyboards/bastardkb/dilemma/4x6_4/keyboard.json b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json
index 7e40208a5d..4f0ea648c8 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/keyboard.json
+++ b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json
@@ -14,7 +14,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1",
+ "serial": {
+ "pin": "GP1"
+ },
"bootmagic": {
"matrix": [5, 0]
},
diff --git a/keyboards/bastardkb/scylla/v1/elitec/keyboard.json b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
index 17b6b7fc36..25963f006c 100644
--- a/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
@@ -22,7 +22,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/scylla/v2/elitec/keyboard.json b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
index 7bfb7ff5a4..316606b17b 100644
--- a/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
@@ -22,7 +22,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
index 2b9022d24e..2c0beb5c1d 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
@@ -19,7 +19,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
index cd4da3ac41..ed92be5a45 100644
--- a/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
@@ -19,7 +19,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
index 06bfeda7d2..80325bfea3 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json b/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json
index 2910d80b2f..3bbba6d310 100644
--- a/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json
@@ -22,7 +22,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json b/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json
index dec2537b65..43675db36d 100644
--- a/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json
@@ -22,7 +22,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json
index 897f195a31..32030dbd00 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json
@@ -19,7 +19,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json
index 06a93dfbeb..51227f5065 100644
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json
@@ -19,7 +19,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json b/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json
index 6dd86bcc12..2e9745b7f2 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json b/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json
index 59988074ba..5110ea0d74 100644
--- a/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json
+++ b/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json
@@ -22,7 +22,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json b/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json
index 01679bcff9..701ec6af28 100644
--- a/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json
+++ b/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json
@@ -22,7 +22,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json
index 2048db6251..15db3db6e8 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json
@@ -19,7 +19,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json
index 8dd21b7591..3936b9368a 100644
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json
+++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json
@@ -19,7 +19,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "GP1"
+ "serial": {
+ "pin": "GP1"
+ }
},
"ws2812": {
"pin": "GP0",
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json b/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json
index 41abba96cb..2cbee7fe17 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "A3"
+ "serial": {
+ "pin": "A3"
+ }
},
"development_board": "stemcell"
}
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
index 6f76582e4b..a410480d7d 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
@@ -53,10 +53,26 @@ void board_init(void) {
SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
}
+uint32_t read_custom_config(void *data, uint32_t offset, uint32_t length) {
+#ifdef VIA_ENABLE
+ return via_read_custom_config(data, offset, length);
+#else
+ return eeconfig_read_kb_datablock(data, offset, length);
+#endif
+}
+
+uint32_t write_custom_config(const void *data, uint32_t offset, uint32_t length) {
+#ifdef VIA_ENABLE
+ return via_update_custom_config(data, offset, length);
+#else
+ return eeconfig_update_kb_datablock(data, offset, length);
+#endif
+}
+
void keyboard_post_init_kb(void) {
/*
This is a workaround to some really weird behavior
- Without this code, the OLED will turn on, but not when you initially plug the keyboard in.
+ Without this code, the OLED will turn on, but not when you initially plug the keyboard in.
You have to manually trigger a user reset to get the OLED to initialize properly
I'm not sure what the root cause is at this time, but this workaround fixes it.
*/
@@ -74,11 +90,11 @@ void keyboard_post_init_kb(void) {
void custom_set_value(uint8_t *data) {
uint8_t *value_id = &(data[0]);
uint8_t *value_data = &(data[1]);
-
+
switch ( *value_id ) {
case id_oled_default_mode:
{
- eeprom_update_byte((uint8_t*)EEPROM_DEFAULT_OLED, value_data[0]);
+ write_custom_config(&value_data[0], EEPROM_DEFAULT_OLED_OFFSET, 1);
break;
}
case id_oled_mode:
@@ -92,7 +108,7 @@ void custom_set_value(uint8_t *data) {
uint8_t index = value_data[0];
uint8_t enable = value_data[1];
enabled_encoder_modes = (enabled_encoder_modes & ~(1<<index)) | (enable<<index);
- eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, enabled_encoder_modes);
+ write_custom_config(&enabled_encoder_modes, EEPROM_ENABLED_ENCODER_MODES_OFFSET, 1);
break;
}
case id_encoder_custom:
@@ -109,11 +125,12 @@ void custom_set_value(uint8_t *data) {
void custom_get_value(uint8_t *data) {
uint8_t *value_id = &(data[0]);
uint8_t *value_data = &(data[1]);
-
+
switch ( *value_id ) {
case id_oled_default_mode:
{
- uint8_t default_oled = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
+ uint8_t default_oled;
+ read_custom_config(&default_oled, EEPROM_DEFAULT_OLED_OFFSET, 1);
value_data[0] = default_oled;
break;
}
@@ -179,7 +196,6 @@ void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
}
#endif
-
void read_host_led_state(void) {
led_t led_state = host_keyboard_led_state();
if (led_state.num_lock) {
@@ -290,25 +306,25 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
void custom_config_reset(void){
- void *p = (void*)(VIA_EEPROM_CUSTOM_CONFIG_ADDR);
- void *end = (void*)(VIA_EEPROM_CUSTOM_CONFIG_ADDR+VIA_EEPROM_CUSTOM_CONFIG_SIZE);
- while ( p != end ) {
- eeprom_update_byte(p, 0);
- ++p;
+ for(int i = 0; i < VIA_EEPROM_CUSTOM_CONFIG_SIZE; ++i) {
+ uint8_t dummy = 0;
+ write_custom_config(&dummy, i, 1);
}
- eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, 0x1F);
+
+ uint8_t encoder_modes = 0x1F;
+ write_custom_config(&encoder_modes, EEPROM_ENABLED_ENCODER_MODES_OFFSET, 1);
}
void custom_config_load(void){
#ifdef DYNAMIC_KEYMAP_ENABLE
- oled_mode = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
- enabled_encoder_modes = eeprom_read_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES);
+ read_custom_config(&oled_mode, EEPROM_DEFAULT_OLED_OFFSET, 1);
+ read_custom_config(&enabled_encoder_modes, EEPROM_ENABLED_ENCODER_MODES_OFFSET, 1);
#endif
}
// Called from via_init() if VIA_ENABLE
// Called from matrix_init_kb() if not VIA_ENABLE
-void via_init_kb(void)
+void satisfaction_core_init(void)
{
// This checks both an EEPROM reset (from bootmagic lite, keycodes)
// and also firmware build date (from via_eeprom_is_valid())
@@ -326,8 +342,7 @@ void via_init_kb(void)
void matrix_init_kb(void)
{
#ifndef VIA_ENABLE
- via_init_kb();
- via_eeprom_set_valid(true);
+ satisfaction_core_init();
#endif // VIA_ENABLE
rtcGetTime(&RTCD1, &last_timespec);
@@ -335,6 +350,11 @@ void matrix_init_kb(void)
oled_request_wakeup();
}
+#ifdef VIA_ENABLE
+void via_init_kb(void) {
+ satisfaction_core_init();
+}
+#endif // VIA_ENABLE
void housekeeping_task_kb(void) {
rtcGetTime(&RTCD1, &last_timespec);
@@ -345,52 +365,3 @@ void housekeeping_task_kb(void) {
oled_request_repaint();
}
}
-
-//
-// In the case of VIA being disabled, we still need to check if
-// keyboard level EEPROM memory is valid before loading.
-// Thus these are copies of the same functions in VIA, since
-// the backlight settings reuse VIA's EEPROM magic/version,
-// and the ones in via.c won't be compiled in.
-//
-// Yes, this is sub-optimal, and is only here for completeness
-// (i.e. catering to the 1% of people that want wilba.tech LED bling
-// AND want persistent settings BUT DON'T want to use dynamic keymaps/VIA).
-//
-#ifndef VIA_ENABLE
-
-bool via_eeprom_is_valid(void)
-{
- char *p = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
- uint8_t magic0 = ( ( p[2] & 0x0F ) << 4 ) | ( p[3] & 0x0F );
- uint8_t magic1 = ( ( p[5] & 0x0F ) << 4 ) | ( p[6] & 0x0F );
- uint8_t magic2 = ( ( p[8] & 0x0F ) << 4 ) | ( p[9] & 0x0F );
-
- return (eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0 ) == magic0 &&
- eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1 ) == magic1 &&
- eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2 ) == magic2 );
-}
-
-// Sets VIA/keyboard level usage of EEPROM to valid/invalid
-// Keyboard level code (eg. via_init_kb()) should not call this
-void via_eeprom_set_valid(bool valid)
-{
- char *p = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
- uint8_t magic0 = ( ( p[2] & 0x0F ) << 4 ) | ( p[3] & 0x0F );
- uint8_t magic1 = ( ( p[5] & 0x0F ) << 4 ) | ( p[6] & 0x0F );
- uint8_t magic2 = ( ( p[8] & 0x0F ) << 4 ) | ( p[9] & 0x0F );
-
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0, valid ? magic0 : 0xFF);
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1, valid ? magic1 : 0xFF);
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2, valid ? magic2 : 0xFF);
-}
-
-void via_eeprom_reset(void)
-{
- // Set the VIA specific EEPROM state as invalid.
- via_eeprom_set_valid(false);
- // Set the TMK/QMK EEPROM state as invalid.
- eeconfig_disable();
-}
-
-#endif // VIA_ENABLE
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
index 70ee2a3fda..163aa27fad 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
@@ -6,12 +6,14 @@
#include <stdint.h>
#include <stdbool.h>
+#include <hal.h>
+
#include "via.h" // only for EEPROM address
#include "satisfaction_keycodes.h"
-#define EEPROM_ENABLED_ENCODER_MODES (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
-#define EEPROM_DEFAULT_OLED (VIA_EEPROM_CUSTOM_CONFIG_ADDR+1)
-#define EEPROM_CUSTOM_ENCODER (VIA_EEPROM_CUSTOM_CONFIG_ADDR+2)
+#define EEPROM_ENABLED_ENCODER_MODES_OFFSET 0
+#define EEPROM_DEFAULT_OLED_OFFSET 1
+#define EEPROM_CUSTOM_ENCODER_OFFSET 2
enum s75_keyboard_value_id {
id_encoder_modes = 1,
@@ -94,3 +96,6 @@ void oled_request_repaint(void);
bool oled_task_needs_to_repaint(void);
void custom_config_load(void);
+
+uint32_t read_custom_config(void *data, uint32_t offset, uint32_t length);
+uint32_t write_custom_config(const void *data, uint32_t offset, uint32_t length);
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
index 7e0b82e9e7..87ff87ea66 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
@@ -215,10 +215,13 @@ uint16_t handle_encoder_press(void){
uint16_t retrieve_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior){
#ifdef DYNAMIC_KEYMAP_ENABLE
- void* addr = (void*)(EEPROM_CUSTOM_ENCODER + (encoder_idx * 6) + (behavior * 2));
+ uint32_t offset = EEPROM_CUSTOM_ENCODER_OFFSET + (encoder_idx * 6) + (behavior * 2);
//big endian
- uint16_t keycode = eeprom_read_byte(addr) << 8;
- keycode |= eeprom_read_byte(addr + 1);
+ uint8_t hi, lo;
+ read_custom_config(&hi, offset+0, 1);
+ read_custom_config(&lo, offset+1, 1);
+ uint16_t keycode = hi << 8;
+ keycode |= lo;
return keycode;
#else
return 0;
@@ -227,8 +230,10 @@ uint16_t retrieve_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior){
void set_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior, uint16_t new_code){
#ifdef DYNAMIC_KEYMAP_ENABLE
- void* addr = (void*)(EEPROM_CUSTOM_ENCODER + (encoder_idx * 6) + (behavior * 2));
- eeprom_update_byte(addr, (uint8_t)(new_code >> 8));
- eeprom_update_byte(addr + 1, (uint8_t)(new_code & 0xFF));
+ uint32_t offset = EEPROM_CUSTOM_ENCODER_OFFSET + (encoder_idx * 6) + (behavior * 2);
+ uint8_t hi = new_code >> 8;
+ uint8_t lo = new_code & 0xFF;
+ write_custom_config(&hi, offset+0, 1);
+ write_custom_config(&lo, offset+1, 1);
#endif
}
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
index 0361453c52..815e84901d 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
@@ -8,7 +8,6 @@
#include "matrix.h"
#include "led.h"
#include "host.h"
-#include "oled_driver.h"
#include "progmem.h"
#include <stdio.h>
@@ -16,6 +15,7 @@ void draw_default(void);
void draw_clock(void);
#ifdef OLED_ENABLE
+#include "oled_driver.h"
oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_0; }
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index 969206b19a..28bc6b286a 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -42,4 +42,7 @@
// 6 for 3x custom encoder settings, left, right, and press (18 bytes)
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20
-
+// And if VIA isn't enabled, fall back to using standard QMK for configuration
+#ifndef VIA_ENABLE
+#define EECONFIG_KB_DATA_SIZE VIA_EEPROM_CUSTOM_CONFIG_SIZE
+#endif
diff --git a/keyboards/cannonkeys/satisfaction75_hs/config.h b/keyboards/cannonkeys/satisfaction75_hs/config.h
index 658babd3c0..26c3e4080c 100644
--- a/keyboards/cannonkeys/satisfaction75_hs/config.h
+++ b/keyboards/cannonkeys/satisfaction75_hs/config.h
@@ -40,5 +40,10 @@
// 6 for 3x custom encoder settings, left, right, and press (18 bytes)
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20
+// And if VIA isn't enabled, fall back to using standard QMK for configuration
+#ifndef VIA_ENABLE
+#define EECONFIG_KB_DATA_SIZE VIA_EEPROM_CUSTOM_CONFIG_SIZE
+#endif
+
// VIA lighting is handled by the keyboard-level code
#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c
index 0ccb9f6d3c..b15543e49e 100644
--- a/keyboards/cipulot/common/ec_board.c
+++ b/keyboards/cipulot/common/ec_board.c
@@ -36,7 +36,7 @@ void eeconfig_init_kb(void) {
}
}
// Write default value to EEPROM now
- eeconfig_update_kb_datablock(&eeprom_ec_config);
+ eeconfig_update_kb_datablock(&eeprom_ec_config, 0, EECONFIG_KB_DATA_SIZE);
eeconfig_init_user();
}
@@ -44,7 +44,7 @@ void eeconfig_init_kb(void) {
// On Keyboard startup
void keyboard_post_init_kb(void) {
// Read custom menu variables from memory
- eeconfig_read_kb_datablock(&eeprom_ec_config);
+ eeconfig_read_kb_datablock(&eeprom_ec_config, 0, EECONFIG_KB_DATA_SIZE);
// Set runtime values to EEPROM values
ec_config.actuation_mode = eeprom_ec_config.actuation_mode;
diff --git a/keyboards/cipulot/common/eeprom_tools.h b/keyboards/cipulot/common/eeprom_tools.h
deleted file mode 100644
index b3c90d8759..0000000000
--- a/keyboards/cipulot/common/eeprom_tools.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "eeprom.h"
-
-#if (EECONFIG_KB_DATA_SIZE) > 0
-# define EEPROM_KB_PARTIAL_UPDATE(__struct, __field) eeprom_update_block(&(__struct.__field), (void *)((void *)(EECONFIG_KB_DATABLOCK) + offsetof(typeof(__struct), __field)), sizeof(__struct.__field))
-#endif
-
-#if (EECONFIG_USER_DATA_SIZE) > 0
-# define EEPROM_USER_PARTIAL_UPDATE(__struct, __field) eeprom_update_block(&(__struct.__field), (void *)((void *)(EECONFIG_USER_DATABLOCK) + offsetof(typeof(__struct), __field)), sizeof(__struct.__field))
-#endif
diff --git a/keyboards/cipulot/common/via_ec.c b/keyboards/cipulot/common/via_ec.c
index ed34a579b2..7be6edd026 100644
--- a/keyboards/cipulot/common/via_ec.c
+++ b/keyboards/cipulot/common/via_ec.c
@@ -13,7 +13,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "eeprom_tools.h"
#include "ec_switch_matrix.h"
#include "action.h"
#include "print.h"
@@ -73,7 +72,7 @@ void via_config_set_value(uint8_t *data) {
uprintf("# Actuation Mode: Rapid Trigger #\n");
uprintf("#################################\n");
}
- EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode);
+ eeconfig_update_kb_datablock_field(eeprom_ec_config, actuation_mode);
break;
}
case id_mode_0_actuation_threshold: {
@@ -293,7 +292,7 @@ void ec_save_threshold_data(uint8_t option) {
ec_rescale_values(3);
ec_rescale_values(4);
}
- eeconfig_update_kb_datablock(&eeprom_ec_config);
+ eeconfig_update_kb_datablock(&eeprom_ec_config, 0, EECONFIG_KB_DATA_SIZE);
uprintf("####################################\n");
uprintf("# New thresholds applied and saved #\n");
uprintf("####################################\n");
@@ -321,7 +320,7 @@ void ec_save_bottoming_reading(void) {
ec_rescale_values(2);
ec_rescale_values(3);
ec_rescale_values(4);
- eeconfig_update_kb_datablock(&eeprom_ec_config);
+ eeconfig_update_kb_datablock(&eeprom_ec_config, 0, EECONFIG_KB_DATA_SIZE);
}
// Show the calibration data
diff --git a/keyboards/cipulot/ec_980c/ec_980c.c b/keyboards/cipulot/ec_980c/ec_980c.c
index eaa636ede6..7a2062a4e4 100644
--- a/keyboards/cipulot/ec_980c/ec_980c.c
+++ b/keyboards/cipulot/ec_980c/ec_980c.c
@@ -44,7 +44,7 @@ void eeconfig_init_kb(void) {
}
}
// Write default value to EEPROM now
- eeconfig_update_kb_datablock(&eeprom_ec_config);
+ eeconfig_update_kb_datablock(&eeprom_ec_config, 0, EECONFIG_KB_DATA_SIZE);
eeconfig_init_user();
}
@@ -52,7 +52,7 @@ void eeconfig_init_kb(void) {
// On Keyboard startup
void keyboard_post_init_kb(void) {
// Read custom menu variables from memory
- eeconfig_read_kb_datablock(&eeprom_ec_config);
+ eeconfig_read_kb_datablock(&eeprom_ec_config, 0, EECONFIG_KB_DATA_SIZE);
// Set runtime values to EEPROM values
ec_config.actuation_mode = eeprom_ec_config.actuation_mode;
diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c
index d4241f66f1..31616afc02 100644
--- a/keyboards/cipulot/ec_typek/ec_typek.c
+++ b/keyboards/cipulot/ec_typek/ec_typek.c
@@ -44,7 +44,7 @@ void eeconfig_init_kb(void) {
}
}
// Write default value to EEPROM now
- eeconfig_update_kb_datablock(&eeprom_ec_config);
+ eeconfig_update_kb_datablock(&eeprom_ec_config, 0, EECONFIG_KB_DATA_SIZE);
eeconfig_init_user();
}
@@ -52,7 +52,7 @@ void eeconfig_init_kb(void) {
// On Keyboard startup
void keyboard_post_init_kb(void) {
// Read custom menu variables from memory
- eeconfig_read_kb_datablock(&eeprom_ec_config);
+ eeconfig_read_kb_datablock(&eeprom_ec_config, 0, EECONFIG_KB_DATA_SIZE);
// Set runtime values to EEPROM values
ec_config.actuation_mode = eeprom_ec_config.actuation_mode;
diff --git a/keyboards/contra/keymaps/default/keymap.c b/keyboards/contra/keymaps/default/keymap.c
index 415e22e81a..645005769a 100644
--- a/keyboards/contra/keymaps/default/keymap.c
+++ b/keyboards/contra/keymaps/default/keymap.c
@@ -222,9 +222,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
break;
diff --git a/keyboards/dm9records/plaid/keymaps/default/keymap.c b/keyboards/dm9records/plaid/keymaps/default/keymap.c
index 0d8d24c575..3ee327f65e 100644
--- a/keyboards/dm9records/plaid/keymaps/default/keymap.c
+++ b/keyboards/dm9records/plaid/keymaps/default/keymap.c
@@ -311,9 +311,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
break;
diff --git a/keyboards/handwired/dactyl_cc/keyboard.json b/keyboards/handwired/dactyl_cc/keyboard.json
index e607bfad1a..f4097b0487 100644
--- a/keyboards/handwired/dactyl_cc/keyboard.json
+++ b/keyboards/handwired/dactyl_cc/keyboard.json
@@ -23,7 +23,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"development_board": "promicro",
"layouts": {
diff --git a/keyboards/handwired/dactyl_kinesis/keyboard.json b/keyboards/handwired/dactyl_kinesis/keyboard.json
index ee68a2c515..26993fc974 100644
--- a/keyboards/handwired/dactyl_kinesis/keyboard.json
+++ b/keyboards/handwired/dactyl_kinesis/keyboard.json
@@ -29,7 +29,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"development_board": "promicro",
"layouts": {
diff --git a/keyboards/handwired/dactyl_lightcycle/keyboard.json b/keyboards/handwired/dactyl_lightcycle/keyboard.json
index 1b5f2dd39a..6e56b18f6f 100644
--- a/keyboards/handwired/dactyl_lightcycle/keyboard.json
+++ b/keyboards/handwired/dactyl_lightcycle/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"development_board": "promicro",
"community_layouts": ["split_3x6_3", "split_3x5_3"],
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
index e0a1b531a5..ce4b6c648b 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
@@ -35,7 +35,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
index 7efc4718ad..134793cac8 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
@@ -29,7 +29,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"development_board": "promicro",
"layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
index d589c532a8..0d8af5eed1 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
@@ -35,7 +35,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json
index c0c24a8966..1846f2a661 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json
@@ -32,7 +32,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"development_board": "promicro",
"layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
index 47ad7aa920..ab916b0353 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
@@ -35,7 +35,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
index 353b148126..1bcba1b648 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
@@ -35,7 +35,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
index 620ffdec06..7a0cff5e6c 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
@@ -29,7 +29,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0",
+ "serial": {
+ "pin": "D0"
+ },
"bootmagic": {
"matrix": [6, 5]
}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
index fc7676aa4b..0694447ee9 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
@@ -29,7 +29,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0",
+ "serial": {
+ "pin": "D0"
+ },
"bootmagic": {
"matrix": [6, 5]
}
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
index 974f1b8bc3..ae73995d49 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
@@ -29,7 +29,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D3"
+ "serial": {
+ "pin": "D3"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json b/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json
index 5b6bdfb86e..7d51a06c7c 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json
@@ -25,7 +25,9 @@
},
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keyboard.json b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
index d40a45dfa7..cf5f579057 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
@@ -35,7 +35,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
index 213a3c29f5..44ae441270 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
@@ -6,7 +6,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"rgblight": {
"led_count": 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
index 98e96c9639..a011a2cc3b 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
@@ -35,7 +35,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keyboard.json b/keyboards/handwired/dactyl_manuform/6x7/keyboard.json
index 153b6c75c4..bb016647da 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/keyboard.json
@@ -32,7 +32,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"rgblight": {
"led_count": 12
diff --git a/keyboards/handwired/dactyl_maximus/keyboard.json b/keyboards/handwired/dactyl_maximus/keyboard.json
index 081fab571a..57e91cc3f4 100644
--- a/keyboards/handwired/dactyl_maximus/keyboard.json
+++ b/keyboards/handwired/dactyl_maximus/keyboard.json
@@ -26,7 +26,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D1"
+ "serial": {
+ "pin": "D1"
+ }
},
"development_board": "promicro",
"layouts": {
diff --git a/keyboards/handwired/dactyl_minidox/keyboard.json b/keyboards/handwired/dactyl_minidox/keyboard.json
index 5bd5c5c05a..b488bac4b0 100644
--- a/keyboards/handwired/dactyl_minidox/keyboard.json
+++ b/keyboards/handwired/dactyl_minidox/keyboard.json
@@ -67,7 +67,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"development_board": "promicro",
"community_layouts": ["split_3x5_3"],
diff --git a/keyboards/handwired/dactyl_promicro/keyboard.json b/keyboards/handwired/dactyl_promicro/keyboard.json
index 824ffe7e7e..df82505d94 100644
--- a/keyboards/handwired/dactyl_promicro/keyboard.json
+++ b/keyboards/handwired/dactyl_promicro/keyboard.json
@@ -29,7 +29,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"rgblight": {
"led_count": 12
diff --git a/keyboards/handwired/dactyl_rah/keyboard.json b/keyboards/handwired/dactyl_rah/keyboard.json
index 3bc5dc0854..903aafc973 100644
--- a/keyboards/handwired/dactyl_rah/keyboard.json
+++ b/keyboards/handwired/dactyl_rah/keyboard.json
@@ -29,7 +29,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/dactyl_tracer/keyboard.json b/keyboards/handwired/dactyl_tracer/keyboard.json
index 29e5990666..92a8a2c76b 100644
--- a/keyboards/handwired/dactyl_tracer/keyboard.json
+++ b/keyboards/handwired/dactyl_tracer/keyboard.json
@@ -24,7 +24,9 @@
"development_board": "promicro",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"layouts": {
"LAYOUT" : {
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json b/keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json
index 8308506512..d40ef0210b 100644
--- a/keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json
@@ -43,114 +43,233 @@
"tapping": {
"toggle": 2
},
+ "community_layouts": ["fullsize_ansi", "fullsize_iso"],
"layouts": {
+ "LAYOUT_fullsize_ansi": {
+ "layout": [
+ {"matrix": [5, 16], "x": 0, "y": 0},
+ {"matrix": [2, 4], "x": 2, "y": 0},
+ {"matrix": [2, 5], "x": 3, "y": 0},
+ {"matrix": [3, 5], "x": 4, "y": 0},
+ {"matrix": [5, 5], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6.5, "y": 0},
+ {"matrix": [5, 8], "x": 7.5, "y": 0},
+ {"matrix": [3, 3], "x": 8.5, "y": 0},
+ {"matrix": [2, 3], "x": 9.5, "y": 0},
+ {"matrix": [2, 2], "x": 11, "y": 0},
+ {"matrix": [0, 2], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [6, 2], "x": 14, "y": 0},
+ {"matrix": [0, 0], "x": 15.25, "y": 0},
+ {"matrix": [1, 0], "x": 16.25, "y": 0},
+ {"matrix": [1, 1], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 16], "x": 0, "y": 1.25},
+ {"matrix": [0, 16], "x": 1, "y": 1.25},
+ {"matrix": [0, 4], "x": 2, "y": 1.25},
+ {"matrix": [0, 5], "x": 3, "y": 1.25},
+ {"matrix": [0, 6], "x": 4, "y": 1.25},
+ {"matrix": [2, 6], "x": 5, "y": 1.25},
+ {"matrix": [2, 7], "x": 6, "y": 1.25},
+ {"matrix": [0, 7], "x": 7, "y": 1.25},
+ {"matrix": [0, 8], "x": 8, "y": 1.25},
+ {"matrix": [0, 3], "x": 9, "y": 1.25},
+ {"matrix": [0, 9], "x": 10, "y": 1.25},
+ {"matrix": [2, 9], "x": 11, "y": 1.25},
+ {"matrix": [2, 8], "x": 12, "y": 1.25},
+ {"matrix": [3, 2], "w": 2, "x": 13, "y": 1.25},
+ {"matrix": [2, 11], "x": 15.25, "y": 1.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [2, 14], "x": 17.25, "y": 1.25},
+ {"matrix": [4, 10], "x": 18.5, "y": 1.25},
+ {"matrix": [4, 11], "x": 19.5, "y": 1.25},
+ {"matrix": [4, 14], "x": 20.5, "y": 1.25},
+ {"matrix": [6, 14], "x": 21.5, "y": 1.25},
+
+ {"matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25},
+ {"matrix": [1, 16], "x": 1.5, "y": 2.25},
+ {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+ {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+ {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+ {"matrix": [3, 6], "x": 5.5, "y": 2.25},
+ {"matrix": [3, 7], "x": 6.5, "y": 2.25},
+ {"matrix": [1, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [1, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [1, 3], "x": 9.5, "y": 2.25},
+ {"matrix": [1, 9], "x": 10.5, "y": 2.25},
+ {"matrix": [3, 9], "x": 11.5, "y": 2.25},
+ {"matrix": [3, 8], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 2], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 10], "x": 15.25, "y": 2.25},
+ {"matrix": [0, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [0, 14], "x": 17.25, "y": 2.25},
+ {"matrix": [1, 10], "x": 18.5, "y": 2.25},
+ {"matrix": [1, 11], "x": 19.5, "y": 2.25},
+ {"matrix": [1, 14], "x": 20.5, "y": 2.25},
+ {"matrix": [1, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+ {"matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25},
+ {"matrix": [7, 16], "x": 1.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 3.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 4.75, "y": 3.25},
+ {"matrix": [5, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [5, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [7, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+ {"matrix": [7, 9], "x": 10.75, "y": 3.25},
+ {"matrix": [5, 9], "x": 11.75, "y": 3.25},
+ {"matrix": [4, 2], "w": 2.25, "x": 12.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 18.5, "y": 3.25},
+ {"matrix": [3, 11], "x": 19.5, "y": 3.25},
+ {"matrix": [3, 14], "x": 20.5, "y": 3.25},
+
+ {"matrix": [3, 13], "w": 2.25, "x": 0, "y": 4.25},
+ {"matrix": [4, 16], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 5.25, "y": 4.25},
+ {"matrix": [6, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [6, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 10.25, "y": 4.25},
+ {"matrix": [6, 9], "x": 11.25, "y": 4.25},
+ {"matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 4.25},
+ {"matrix": [7, 10], "x": 18.5, "y": 4.25},
+ {"matrix": [7, 11], "x": 19.5, "y": 4.25},
+ {"matrix": [7, 14], "x": 20.5, "y": 4.25},
+ {"matrix": [7, 15], "x": 21.5, "y": 4.25, "h": 2},
+
+ {"matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25},
+ {"matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25},
+ {"matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25},
+ {"matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25},
+ {"matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25},
+ {"matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25},
+ {"matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25},
+ {"matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25},
+ {"matrix": [6, 15], "x": 15.25, "y": 5.25},
+ {"matrix": [6, 10], "x": 16.25, "y": 5.25},
+ {"matrix": [6, 11], "x": 17.25, "y": 5.25},
+ {"matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25},
+ {"matrix": [5, 14], "x": 20.5, "y": 5.25}
+ ]
+ },
"LAYOUT_fullsize_iso": {
"layout": [
- {"label": "Esc", "matrix": [5, 16], "x": 0, "y": 0},
- {"label": "F1", "matrix": [2, 4], "x": 2, "y": 0},
- {"label": "F2", "matrix": [2, 5], "x": 3, "y": 0},
- {"label": "F3", "matrix": [3, 5], "x": 4, "y": 0},
- {"label": "F4", "matrix": [5, 5], "x": 5, "y": 0},
- {"label": "F5", "matrix": [0, 1], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [5, 8], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [3, 3], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [2, 3], "x": 9.5, "y": 0},
- {"label": "F9", "matrix": [2, 2], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 2], "x": 12, "y": 0},
- {"label": "F11", "matrix": [5, 2], "x": 13, "y": 0},
- {"label": "F12", "matrix": [6, 2], "x": 14, "y": 0},
- {"label": "Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0},
- {"label": "Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0},
- {"label": "Pause", "matrix": [1, 1], "x": 17.25, "y": 0},
- {"label": "`", "matrix": [2, 16], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [0, 16], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [0, 4], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [0, 5], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [0, 6], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [2, 6], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [2, 7], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [0, 3], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [0, 9], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [2, 9], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25},
- {"label": "Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25},
- {"label": "Home", "matrix": [2, 15], "x": 16.25, "y": 1.25},
- {"label": "Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25},
- {"label": "Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25},
- {"label": "/", "matrix": [4, 11], "x": 19.5, "y": 1.25},
- {"label": "*", "matrix": [4, 14], "x": 20.5, "y": 1.25},
- {"label": "-", "matrix": [6, 14], "x": 21.5, "y": 1.25},
- {"label": "Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25},
- {"label": "Q", "matrix": [1, 16], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [3, 6], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [3, 7], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [1, 3], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [1, 9], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [3, 9], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [3, 8], "x": 12.5, "y": 2.25},
- {"label": "Del", "matrix": [2, 10], "x": 15.25, "y": 2.25},
- {"label": "End", "matrix": [0, 15], "x": 16.25, "y": 2.25},
- {"label": "Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25},
- {"label": "7", "matrix": [1, 10], "x": 18.5, "y": 2.25},
- {"label": "8", "matrix": [1, 11], "x": 19.5, "y": 2.25},
- {"label": "9", "matrix": [1, 14], "x": 20.5, "y": 2.25},
- {"label": "+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25},
- {"label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25},
- {"label": "A", "matrix": [7, 16], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [7, 4], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [7, 5], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [7, 6], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [7, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [7, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [7, 3], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [7, 9], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [5, 9], "x": 11.75, "y": 3.25},
- {"label": "#", "matrix": [1, 2], "x": 12.75, "y": 3.25},
- {"label": "Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25},
- {"label": "4", "matrix": [3, 10], "x": 18.5, "y": 3.25},
- {"label": "5", "matrix": [3, 11], "x": 19.5, "y": 3.25},
- {"label": "6", "matrix": [3, 14], "x": 20.5, "y": 3.25},
- {"label": "Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25},
- {"label": "\\", "matrix": [5, 4], "x": 1.25, "y": 4.25},
- {"label": "Z", "matrix": [4, 16], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 4], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 5], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 6], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [6, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [6, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 3], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [6, 9], "x": 11.25, "y": 4.25},
- {"label": "Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25},
- {"label": "Up", "matrix": [5, 15], "x": 16.25, "y": 4.25},
- {"label": "1", "matrix": [7, 10], "x": 18.5, "y": 4.25},
- {"label": "2", "matrix": [7, 11], "x": 19.5, "y": 4.25},
- {"label": "3", "matrix": [7, 14], "x": 20.5, "y": 4.25},
- {"label": "Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25},
- {"label": "Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25},
- {"label": "Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25},
- {"label": "Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25},
- {"label": " ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25},
- {"label": "Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25},
- {"label": "Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25},
- {"label": "Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25},
- {"label": "Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25},
- {"label": "Left", "matrix": [6, 15], "x": 15.25, "y": 5.25},
- {"label": "Down", "matrix": [6, 10], "x": 16.25, "y": 5.25},
- {"label": "Right", "matrix": [6, 11], "x": 17.25, "y": 5.25},
- {"label": "0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25},
- {"label": "Del", "matrix": [5, 14], "x": 20.5, "y": 5.25}
+ {"matrix": [5, 16], "x": 0, "y": 0},
+ {"matrix": [2, 4], "x": 2, "y": 0},
+ {"matrix": [2, 5], "x": 3, "y": 0},
+ {"matrix": [3, 5], "x": 4, "y": 0},
+ {"matrix": [5, 5], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6.5, "y": 0},
+ {"matrix": [5, 8], "x": 7.5, "y": 0},
+ {"matrix": [3, 3], "x": 8.5, "y": 0},
+ {"matrix": [2, 3], "x": 9.5, "y": 0},
+ {"matrix": [2, 2], "x": 11, "y": 0},
+ {"matrix": [0, 2], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [6, 2], "x": 14, "y": 0},
+ {"matrix": [0, 0], "x": 15.25, "y": 0},
+ {"matrix": [1, 0], "x": 16.25, "y": 0},
+ {"matrix": [1, 1], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 16], "x": 0, "y": 1.25},
+ {"matrix": [0, 16], "x": 1, "y": 1.25},
+ {"matrix": [0, 4], "x": 2, "y": 1.25},
+ {"matrix": [0, 5], "x": 3, "y": 1.25},
+ {"matrix": [0, 6], "x": 4, "y": 1.25},
+ {"matrix": [2, 6], "x": 5, "y": 1.25},
+ {"matrix": [2, 7], "x": 6, "y": 1.25},
+ {"matrix": [0, 7], "x": 7, "y": 1.25},
+ {"matrix": [0, 8], "x": 8, "y": 1.25},
+ {"matrix": [0, 3], "x": 9, "y": 1.25},
+ {"matrix": [0, 9], "x": 10, "y": 1.25},
+ {"matrix": [2, 9], "x": 11, "y": 1.25},
+ {"matrix": [2, 8], "x": 12, "y": 1.25},
+ {"matrix": [3, 2], "w": 2, "x": 13, "y": 1.25},
+ {"matrix": [2, 11], "x": 15.25, "y": 1.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [2, 14], "x": 17.25, "y": 1.25},
+ {"matrix": [4, 10], "x": 18.5, "y": 1.25},
+ {"matrix": [4, 11], "x": 19.5, "y": 1.25},
+ {"matrix": [4, 14], "x": 20.5, "y": 1.25},
+ {"matrix": [6, 14], "x": 21.5, "y": 1.25},
+
+ {"matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25},
+ {"matrix": [1, 16], "x": 1.5, "y": 2.25},
+ {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+ {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+ {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+ {"matrix": [3, 6], "x": 5.5, "y": 2.25},
+ {"matrix": [3, 7], "x": 6.5, "y": 2.25},
+ {"matrix": [1, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [1, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [1, 3], "x": 9.5, "y": 2.25},
+ {"matrix": [1, 9], "x": 10.5, "y": 2.25},
+ {"matrix": [3, 9], "x": 11.5, "y": 2.25},
+ {"matrix": [3, 8], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 15.25, "y": 2.25},
+ {"matrix": [0, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [0, 14], "x": 17.25, "y": 2.25},
+ {"matrix": [1, 10], "x": 18.5, "y": 2.25},
+ {"matrix": [1, 11], "x": 19.5, "y": 2.25},
+ {"matrix": [1, 14], "x": 20.5, "y": 2.25},
+ {"matrix": [1, 15], "x": 21.5, "y": 2.25, "h": 2},
+
+ {"matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25},
+ {"matrix": [7, 16], "x": 1.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 3.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 4.75, "y": 3.25},
+ {"matrix": [5, 6], "x": 5.75, "y": 3.25},
+ {"matrix": [5, 7], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [7, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+ {"matrix": [7, 9], "x": 10.75, "y": 3.25},
+ {"matrix": [5, 9], "x": 11.75, "y": 3.25},
+ {"matrix": [1, 2], "x": 12.75, "y": 3.25},
+ {"matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25, "h": 2},
+ {"matrix": [3, 10], "x": 18.5, "y": 3.25},
+ {"matrix": [3, 11], "x": 19.5, "y": 3.25},
+ {"matrix": [3, 14], "x": 20.5, "y": 3.25},
+
+ {"matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25},
+ {"matrix": [5, 4], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 16], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 5.25, "y": 4.25},
+ {"matrix": [6, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [6, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 10.25, "y": 4.25},
+ {"matrix": [6, 9], "x": 11.25, "y": 4.25},
+ {"matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 4.25},
+ {"matrix": [7, 10], "x": 18.5, "y": 4.25},
+ {"matrix": [7, 11], "x": 19.5, "y": 4.25},
+ {"matrix": [7, 14], "x": 20.5, "y": 4.25},
+ {"matrix": [7, 15], "x": 21.5, "y": 4.25, "h": 2},
+
+ {"matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25},
+ {"matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25},
+ {"matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25},
+ {"matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25},
+ {"matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25},
+ {"matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25},
+ {"matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25},
+ {"matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25},
+ {"matrix": [6, 15], "x": 15.25, "y": 5.25},
+ {"matrix": [6, 10], "x": 16.25, "y": 5.25},
+ {"matrix": [6, 11], "x": 17.25, "y": 5.25},
+ {"matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25},
+ {"matrix": [5, 14], "x": 20.5, "y": 5.25}
]
}
}
diff --git a/keyboards/handwired/jankrp2040dactyl/keyboard.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json
index 0d155a70bd..485da14b66 100644
--- a/keyboards/handwired/jankrp2040dactyl/keyboard.json
+++ b/keyboards/handwired/jankrp2040dactyl/keyboard.json
@@ -6,9 +6,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "GP0",
"serial": {
- "driver": "vendor"
+ "driver": "vendor",
+ "pin": "GP0"
}
},
diff --git a/keyboards/handwired/onekey/keymaps/battery/config.h b/keyboards/handwired/onekey/keymaps/battery/config.h
new file mode 100644
index 0000000000..8a1c05d436
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/battery/config.h
@@ -0,0 +1,6 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define BATTERY_PIN ADC_PIN
diff --git a/keyboards/handwired/onekey/keymaps/battery/keymap.c b/keyboards/handwired/onekey/keymaps/battery/keymap.c
new file mode 100644
index 0000000000..74191e83fc
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/battery/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "battery.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ LAYOUT_ortho_1x1(KC_A)
+};
+
+void keyboard_post_init_user(void) {
+ // Customise these values to desired behaviour
+ debug_enable=true;
+// debug_matrix=false;
+// debug_keyboard=true;
+// debug_mouse=false;
+
+ battery_init();
+}
+
+void housekeeping_task_user(void) {
+ static uint32_t last = 0;
+ if (timer_elapsed32(last) > 2000) {
+ uprintf("Bat: %d!\n", battery_get_percent());
+
+ last = timer_read32();
+ }
+}
diff --git a/keyboards/handwired/onekey/keymaps/battery/keymap.json b/keyboards/handwired/onekey/keymaps/battery/keymap.json
new file mode 100644
index 0000000000..c641dfe773
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/battery/keymap.json
@@ -0,0 +1,7 @@
+{
+ "config": {
+ "features": {
+ "console": true
+ }
+ }
+}
diff --git a/keyboards/handwired/onekey/keymaps/battery/rules.mk b/keyboards/handwired/onekey/keymaps/battery/rules.mk
new file mode 100644
index 0000000000..06908179ae
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/battery/rules.mk
@@ -0,0 +1 @@
+BATTERY_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/onekey/keymaps/via_ci/config.h b/keyboards/handwired/onekey/keymaps/via_ci/config.h
new file mode 100644
index 0000000000..ec6f1e1ec0
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/via_ci/config.h
@@ -0,0 +1,4 @@
+// Copyright 2025 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#define TRANSIENT_EEPROM_SIZE 160
diff --git a/keyboards/handwired/onekey/keymaps/via_ci/keymap.c b/keyboards/handwired/onekey/keymaps/via_ci/keymap.c
new file mode 100644
index 0000000000..8261fc6329
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/via_ci/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2025 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+ KC_HELLO = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ LAYOUT_ortho_1x1(KC_HELLO)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch (keycode) {
+ case KC_HELLO:
+ if (record->event.pressed) {
+ send_string_P("Hello world!");
+ }
+ return false;
+ }
+ return true;
+}
+
+void keyboard_post_init_user(void) {
+ // Customise these values to desired behaviour
+ debug_enable=true;
+ debug_matrix=true;
+ //debug_keyboard=true;
+ //debug_mouse=true;
+}
diff --git a/keyboards/handwired/onekey/keymaps/via_ci/keymap.json b/keyboards/handwired/onekey/keymaps/via_ci/keymap.json
new file mode 100644
index 0000000000..edb78b5742
--- /dev/null
+++ b/keyboards/handwired/onekey/keymaps/via_ci/keymap.json
@@ -0,0 +1,7 @@
+{
+ "config": {
+ "features": {
+ "via": true
+ }
+ }
+}
diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk
new file mode 100644
index 0000000000..d5978ba6f5
--- /dev/null
+++ b/keyboards/handwired/onekey/teensy_32/rules.mk
@@ -0,0 +1 @@
+EEPROM_DRIVER = transient
diff --git a/keyboards/handwired/onekey/teensy_lc/rules.mk b/keyboards/handwired/onekey/teensy_lc/rules.mk
index abd2f7fce9..d1a53e95d7 100644
--- a/keyboards/handwired/onekey/teensy_lc/rules.mk
+++ b/keyboards/handwired/onekey/teensy_lc/rules.mk
@@ -1,2 +1,2 @@
USE_CHIBIOS_CONTRIB = yes
-
+EEPROM_DRIVER = transient
diff --git a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
index fc43167211..47f731c2c9 100644
--- a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
@@ -182,9 +182,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
break;
diff --git a/keyboards/handwired/skakunm_dactyl/keyboard.json b/keyboards/handwired/skakunm_dactyl/keyboard.json
index cc6f70b482..5d87f23f7b 100644
--- a/keyboards/handwired/skakunm_dactyl/keyboard.json
+++ b/keyboards/handwired/skakunm_dactyl/keyboard.json
@@ -29,7 +29,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/splittest/promicro/keyboard.json b/keyboards/handwired/splittest/promicro/keyboard.json
index 8aca1c3de7..93f09a47ca 100644
--- a/keyboards/handwired/splittest/promicro/keyboard.json
+++ b/keyboards/handwired/splittest/promicro/keyboard.json
@@ -8,7 +8,9 @@
"handedness": {
"pin": "F6"
},
- "soft_serial_pin": "D1"
+ "serial": {
+ "pin": "D1"
+ }
},
"ws2812": {
"pin": "D3"
diff --git a/keyboards/handwired/splittest/teensy_2/keyboard.json b/keyboards/handwired/splittest/teensy_2/keyboard.json
index c10b20a173..78d6c5f9a3 100644
--- a/keyboards/handwired/splittest/teensy_2/keyboard.json
+++ b/keyboards/handwired/splittest/teensy_2/keyboard.json
@@ -8,7 +8,9 @@
"handedness": {
"pin": "F0"
},
- "soft_serial_pin": "D1"
+ "serial": {
+ "pin": "D1"
+ }
},
"ws2812": {
"pin": "D3"
diff --git a/keyboards/handwired/symmetric70_proto/promicro/info.json b/keyboards/handwired/symmetric70_proto/promicro/info.json
index f143f518eb..43ecb4c1c0 100644
--- a/keyboards/handwired/symmetric70_proto/promicro/info.json
+++ b/keyboards/handwired/symmetric70_proto/promicro/info.json
@@ -12,7 +12,9 @@
}
},
"split": {
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina"
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
index e5730a4586..37633e5a56 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
@@ -22,7 +22,9 @@
"handedness": {
"pin": "A6"
},
- "soft_serial_pin": "D3",
+ "serial": {
+ "pin": "D3"
+ },
"bootmagic": {
"matrix": [4, 5]
}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
index df810f2881..bd4c41e17b 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
@@ -6,7 +6,9 @@
},
"diode_direction": "COL2ROW",
"split": {
- "soft_serial_pin": "D0",
+ "serial": {
+ "pin": "D0"
+ },
"matrix_pins": {
"right": {
"cols": ["D6", "D7", "B4", "D3", "C6", "C7"],
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
index e6c0e42bde..739aad07ba 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
@@ -11,7 +11,9 @@
]
},
"split": {
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"ws2812": {
"pin": "D3"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json
index a131ac085b..5a091996b6 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json
@@ -11,7 +11,9 @@
]
},
"split": {
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"ws2812": {
"pin": "E7"
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index d4fabc756e..7909bb0b30 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -10,7 +10,9 @@
},
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"tapping": {
"term": 100
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index fd829782c0..a8bdb23e41 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -15,7 +15,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D2",
+ "serial": {
+ "pin": "D2"
+ },
"transport": {
"sync": {
"indicators": true,
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index ded22bbe93..7502ad0552 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -32,7 +32,7 @@ void set_mac_mode_kb(bool macmode) {
* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81
*/
keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = !macmode;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
void matrix_init_kb(void) {
diff --git a/keyboards/helix/rev3_4rows/keyboard.json b/keyboards/helix/rev3_4rows/keyboard.json
index 5e9fd2dcd8..537c332d5c 100644
--- a/keyboards/helix/rev3_4rows/keyboard.json
+++ b/keyboards/helix/rev3_4rows/keyboard.json
@@ -33,7 +33,9 @@
},
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"ws2812": {
"pin": "D3"
diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.c b/keyboards/helix/rev3_4rows/rev3_4rows.c
index ff61027a96..7f655b6852 100644
--- a/keyboards/helix/rev3_4rows/rev3_4rows.c
+++ b/keyboards/helix/rev3_4rows/rev3_4rows.c
@@ -27,7 +27,7 @@ void set_mac_mode(bool macmode) {
* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81
*/
keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = !macmode;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
#ifdef DIP_SWITCH_ENABLE
diff --git a/keyboards/helix/rev3_5rows/keyboard.json b/keyboards/helix/rev3_5rows/keyboard.json
index b61db7df86..485cfd924f 100644
--- a/keyboards/helix/rev3_5rows/keyboard.json
+++ b/keyboards/helix/rev3_5rows/keyboard.json
@@ -99,7 +99,9 @@
},
"split": {
"enabled": true,
- "soft_serial_pin": "D2"
+ "serial": {
+ "pin": "D2"
+ }
},
"ws2812": {
"pin": "D3"
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c
index 28fa314a7b..af7276a2b5 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.c
@@ -27,7 +27,7 @@ void set_mac_mode(bool macmode) {
* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81
*/
keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = !macmode;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
#ifdef DIP_SWITCH_ENABLE
diff --git a/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h b/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h
index f26f07fe12..87e2e813a4 100644
--- a/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h
+++ b/keyboards/horrortroll/nyx/rev1/lib/startup_swirl_anim.h
@@ -18,6 +18,7 @@
#include <string.h>
#include <math.h>
#include <lib/lib8tion/lib8tion.h>
+#include "eeconfig.h"
#define LED_TRAIL 10
@@ -105,7 +106,7 @@ static void swirl_set_color(hsv_t hsv) {
traverse_matrix();
if (!(top <= bottom && left <= right)) {
- eeprom_read_block(&rgb_matrix_config, EECONFIG_RGB_MATRIX, sizeof(rgb_matrix_config));
+ eeconfig_read_rgb_matrix(&rgb_matrix_config);
rgb_matrix_mode_noeeprom(rgb_matrix_config.mode);
return;
}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/board.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/board.h
new file mode 100644
index 0000000000..5b80eb2230
--- /dev/null
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/board.h
@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
index 71e60e9cfe..c10d26b9b2 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
@@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
-#define STM32_HSECLK 16000000
-
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20
diff --git a/keyboards/icebreaker/hotswap/keyboard.json b/keyboards/icebreaker/hotswap/keyboard.json
new file mode 100644
index 0000000000..ab55c5ae5f
--- /dev/null
+++ b/keyboards/icebreaker/hotswap/keyboard.json
@@ -0,0 +1,240 @@
+{
+ "manufacturer": "Serene Studio",
+ "keyboard_name": "Icebreaker HS",
+ "maintainer": "Matthijs Muller",
+ "bootloader": "rp2040",
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "GP26", "pin_b": "GP27"}
+ ]
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["GP24", "GP19", "GP18", "GP17", "GP29", "GP0", "GP12", "GP11", "GP10", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2"],
+ "rows": ["GP25", "GP22", "GP28", "GP23", "GP1"]
+ },
+ "processor": "RP2040",
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_sat": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "band_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "cycle_up_down": true,
+ "digital_rain": true,
+ "dual_beacon": true,
+ "fractal": true,
+ "gradient_left_right": true,
+ "gradient_up_down": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "jellybean_raindrops": true,
+ "multisplash": true,
+ "pixel_flow": true,
+ "pixel_rain": true,
+ "rainbow_beacon": true,
+ "rainbow_moving_chevron": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "solid_multisplash": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_multinexus": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_wide": true,
+ "solid_splash": true,
+ "splash": true,
+ "typing_heatmap": true
+ },
+ "default": {
+ "sat": 100,
+ "val": 80
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4},
+ {"matrix": [2, 13], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 240, "y": 0, "flags": 4},
+ {"matrix": [1, 14], "x": 0, "y": 16, "flags": 4},
+ {"matrix": [1, 13], "x": 24, "y": 16, "flags": 4},
+ {"matrix": [1, 12], "x": 40, "y": 16, "flags": 4},
+ {"matrix": [1, 11], "x": 56, "y": 16, "flags": 4},
+ {"matrix": [1, 10], "x": 72, "y": 16, "flags": 4},
+ {"matrix": [1, 9], "x": 88, "y": 16, "flags": 4},
+ {"matrix": [1, 8], "x": 104, "y": 16, "flags": 4},
+ {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
+ {"matrix": [1, 6], "x": 136, "y": 16, "flags": 4},
+ {"matrix": [1, 5], "x": 152, "y": 16, "flags": 4},
+ {"matrix": [1, 4], "x": 168, "y": 16, "flags": 4},
+ {"matrix": [1, 3], "x": 184, "y": 16, "flags": 4},
+ {"matrix": [1, 2], "x": 200, "y": 16, "flags": 4},
+ {"matrix": [1, 1], "x": 216, "y": 16, "flags": 4},
+ {"matrix": [1, 0], "x": 240, "y": 16, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
+ {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+ {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+ {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
+ {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
+ {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
+ {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
+ {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
+ {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
+ {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
+ {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
+ {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
+ {"matrix": [2, 12], "x": 204, "y": 32, "flags": 4},
+ {"matrix": [2, 14], "x": 240, "y": 32, "flags": 4},
+ {"matrix": [3, 14], "x": 0, "y": 48, "flags": 4},
+ {"matrix": [3, 13], "x": 36, "y": 48, "flags": 4},
+ {"matrix": [3, 12], "x": 52, "y": 48, "flags": 4},
+ {"matrix": [3, 11], "x": 68, "y": 48, "flags": 4},
+ {"matrix": [3, 10], "x": 84, "y": 48, "flags": 4},
+ {"matrix": [3, 9], "x": 100, "y": 48, "flags": 4},
+ {"matrix": [3, 8], "x": 116, "y": 48, "flags": 4},
+ {"matrix": [3, 7], "x": 132, "y": 48, "flags": 4},
+ {"matrix": [3, 6], "x": 148, "y": 48, "flags": 4},
+ {"matrix": [3, 5], "x": 164, "y": 48, "flags": 4},
+ {"matrix": [3, 4], "x": 180, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 196, "y": 48, "flags": 4},
+ {"matrix": [3, 2], "x": 224, "y": 48, "flags": 4},
+ {"matrix": [3, 0], "x": 240, "y": 48, "flags": 4},
+ {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [4, 1], "x": 24, "y": 64, "flags": 4},
+ {"matrix": [4, 6], "x": 48, "y": 64, "flags": 4},
+ {"matrix": [4, 10], "x": 160, "y": 64, "flags": 4},
+ {"matrix": [4, 11], "x": 184, "y": 64, "flags": 4},
+ {"matrix": [4, 12], "x": 208, "y": 64, "flags": 4},
+ {"matrix": [4, 13], "x": 224, "y": 64, "flags": 4},
+ {"matrix": [4, 14], "x": 240, "y": 64, "flags": 4}
+ ],
+ "max_brightness": 120
+ },
+ "url": "",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x6503",
+ "vid": "0x5363"
+ },
+ "ws2812": {
+ "driver": "vendor",
+ "pin": "GP13"
+ },
+ "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": [2, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"label": "encoder", "matrix": [3, 1], "x": 16, "y": 0, "encoder": 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": [1, 14], "x": 15, "y": 1},
+ {"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": [2, 14], "x": 15, "y": 2},
+ {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/icebreaker/hotswap/keymaps/default/keymap.c b/keyboards/icebreaker/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..058210fff4
--- /dev/null
+++ b/keyboards/icebreaker/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/*
+Copyright 2024 Matthijs Muller
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT(
+ KC_ESC, KC_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_DEL, KC_GRV, KC_MUTE,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_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, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, 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, _______, _______, RM_TOGG, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLU, _______,
+ _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+ )
+};
+
+#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(RM_SATD, RM_SATU) },
+};
+#endif
diff --git a/keyboards/icebreaker/hotswap/keymaps/default/rules.mk b/keyboards/icebreaker/hotswap/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/icebreaker/hotswap/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/icebreaker/readme.md b/keyboards/icebreaker/readme.md
new file mode 100644
index 0000000000..439756f1b3
--- /dev/null
+++ b/keyboards/icebreaker/readme.md
@@ -0,0 +1,26 @@
+# Icebreaker
+
+![Icebreaker](https://i.imgur.com/vSRfEOD.png)
+
+
+
+* Keyboard Maintainer: [Matthijs Muller](https://github.com/SmollChungus)
+* Hardware Supported: Icebreaker Hotswap PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+ make icebreaker:default
+
+Flashing example for this keyboard:
+
+ make icebreaker: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/inland/kb83/kb83.c b/keyboards/inland/kb83/kb83.c
index 1052131a91..41a3ad8df7 100644
--- a/keyboards/inland/kb83/kb83.c
+++ b/keyboards/inland/kb83/kb83.c
@@ -317,7 +317,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
}
if(active){
keymap_config.no_gui = 0;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return true;
}
diff --git a/keyboards/jian/keymaps/advanced/keymap.c b/keyboards/jian/keymaps/advanced/keymap.c
index eaf57cdd78..e3e58a0e9f 100644
--- a/keyboards/jian/keymaps/advanced/keymap.c
+++ b/keyboards/jian/keymaps/advanced/keymap.c
@@ -472,9 +472,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
case EXT_PLV:
diff --git a/keyboards/keychron/c1_pro_v2/board.h b/keyboards/keychron/c1_pro_v2/board.h
new file mode 100644
index 0000000000..e6cf0b2856
--- /dev/null
+++ b/keyboards/keychron/c1_pro_v2/board.h
@@ -0,0 +1,8 @@
+// Copyright 2025 @ Keychron (https://www.keychron.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/keychron/c1_pro_v2/mcuconf.h b/keyboards/keychron/c1_pro_v2/mcuconf.h
index ca470fb5b3..95966a32ce 100644
--- a/keyboards/keychron/c1_pro_v2/mcuconf.h
+++ b/keyboards/keychron/c1_pro_v2/mcuconf.h
@@ -18,9 +18,6 @@
#include_next <mcuconf.h>
-#undef STM32_HSECLK
-#define STM32_HSECLK 16000000U
-
#undef STM32_PLLM_VALUE
#define STM32_PLLM_VALUE 8
diff --git a/keyboards/keychron/c2_pro_v2/board.h b/keyboards/keychron/c2_pro_v2/board.h
new file mode 100644
index 0000000000..e6cf0b2856
--- /dev/null
+++ b/keyboards/keychron/c2_pro_v2/board.h
@@ -0,0 +1,8 @@
+// Copyright 2025 @ Keychron (https://www.keychron.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/keychron/c2_pro_v2/mcuconf.h b/keyboards/keychron/c2_pro_v2/mcuconf.h
index ca470fb5b3..95966a32ce 100644
--- a/keyboards/keychron/c2_pro_v2/mcuconf.h
+++ b/keyboards/keychron/c2_pro_v2/mcuconf.h
@@ -18,9 +18,6 @@
#include_next <mcuconf.h>
-#undef STM32_HSECLK
-#define STM32_HSECLK 16000000U
-
#undef STM32_PLLM_VALUE
#define STM32_PLLM_VALUE 8
diff --git a/keyboards/keychron/c3_pro/board.h b/keyboards/keychron/c3_pro/board.h
new file mode 100644
index 0000000000..60d25b93b8
--- /dev/null
+++ b/keyboards/keychron/c3_pro/board.h
@@ -0,0 +1,8 @@
+// Copyright 2024 @ Keychron (https://www.keychron.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/keychron/c3_pro/mcuconf.h b/keyboards/keychron/c3_pro/mcuconf.h
index b2b81df855..ad75926a14 100644
--- a/keyboards/keychron/c3_pro/mcuconf.h
+++ b/keyboards/keychron/c3_pro/mcuconf.h
@@ -18,9 +18,6 @@
#include_next <mcuconf.h>
-#undef STM32_HSECLK
-#define STM32_HSECLK 16000000U
-
#undef STM32_PLLM_VALUE
#define STM32_PLLM_VALUE 8
diff --git a/keyboards/mechlovin/olly/octagon/keyboard.json b/keyboards/mechlovin/olly/octagon/keyboard.json
index 4bc7d88ed7..9c580a664e 100644
--- a/keyboards/mechlovin/olly/octagon/keyboard.json
+++ b/keyboards/mechlovin/olly/octagon/keyboard.json
@@ -170,11 +170,12 @@
"processor": "STM32F103",
"bootloader": "stm32duino",
"layout_aliases": {
- "LAYOUT": "LAYOUT_split_bs",
- "LAYOUT_all": "LAYOUT_split_bs"
+ "LAYOUT": "LAYOUT_all",
+ "LAYOUT_split_bs": "LAYOUT_all"
},
+ "community_layouts": ["75_ansi", "75_iso"],
"layouts": {
- "LAYOUT_split_bs": {
+ "LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
@@ -269,6 +270,750 @@
{"matrix": [5, 14], "x": 14, "y": 5},
{"matrix": [5, 15], "x": 15, "y": 5}
]
+ },
+ "LAYOUT_75_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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"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},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_ansi_split_bs": {
+ "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},
+ {"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},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_ansi_wkl": {
+ "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},
+ {"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},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_ansi_wkl_split_bs": {
+ "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},
+ {"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},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_iso": {
+ "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},
+ {"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},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_iso_split_bs": {
+ "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},
+ {"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},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5},
+ {"matrix": [5, 11], "x": 11, "y": 5},
+ {"matrix": [5, 12], "x": 12, "y": 5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_iso_wkl": {
+ "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},
+ {"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},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
+ },
+ "LAYOUT_75_iso_wkl_split_bs": {
+ "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},
+ {"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},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 14], "x": 14, "y": 4},
+ {"matrix": [4, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 6], "x": 3, "y": 5, "w": 7},
+ {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 13], "x": 13, "y": 5},
+ {"matrix": [5, 14], "x": 14, "y": 5},
+ {"matrix": [5, 15], "x": 15, "y": 5}
+ ]
}
}
}
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
index 353f5f5d6d..19cd554ac3 100644
--- a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
@@ -16,12 +16,12 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_split_bs(
+ [0] = LAYOUT_all(
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_PAUS, KC_DEL,
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_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_NUHS, 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_LSFT, KC_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- )
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
};
diff --git a/keyboards/mechlovin/olly/octagon/matrix_diagram.md b/keyboards/mechlovin/olly/octagon/matrix_diagram.md
new file mode 100644
index 0000000000..426e0691d1
--- /dev/null
+++ b/keyboards/mechlovin/olly/octagon/matrix_diagram.md
@@ -0,0 +1,26 @@
+# Matrix Diagram for Mechlovin Olly Octagon
+
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │ │1D │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │2F │ │ │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2E │ ISO Enter
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3F │ │3C │ │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
+│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4E │4F │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│50 │51 │52 │56 │5A │5B │5C │5D │5E │5F │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+┌────────┐
+│40 │ 2.25u LShift
+└────────┘
+┌────┬───┬────┬────────────────────────┬────┬───┬───┬───┬───┬───┐
+│50 │51 │52 │56 │5A │5B │5C │5D │5E │5F │ Alternative
+└────┴───┴────┴────────────────────────┴────┴───┴───┴───┴───┴───┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┬───┬───┬───┐
+│50 │51 │56 │5A │5C │5D │5E │5F │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┴───┘
+```
diff --git a/keyboards/monsgeek/m1/m1.c b/keyboards/monsgeek/m1/m1.c
index 60479ab801..2f7365e562 100644
--- a/keyboards/monsgeek/m1/m1.c
+++ b/keyboards/monsgeek/m1/m1.c
@@ -190,7 +190,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
set_single_persistent_default_layer(MAC_B);
layer_state_set(1<<MAC_B);
keymap_config.no_gui = 0;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
case QK_RGB_MATRIX_TOGGLE:
diff --git a/keyboards/monsgeek/m3/m3.c b/keyboards/monsgeek/m3/m3.c
index 4dd9a55f3c..bf5e038b3d 100644
--- a/keyboards/monsgeek/m3/m3.c
+++ b/keyboards/monsgeek/m3/m3.c
@@ -163,7 +163,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
if (record->event.pressed) {
set_single_persistent_default_layer(MAC_B);
keymap_config.no_gui = 0;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
case GU_TOGG:
diff --git a/keyboards/neson_design/810e/board.h b/keyboards/neson_design/810e/board.h
new file mode 100644
index 0000000000..681350a0ea
--- /dev/null
+++ b/keyboards/neson_design/810e/board.h
@@ -0,0 +1,8 @@
+// Copyright 2024 astro
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/neson_design/810e/config.h b/keyboards/neson_design/810e/config.h
deleted file mode 100644
index c6409b1ece..0000000000
--- a/keyboards/neson_design/810e/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright 2024 astro
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define BOARD_OTG_NOVBUSSENS 1
-#define STM32_HSECLK 16000000U
diff --git a/keyboards/nix_studio/lilith/board.h b/keyboards/nix_studio/lilith/board.h
new file mode 100644
index 0000000000..2a370fe2e0
--- /dev/null
+++ b/keyboards/nix_studio/lilith/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Martin Arnstad (@arnstadm)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/omnikeyish/dynamic_macro.c b/keyboards/omnikeyish/dynamic_macro.c
index b990a09a13..99b6d173b8 100644
--- a/keyboards/omnikeyish/dynamic_macro.c
+++ b/keyboards/omnikeyish/dynamic_macro.c
@@ -1,5 +1,6 @@
#include "omnikeyish.h"
#include <string.h>
+#include "eeprom.h"
dynamic_macro_t dynamic_macros[DYNAMIC_MACRO_COUNT];
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index cc8a69ceca..c08e58653a 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -215,9 +215,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
break;
diff --git a/keyboards/planck/rev7/keymaps/default/keymap.c b/keyboards/planck/rev7/keymaps/default/keymap.c
index 47ded8aba5..6880e2fa94 100644
--- a/keyboards/planck/rev7/keymaps/default/keymap.c
+++ b/keyboards/planck/rev7/keymaps/default/keymap.c
@@ -255,9 +255,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
return false;
break;
diff --git a/keyboards/plywrks/ply8x/config.h b/keyboards/plywrks/ply8x/hotswap/config.h
index 3fc4de978d..3fc4de978d 100644
--- a/keyboards/plywrks/ply8x/config.h
+++ b/keyboards/plywrks/ply8x/hotswap/config.h
diff --git a/keyboards/plywrks/ply8x/halconf.h b/keyboards/plywrks/ply8x/hotswap/halconf.h
index e215e323c5..e215e323c5 100644
--- a/keyboards/plywrks/ply8x/halconf.h
+++ b/keyboards/plywrks/ply8x/hotswap/halconf.h
diff --git a/keyboards/plywrks/ply8x/hotswap/keyboard.json b/keyboards/plywrks/ply8x/hotswap/keyboard.json
new file mode 100644
index 0000000000..2dc2ac5c35
--- /dev/null
+++ b/keyboards/plywrks/ply8x/hotswap/keyboard.json
@@ -0,0 +1,560 @@
+{
+ "manufacturer": "plywrks",
+ "keyboard_name": "ply8x",
+ "maintainer": "ramonimbao",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "rows": ["B2", "B1", "B0", "A7", "A10", "A2"],
+ "cols": ["A9", "A8", "B12", "B11", "B10", "A6", "A5", "A4", "A15", "C14", "C13", "B9", "B6", "B7", "B5", "B4", "B3"]
+ },
+ "processor": "STM32F072",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "vid": "0x706C",
+ "pid": "0x7915"
+ },
+ "ws2812": {
+ "pin": "B15",
+ "driver": "spi"
+ },
+ "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,
+ "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
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"flags": 2, "x":224, "y":37},
+ {"flags": 2, "x":224, "y":43},
+ {"flags": 2, "x":218, "y":43},
+ {"flags": 2, "x":218, "y":37},
+
+ {"flags": 2, "matrix": [0, 0], "x":0, "y": 0},
+ {"flags": 2, "matrix": [0, 2], "x":26, "y": 0},
+ {"flags": 2, "matrix": [0, 3], "x":38, "y": 0},
+ {"flags": 2, "matrix": [0, 4], "x":51, "y": 0},
+ {"flags": 2, "matrix": [0, 5], "x":64, "y": 0},
+ {"flags": 2, "matrix": [0, 6], "x":83, "y": 0},
+ {"flags": 2, "matrix": [0, 7], "x":96, "y": 0},
+ {"flags": 2, "matrix": [0, 8], "x":109, "y": 0},
+ {"flags": 2, "matrix": [0, 9], "x":122, "y": 0},
+ {"flags": 2, "matrix": [0,10], "x":141, "y": 0},
+ {"flags": 2, "matrix": [0,11], "x":154, "y": 0},
+ {"flags": 2, "matrix": [0,12], "x":166, "y": 0},
+ {"flags": 2, "matrix": [0,13], "x":179, "y": 0},
+ {"flags": 2, "matrix": [0,14], "x":195, "y": 0},
+ {"flags": 2, "matrix": [0,15], "x":208, "y": 0},
+ {"flags": 2, "matrix": [0,16], "x":221, "y": 0},
+
+ {"flags": 2, "matrix": [1, 0], "x":0, "y": 15},
+ {"flags": 2, "matrix": [1, 1], "x":13, "y": 15},
+ {"flags": 2, "matrix": [1, 2], "x":26, "y": 15},
+ {"flags": 2, "matrix": [1, 3], "x":38, "y": 15},
+ {"flags": 2, "matrix": [1, 4], "x":51, "y": 15},
+ {"flags": 2, "matrix": [1, 5], "x":64, "y": 15},
+ {"flags": 2, "matrix": [1, 6], "x":77, "y": 15},
+ {"flags": 2, "matrix": [1, 7], "x":90, "y": 15},
+ {"flags": 2, "matrix": [1, 8], "x":102, "y": 15},
+ {"flags": 2, "matrix": [1, 9], "x":115, "y": 15},
+ {"flags": 2, "matrix": [1,10], "x":128, "y": 15},
+ {"flags": 2, "matrix": [1,11], "x":141, "y": 15},
+ {"flags": 2, "matrix": [1,12], "x":154, "y": 15},
+ {"flags": 2, "matrix": [1,13], "x":166, "y": 15},
+ {"flags": 2, "matrix": [3,13], "x":179, "y": 15},
+ {"flags": 2, "matrix": [1,14], "x":195, "y": 15},
+ {"flags": 2, "matrix": [1,15], "x":208, "y": 15},
+ {"flags": 2, "matrix": [1,16], "x":221, "y": 15},
+
+ {"flags": 2, "matrix": [2, 0], "x":3, "y": 27},
+ {"flags": 2, "matrix": [2, 1], "x":19, "y": 27},
+ {"flags": 2, "matrix": [2, 2], "x":32, "y": 27},
+ {"flags": 2, "matrix": [2, 3], "x":45, "y": 27},
+ {"flags": 2, "matrix": [2, 4], "x":58, "y": 27},
+ {"flags": 2, "matrix": [2, 5], "x":70, "y": 27},
+ {"flags": 2, "matrix": [2, 6], "x":83, "y": 27},
+ {"flags": 2, "matrix": [2, 7], "x":96, "y": 27},
+ {"flags": 2, "matrix": [2, 8], "x":109, "y": 27},
+ {"flags": 2, "matrix": [2, 9], "x":122, "y": 27},
+ {"flags": 2, "matrix": [2,10], "x":134, "y": 27},
+ {"flags": 2, "matrix": [2,11], "x":147, "y": 27},
+ {"flags": 2, "matrix": [2,12], "x":160, "y": 27},
+ {"flags": 2, "matrix": [2,13], "x":176, "y": 27},
+ {"flags": 2, "matrix": [2,14], "x":195, "y": 27},
+ {"flags": 2, "matrix": [2,15], "x":208, "y": 27},
+ {"flags": 2, "matrix": [2,16], "x":221, "y": 27},
+
+ {"flags": 2, "matrix": [3, 0], "x":5, "y":40},
+ {"flags": 2, "matrix": [3, 1], "x":23, "y": 40},
+ {"flags": 2, "matrix": [3, 2], "x":36, "y": 40},
+ {"flags": 2, "matrix": [3, 3], "x":49, "y": 40},
+ {"flags": 2, "matrix": [3, 4], "x":62, "y": 40},
+ {"flags": 2, "matrix": [3, 5], "x":75, "y": 40},
+ {"flags": 2, "matrix": [3, 6], "x":88, "y": 40},
+ {"flags": 2, "matrix": [3, 7], "x":101, "y": 40},
+ {"flags": 2, "matrix": [3, 8], "x":114, "y": 40},
+ {"flags": 2, "matrix": [3, 9], "x":127, "y": 40},
+ {"flags": 2, "matrix": [3,10], "x":140, "y": 40},
+ {"flags": 2, "matrix": [3,11], "x":153, "y": 40},
+ {"flags": 2, "matrix": [3,12], "x":166, "y": 40},
+
+ {"flags": 2, "matrix": [4, 0], "x":8, "y": 52},
+ {"flags": 2, "matrix": [4, 2], "x":29, "y": 52},
+ {"flags": 2, "matrix": [4, 3], "x":42, "y": 52},
+ {"flags": 2, "matrix": [4, 4], "x":54, "y": 52},
+ {"flags": 2, "matrix": [4, 5], "x":67, "y": 52},
+ {"flags": 2, "matrix": [4, 6], "x":80, "y": 52},
+ {"flags": 2, "matrix": [4, 7], "x":93, "y": 52},
+ {"flags": 2, "matrix": [4, 8], "x":106, "y": 52},
+ {"flags": 2, "matrix": [4, 9], "x":118, "y": 52},
+ {"flags": 2, "matrix": [4,10], "x":131, "y": 52},
+ {"flags": 2, "matrix": [4,11], "x":144, "y": 52},
+ {"flags": 2, "matrix": [4,12], "x":162, "y": 52},
+ {"flags": 2, "matrix": [4,13], "x":179, "y": 52},
+ {"flags": 2, "matrix": [4,15], "x":208, "y": 52},
+
+ {"flags": 2, "matrix": [5, 0], "x":2, "y": 64},
+ {"flags": 2, "matrix": [5, 1], "x":18, "y": 64},
+ {"flags": 2, "matrix": [5, 2], "x":34, "y": 64},
+ {"flags": 2, "matrix": [5, 7], "x":82, "y": 64},
+ {"flags": 2, "matrix": [5,11], "x":146, "y": 64},
+ {"flags": 2, "matrix": [5,12], "x":162, "y": 64},
+ {"flags": 2, "matrix": [5,13], "x":178, "y": 64},
+ {"flags": 2, "matrix": [5,14], "x":195, "y": 64},
+ {"flags": 2, "matrix": [5,15], "x":208, "y": 64},
+ {"flags": 2, "matrix": [5,16], "x":221, "y": 64}
+ ]
+ },
+ "community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_ansi_wkl", "tkl_ansi_wkl_split_bs_rshift"],
+ "layouts": {
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "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.5, "y":0},
+ {"matrix": [0, 7], "x":7.5, "y":0},
+ {"matrix": [0, 8], "x":8.5, "y":0},
+ {"matrix": [0, 9], "x":9.5, "y":0},
+ {"matrix": [0,10], "x":11, "y":0},
+ {"matrix": [0,11], "x":12, "y":0},
+ {"matrix": [0,12], "x":13, "y":0},
+ {"matrix": [0,13], "x":14, "y":0},
+ {"matrix": [0,14], "x":15.25, "y":0},
+ {"matrix": [0,15], "x":16.25, "y":0},
+ {"matrix": [0,16], "x":17.25, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [1, 2], "x":2, "y":1.25},
+ {"matrix": [1, 3], "x":3, "y":1.25},
+ {"matrix": [1, 4], "x":4, "y":1.25},
+ {"matrix": [1, 5], "x":5, "y":1.25},
+ {"matrix": [1, 6], "x":6, "y":1.25},
+ {"matrix": [1, 7], "x":7, "y":1.25},
+ {"matrix": [1, 8], "x":8, "y":1.25},
+ {"matrix": [1, 9], "x":9, "y":1.25},
+ {"matrix": [1,10], "x":10, "y":1.25},
+ {"matrix": [1,11], "x":11, "y":1.25},
+ {"matrix": [1,12], "x":12, "y":1.25},
+ {"matrix": [1,13], "x":13, "y":1.25, "w":2},
+ {"matrix": [1,14], "x":15.25, "y":1.25},
+ {"matrix": [1,15], "x":16.25, "y":1.25},
+ {"matrix": [1,16], "x":17.25, "y":1.25},
+
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.25},
+ {"matrix": [2, 2], "x":2.5, "y":2.25},
+ {"matrix": [2, 3], "x":3.5, "y":2.25},
+ {"matrix": [2, 4], "x":4.5, "y":2.25},
+ {"matrix": [2, 5], "x":5.5, "y":2.25},
+ {"matrix": [2, 6], "x":6.5, "y":2.25},
+ {"matrix": [2, 7], "x":7.5, "y":2.25},
+ {"matrix": [2, 8], "x":8.5, "y":2.25},
+ {"matrix": [2, 9], "x":9.5, "y":2.25},
+ {"matrix": [2,10], "x":10.5, "y":2.25},
+ {"matrix": [2,11], "x":11.5, "y":2.25},
+ {"matrix": [2,12], "x":12.5, "y":2.25},
+ {"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
+ {"matrix": [2,14], "x":15.25, "y":2.25},
+ {"matrix": [2,15], "x":16.25, "y":2.25},
+ {"matrix": [2,16], "x":17.25, "y":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.25},
+ {"matrix": [3, 2], "x":2.75, "y":3.25},
+ {"matrix": [3, 3], "x":3.75, "y":3.25},
+ {"matrix": [3, 4], "x":4.75, "y":3.25},
+ {"matrix": [3, 5], "x":5.75, "y":3.25},
+ {"matrix": [3, 6], "x":6.75, "y":3.25},
+ {"matrix": [3, 7], "x":7.75, "y":3.25},
+ {"matrix": [3, 8], "x":8.75, "y":3.25},
+ {"matrix": [3, 9], "x":9.75, "y":3.25},
+ {"matrix": [3,10], "x":10.75, "y":3.25},
+ {"matrix": [3,11], "x":11.75, "y":3.25},
+ {"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
+
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+ {"matrix": [4, 2], "x":2.25, "y":4.25},
+ {"matrix": [4, 3], "x":3.25, "y":4.25},
+ {"matrix": [4, 4], "x":4.25, "y":4.25},
+ {"matrix": [4, 5], "x":5.25, "y":4.25},
+ {"matrix": [4, 6], "x":6.25, "y":4.25},
+ {"matrix": [4, 7], "x":7.25, "y":4.25},
+ {"matrix": [4, 8], "x":8.25, "y":4.25},
+ {"matrix": [4, 9], "x":9.25, "y":4.25},
+ {"matrix": [4,10], "x":10.25, "y":4.25},
+ {"matrix": [4,11], "x":11.25, "y":4.25},
+ {"matrix": [4,12], "x":12.25, "y":4.25, "w":2.75},
+ {"matrix": [4,15], "x":16.25, "y":4.25},
+
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
+ {"matrix": [5, 1], "x":1.5, "y":5.25},
+ {"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
+ {"matrix": [5, 7], "x":4, "y":5.25, "w":7},
+ {"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
+ {"matrix": [5,12], "x":12.5, "y":5.25},
+ {"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
+ {"matrix": [5,14], "x":15.25, "y":5.25},
+ {"matrix": [5,15], "x":16.25, "y":5.25},
+ {"matrix": [5,16], "x":17.25, "y":5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "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.5, "y":0},
+ {"matrix": [0, 7], "x":7.5, "y":0},
+ {"matrix": [0, 8], "x":8.5, "y":0},
+ {"matrix": [0, 9], "x":9.5, "y":0},
+ {"matrix": [0,10], "x":11, "y":0},
+ {"matrix": [0,11], "x":12, "y":0},
+ {"matrix": [0,12], "x":13, "y":0},
+ {"matrix": [0,13], "x":14, "y":0},
+ {"matrix": [0,14], "x":15.25, "y":0},
+ {"matrix": [0,15], "x":16.25, "y":0},
+ {"matrix": [0,16], "x":17.25, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [1, 2], "x":2, "y":1.25},
+ {"matrix": [1, 3], "x":3, "y":1.25},
+ {"matrix": [1, 4], "x":4, "y":1.25},
+ {"matrix": [1, 5], "x":5, "y":1.25},
+ {"matrix": [1, 6], "x":6, "y":1.25},
+ {"matrix": [1, 7], "x":7, "y":1.25},
+ {"matrix": [1, 8], "x":8, "y":1.25},
+ {"matrix": [1, 9], "x":9, "y":1.25},
+ {"matrix": [1,10], "x":10, "y":1.25},
+ {"matrix": [1,11], "x":11, "y":1.25},
+ {"matrix": [1,12], "x":12, "y":1.25},
+ {"matrix": [1,13], "x":13, "y":1.25},
+ {"matrix": [3,13], "x":14, "y":1.25},
+ {"matrix": [1,14], "x":15.25, "y":1.25},
+ {"matrix": [1,15], "x":16.25, "y":1.25},
+ {"matrix": [1,16], "x":17.25, "y":1.25},
+
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.25},
+ {"matrix": [2, 2], "x":2.5, "y":2.25},
+ {"matrix": [2, 3], "x":3.5, "y":2.25},
+ {"matrix": [2, 4], "x":4.5, "y":2.25},
+ {"matrix": [2, 5], "x":5.5, "y":2.25},
+ {"matrix": [2, 6], "x":6.5, "y":2.25},
+ {"matrix": [2, 7], "x":7.5, "y":2.25},
+ {"matrix": [2, 8], "x":8.5, "y":2.25},
+ {"matrix": [2, 9], "x":9.5, "y":2.25},
+ {"matrix": [2,10], "x":10.5, "y":2.25},
+ {"matrix": [2,11], "x":11.5, "y":2.25},
+ {"matrix": [2,12], "x":12.5, "y":2.25},
+ {"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
+ {"matrix": [2,14], "x":15.25, "y":2.25},
+ {"matrix": [2,15], "x":16.25, "y":2.25},
+ {"matrix": [2,16], "x":17.25, "y":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.25},
+ {"matrix": [3, 2], "x":2.75, "y":3.25},
+ {"matrix": [3, 3], "x":3.75, "y":3.25},
+ {"matrix": [3, 4], "x":4.75, "y":3.25},
+ {"matrix": [3, 5], "x":5.75, "y":3.25},
+ {"matrix": [3, 6], "x":6.75, "y":3.25},
+ {"matrix": [3, 7], "x":7.75, "y":3.25},
+ {"matrix": [3, 8], "x":8.75, "y":3.25},
+ {"matrix": [3, 9], "x":9.75, "y":3.25},
+ {"matrix": [3,10], "x":10.75, "y":3.25},
+ {"matrix": [3,11], "x":11.75, "y":3.25},
+ {"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
+
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+ {"matrix": [4, 2], "x":2.25, "y":4.25},
+ {"matrix": [4, 3], "x":3.25, "y":4.25},
+ {"matrix": [4, 4], "x":4.25, "y":4.25},
+ {"matrix": [4, 5], "x":5.25, "y":4.25},
+ {"matrix": [4, 6], "x":6.25, "y":4.25},
+ {"matrix": [4, 7], "x":7.25, "y":4.25},
+ {"matrix": [4, 8], "x":8.25, "y":4.25},
+ {"matrix": [4, 9], "x":9.25, "y":4.25},
+ {"matrix": [4,10], "x":10.25, "y":4.25},
+ {"matrix": [4,11], "x":11.25, "y":4.25},
+ {"matrix": [4,12], "x":12.25, "y":4.25, "w":1.75},
+ {"matrix": [4,13], "x":14, "y":4.25},
+ {"matrix": [4,15], "x":16.25, "y":4.25},
+
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
+ {"matrix": [5, 1], "x":1.5, "y":5.25},
+ {"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
+ {"matrix": [5, 7], "x":4, "y":5.25, "w":7},
+ {"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
+ {"matrix": [5,12], "x":12.5, "y":5.25},
+ {"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
+ {"matrix": [5,14], "x":15.25, "y":5.25},
+ {"matrix": [5,15], "x":16.25, "y":5.25},
+ {"matrix": [5,16], "x":17.25, "y":5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "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.5, "y":0},
+ {"matrix": [0, 7], "x":7.5, "y":0},
+ {"matrix": [0, 8], "x":8.5, "y":0},
+ {"matrix": [0, 9], "x":9.5, "y":0},
+ {"matrix": [0,10], "x":11, "y":0},
+ {"matrix": [0,11], "x":12, "y":0},
+ {"matrix": [0,12], "x":13, "y":0},
+ {"matrix": [0,13], "x":14, "y":0},
+ {"matrix": [0,14], "x":15.25, "y":0},
+ {"matrix": [0,15], "x":16.25, "y":0},
+ {"matrix": [0,16], "x":17.25, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [1, 2], "x":2, "y":1.25},
+ {"matrix": [1, 3], "x":3, "y":1.25},
+ {"matrix": [1, 4], "x":4, "y":1.25},
+ {"matrix": [1, 5], "x":5, "y":1.25},
+ {"matrix": [1, 6], "x":6, "y":1.25},
+ {"matrix": [1, 7], "x":7, "y":1.25},
+ {"matrix": [1, 8], "x":8, "y":1.25},
+ {"matrix": [1, 9], "x":9, "y":1.25},
+ {"matrix": [1,10], "x":10, "y":1.25},
+ {"matrix": [1,11], "x":11, "y":1.25},
+ {"matrix": [1,12], "x":12, "y":1.25},
+ {"matrix": [1,13], "x":13, "y":1.25, "w":2},
+ {"matrix": [1,14], "x":15.25, "y":1.25},
+ {"matrix": [1,15], "x":16.25, "y":1.25},
+ {"matrix": [1,16], "x":17.25, "y":1.25},
+
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.25},
+ {"matrix": [2, 2], "x":2.5, "y":2.25},
+ {"matrix": [2, 3], "x":3.5, "y":2.25},
+ {"matrix": [2, 4], "x":4.5, "y":2.25},
+ {"matrix": [2, 5], "x":5.5, "y":2.25},
+ {"matrix": [2, 6], "x":6.5, "y":2.25},
+ {"matrix": [2, 7], "x":7.5, "y":2.25},
+ {"matrix": [2, 8], "x":8.5, "y":2.25},
+ {"matrix": [2, 9], "x":9.5, "y":2.25},
+ {"matrix": [2,10], "x":10.5, "y":2.25},
+ {"matrix": [2,11], "x":11.5, "y":2.25},
+ {"matrix": [2,12], "x":12.5, "y":2.25},
+ {"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
+ {"matrix": [2,14], "x":15.25, "y":2.25},
+ {"matrix": [2,15], "x":16.25, "y":2.25},
+ {"matrix": [2,16], "x":17.25, "y":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.25},
+ {"matrix": [3, 2], "x":2.75, "y":3.25},
+ {"matrix": [3, 3], "x":3.75, "y":3.25},
+ {"matrix": [3, 4], "x":4.75, "y":3.25},
+ {"matrix": [3, 5], "x":5.75, "y":3.25},
+ {"matrix": [3, 6], "x":6.75, "y":3.25},
+ {"matrix": [3, 7], "x":7.75, "y":3.25},
+ {"matrix": [3, 8], "x":8.75, "y":3.25},
+ {"matrix": [3, 9], "x":9.75, "y":3.25},
+ {"matrix": [3,10], "x":10.75, "y":3.25},
+ {"matrix": [3,11], "x":11.75, "y":3.25},
+ {"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
+
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+ {"matrix": [4, 2], "x":2.25, "y":4.25},
+ {"matrix": [4, 3], "x":3.25, "y":4.25},
+ {"matrix": [4, 4], "x":4.25, "y":4.25},
+ {"matrix": [4, 5], "x":5.25, "y":4.25},
+ {"matrix": [4, 6], "x":6.25, "y":4.25},
+ {"matrix": [4, 7], "x":7.25, "y":4.25},
+ {"matrix": [4, 8], "x":8.25, "y":4.25},
+ {"matrix": [4, 9], "x":9.25, "y":4.25},
+ {"matrix": [4,10], "x":10.25, "y":4.25},
+ {"matrix": [4,11], "x":11.25, "y":4.25},
+ {"matrix": [4,12], "x":12.25, "y":4.25, "w":2.75},
+ {"matrix": [4,15], "x":16.25, "y":4.25},
+
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
+ {"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
+ {"matrix": [5, 7], "x":4, "y":5.25, "w":7},
+ {"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
+ {"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
+ {"matrix": [5,14], "x":15.25, "y":5.25},
+ {"matrix": [5,15], "x":16.25, "y":5.25},
+ {"matrix": [5,16], "x":17.25, "y":5.25}
+ ]
+ },
+ "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "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.5, "y":0},
+ {"matrix": [0, 7], "x":7.5, "y":0},
+ {"matrix": [0, 8], "x":8.5, "y":0},
+ {"matrix": [0, 9], "x":9.5, "y":0},
+ {"matrix": [0,10], "x":11, "y":0},
+ {"matrix": [0,11], "x":12, "y":0},
+ {"matrix": [0,12], "x":13, "y":0},
+ {"matrix": [0,13], "x":14, "y":0},
+ {"matrix": [0,14], "x":15.25, "y":0},
+ {"matrix": [0,15], "x":16.25, "y":0},
+ {"matrix": [0,16], "x":17.25, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [1, 2], "x":2, "y":1.25},
+ {"matrix": [1, 3], "x":3, "y":1.25},
+ {"matrix": [1, 4], "x":4, "y":1.25},
+ {"matrix": [1, 5], "x":5, "y":1.25},
+ {"matrix": [1, 6], "x":6, "y":1.25},
+ {"matrix": [1, 7], "x":7, "y":1.25},
+ {"matrix": [1, 8], "x":8, "y":1.25},
+ {"matrix": [1, 9], "x":9, "y":1.25},
+ {"matrix": [1,10], "x":10, "y":1.25},
+ {"matrix": [1,11], "x":11, "y":1.25},
+ {"matrix": [1,12], "x":12, "y":1.25},
+ {"matrix": [1,13], "x":13, "y":1.25},
+ {"matrix": [3,13], "x":14, "y":1.25},
+ {"matrix": [1,14], "x":15.25, "y":1.25},
+ {"matrix": [1,15], "x":16.25, "y":1.25},
+ {"matrix": [1,16], "x":17.25, "y":1.25},
+
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.25},
+ {"matrix": [2, 2], "x":2.5, "y":2.25},
+ {"matrix": [2, 3], "x":3.5, "y":2.25},
+ {"matrix": [2, 4], "x":4.5, "y":2.25},
+ {"matrix": [2, 5], "x":5.5, "y":2.25},
+ {"matrix": [2, 6], "x":6.5, "y":2.25},
+ {"matrix": [2, 7], "x":7.5, "y":2.25},
+ {"matrix": [2, 8], "x":8.5, "y":2.25},
+ {"matrix": [2, 9], "x":9.5, "y":2.25},
+ {"matrix": [2,10], "x":10.5, "y":2.25},
+ {"matrix": [2,11], "x":11.5, "y":2.25},
+ {"matrix": [2,12], "x":12.5, "y":2.25},
+ {"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
+ {"matrix": [2,14], "x":15.25, "y":2.25},
+ {"matrix": [2,15], "x":16.25, "y":2.25},
+ {"matrix": [2,16], "x":17.25, "y":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.25},
+ {"matrix": [3, 2], "x":2.75, "y":3.25},
+ {"matrix": [3, 3], "x":3.75, "y":3.25},
+ {"matrix": [3, 4], "x":4.75, "y":3.25},
+ {"matrix": [3, 5], "x":5.75, "y":3.25},
+ {"matrix": [3, 6], "x":6.75, "y":3.25},
+ {"matrix": [3, 7], "x":7.75, "y":3.25},
+ {"matrix": [3, 8], "x":8.75, "y":3.25},
+ {"matrix": [3, 9], "x":9.75, "y":3.25},
+ {"matrix": [3,10], "x":10.75, "y":3.25},
+ {"matrix": [3,11], "x":11.75, "y":3.25},
+ {"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
+
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+ {"matrix": [4, 2], "x":2.25, "y":4.25},
+ {"matrix": [4, 3], "x":3.25, "y":4.25},
+ {"matrix": [4, 4], "x":4.25, "y":4.25},
+ {"matrix": [4, 5], "x":5.25, "y":4.25},
+ {"matrix": [4, 6], "x":6.25, "y":4.25},
+ {"matrix": [4, 7], "x":7.25, "y":4.25},
+ {"matrix": [4, 8], "x":8.25, "y":4.25},
+ {"matrix": [4, 9], "x":9.25, "y":4.25},
+ {"matrix": [4,10], "x":10.25, "y":4.25},
+ {"matrix": [4,11], "x":11.25, "y":4.25},
+ {"matrix": [4,12], "x":12.25, "y":4.25, "w":1.75},
+ {"matrix": [4,13], "x":14, "y":4.25},
+ {"matrix": [4,15], "x":16.25, "y":4.25},
+
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
+ {"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
+ {"matrix": [5, 7], "x":4, "y":5.25, "w":7},
+ {"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
+ {"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
+ {"matrix": [5,14], "x":15.25, "y":5.25},
+ {"matrix": [5,15], "x":16.25, "y":5.25},
+ {"matrix": [5,16], "x":17.25, "y":5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/plywrks/ply8x/hotswap/keymaps/default/keymap.c b/keyboards/plywrks/ply8x/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0da2588ea7
--- /dev/null
+++ b/keyboards/plywrks/ply8x/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2023 QMK
+// 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│ │PSc│Scr│Pse│
+ * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+ * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │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 │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌───┐
+ * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+ * │Ctrl│GUI │Alt │ │ Alt│ GUI│Ctrl│ │ ← │ ↓ │ → │
+ * └────┴────┴────┴─────────────────────────────┴────┴────┴────┘ └───┴───┴───┘
+ */
+ [0] = LAYOUT_tkl_ansi_tsangan(
+ 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, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
+};
diff --git a/keyboards/plywrks/ply8x/mcuconf.h b/keyboards/plywrks/ply8x/hotswap/mcuconf.h
index aceb2e3dfc..aceb2e3dfc 100644
--- a/keyboards/plywrks/ply8x/mcuconf.h
+++ b/keyboards/plywrks/ply8x/hotswap/mcuconf.h
diff --git a/keyboards/plywrks/ply8x/solder/config.h b/keyboards/plywrks/ply8x/solder/config.h
new file mode 100644
index 0000000000..3fc4de978d
--- /dev/null
+++ b/keyboards/plywrks/ply8x/solder/config.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Ramon Imbao (@ramonimbao)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WS2812_SPI_DRIVER SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 0
+#define WS2812_SPI_SCK_PIN B13
+#define WS2812_SPI_SCK_PAL_MODE 0
+#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/plywrks/ply8x/solder/halconf.h b/keyboards/plywrks/ply8x/solder/halconf.h
new file mode 100644
index 0000000000..e215e323c5
--- /dev/null
+++ b/keyboards/plywrks/ply8x/solder/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Ramon Imbao (@ramonimbao)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/plywrks/ply8x/keyboard.json b/keyboards/plywrks/ply8x/solder/keyboard.json
index 7c0717ade0..8bae31a1f1 100644
--- a/keyboards/plywrks/ply8x/keyboard.json
+++ b/keyboards/plywrks/ply8x/solder/keyboard.json
@@ -21,8 +21,8 @@
"url": "",
"usb": {
"device_version": "1.0.0",
- "pid": "0x7905",
- "vid": "0x706C"
+ "vid": "0x706C",
+ "pid": "0x7905"
},
"ws2812": {
"pin": "B15",
@@ -76,12 +76,106 @@
},
"driver": "ws2812",
"layout": [
- {"flags": 8, "matrix": [3, 0], "x":2, "y":27},
- {"flags": 8, "matrix": [0,15], "x":211, "y":0},
- {"flags": 2, "x":0, "y":0},
- {"flags": 2, "x":10, "y":0},
- {"flags": 2, "x":20, "y":0},
- {"flags": 2, "x":30, "y":0}
+ {"flags": 8, "matrix": [3, 0], "x":5, "y":40},
+ {"flags": 8, "matrix": [0,15], "x":208, "y":0},
+ {"flags": 2, "x":224, "y":37},
+ {"flags": 2, "x":224, "y":43},
+ {"flags": 2, "x":218, "y":43},
+ {"flags": 2, "x":218, "y":37},
+
+ {"flags": 2, "matrix": [0, 0], "x":0, "y": 0},
+ {"flags": 2, "matrix": [0, 2], "x":26, "y": 0},
+ {"flags": 2, "matrix": [0, 3], "x":38, "y": 0},
+ {"flags": 2, "matrix": [0, 4], "x":51, "y": 0},
+ {"flags": 2, "matrix": [0, 5], "x":64, "y": 0},
+ {"flags": 2, "matrix": [0, 6], "x":83, "y": 0},
+ {"flags": 2, "matrix": [0, 7], "x":96, "y": 0},
+ {"flags": 2, "matrix": [0, 8], "x":109, "y": 0},
+ {"flags": 2, "matrix": [0, 9], "x":122, "y": 0},
+ {"flags": 2, "matrix": [0,10], "x":141, "y": 0},
+ {"flags": 2, "matrix": [0,11], "x":154, "y": 0},
+ {"flags": 2, "matrix": [0,12], "x":166, "y": 0},
+ {"flags": 2, "matrix": [0,13], "x":179, "y": 0},
+ {"flags": 2, "matrix": [0,14], "x":195, "y": 0},
+ {"flags": 2, "matrix": [0,16], "x":221, "y": 0},
+
+ {"flags": 2, "matrix": [1, 0], "x":0, "y": 15},
+ {"flags": 2, "matrix": [1, 1], "x":13, "y": 15},
+ {"flags": 2, "matrix": [1, 2], "x":26, "y": 15},
+ {"flags": 2, "matrix": [1, 3], "x":38, "y": 15},
+ {"flags": 2, "matrix": [1, 4], "x":51, "y": 15},
+ {"flags": 2, "matrix": [1, 5], "x":64, "y": 15},
+ {"flags": 2, "matrix": [1, 6], "x":77, "y": 15},
+ {"flags": 2, "matrix": [1, 7], "x":90, "y": 15},
+ {"flags": 2, "matrix": [1, 8], "x":102, "y": 15},
+ {"flags": 2, "matrix": [1, 9], "x":115, "y": 15},
+ {"flags": 2, "matrix": [1,10], "x":128, "y": 15},
+ {"flags": 2, "matrix": [1,11], "x":141, "y": 15},
+ {"flags": 2, "matrix": [1,12], "x":154, "y": 15},
+ {"flags": 2, "matrix": [1,13], "x":166, "y": 15},
+ {"flags": 2, "matrix": [3,13], "x":179, "y": 15},
+ {"flags": 2, "matrix": [1,14], "x":195, "y": 15},
+ {"flags": 2, "matrix": [1,15], "x":208, "y": 15},
+ {"flags": 2, "matrix": [1,16], "x":221, "y": 15},
+
+ {"flags": 2, "matrix": [2, 0], "x":3, "y": 27},
+ {"flags": 2, "matrix": [2, 1], "x":19, "y": 27},
+ {"flags": 2, "matrix": [2, 2], "x":32, "y": 27},
+ {"flags": 2, "matrix": [2, 3], "x":45, "y": 27},
+ {"flags": 2, "matrix": [2, 4], "x":58, "y": 27},
+ {"flags": 2, "matrix": [2, 5], "x":70, "y": 27},
+ {"flags": 2, "matrix": [2, 6], "x":83, "y": 27},
+ {"flags": 2, "matrix": [2, 7], "x":96, "y": 27},
+ {"flags": 2, "matrix": [2, 8], "x":109, "y": 27},
+ {"flags": 2, "matrix": [2, 9], "x":122, "y": 27},
+ {"flags": 2, "matrix": [2,10], "x":134, "y": 27},
+ {"flags": 2, "matrix": [2,11], "x":147, "y": 27},
+ {"flags": 2, "matrix": [2,12], "x":160, "y": 27},
+ {"flags": 2, "matrix": [2,13], "x":176, "y": 27},
+ {"flags": 2, "matrix": [2,14], "x":195, "y": 27},
+ {"flags": 2, "matrix": [2,15], "x":208, "y": 27},
+ {"flags": 2, "matrix": [2,16], "x":221, "y": 27},
+
+ {"flags": 2, "matrix": [3, 1], "x":23, "y": 40},
+ {"flags": 2, "matrix": [3, 2], "x":36, "y": 40},
+ {"flags": 2, "matrix": [3, 3], "x":49, "y": 40},
+ {"flags": 2, "matrix": [3, 4], "x":62, "y": 40},
+ {"flags": 2, "matrix": [3, 5], "x":75, "y": 40},
+ {"flags": 2, "matrix": [3, 6], "x":88, "y": 40},
+ {"flags": 2, "matrix": [3, 7], "x":101, "y": 40},
+ {"flags": 2, "matrix": [3, 8], "x":114, "y": 40},
+ {"flags": 2, "matrix": [3, 9], "x":127, "y": 40},
+ {"flags": 2, "matrix": [3,10], "x":140, "y": 40},
+ {"flags": 2, "matrix": [3,11], "x":153, "y": 40},
+ {"flags": 2, "matrix": [3,12], "x":166, "y": 40},
+
+ {"flags": 2, "matrix": [4, 0], "x":2, "y": 52},
+ {"flags": 2, "matrix": [4, 1], "x":16, "y": 52},
+ {"flags": 2, "matrix": [4, 2], "x":29, "y": 52},
+ {"flags": 2, "matrix": [4, 3], "x":42, "y": 52},
+ {"flags": 2, "matrix": [4, 4], "x":54, "y": 52},
+ {"flags": 2, "matrix": [4, 5], "x":67, "y": 52},
+ {"flags": 2, "matrix": [4, 6], "x":80, "y": 52},
+ {"flags": 2, "matrix": [4, 7], "x":93, "y": 52},
+ {"flags": 2, "matrix": [4, 8], "x":106, "y": 52},
+ {"flags": 2, "matrix": [4, 9], "x":118, "y": 52},
+ {"flags": 2, "matrix": [4,10], "x":131, "y": 52},
+ {"flags": 2, "matrix": [4,11], "x":144, "y": 52},
+ {"flags": 2, "matrix": [4,12], "x":162, "y": 52},
+ {"flags": 2, "matrix": [4,13], "x":179, "y": 52},
+ {"flags": 2, "matrix": [4,15], "x":208, "y": 52},
+
+ {"flags": 2, "matrix": [5, 0], "x":2, "y": 64},
+ {"flags": 2, "matrix": [5, 1], "x":18, "y": 64},
+ {"flags": 2, "matrix": [5, 2], "x":34, "y": 64},
+ {"flags": 2, "matrix": [5, 6], "x":82, "y": 64},
+ {"flags": 2, "matrix": [5,10], "x":130, "y": 64},
+ {"flags": 2, "matrix": [5,11], "x":146, "y": 64},
+ {"flags": 2, "matrix": [5,12], "x":162, "y": 64},
+ {"flags": 2, "matrix": [5,13], "x":178, "y": 64},
+ {"flags": 2, "matrix": [5,14], "x":195, "y": 64},
+ {"flags": 2, "matrix": [5,15], "x":208, "y": 64},
+ {"flags": 2, "matrix": [5,16], "x":221, "y": 64}
]
},
"layout_aliases": {
@@ -92,11 +186,15 @@
"tkl_ansi",
"tkl_ansi_split_bs_rshift",
"tkl_ansi_tsangan",
+ "tkl_ansi_wkl",
"tkl_ansi_tsangan_split_bs_rshift",
+ "tkl_ansi_wkl_split_bs_rshift",
"tkl_iso",
"tkl_iso_split_bs_rshift",
"tkl_iso_tsangan",
- "tkl_iso_tsangan_split_bs_rshift"
+ "tkl_iso_wkl",
+ "tkl_iso_tsangan_split_bs_rshift",
+ "tkl_iso_wkl_split_bs_rshift"
],
"layouts": {
"LAYOUT_tkl_ansi": {
@@ -388,6 +486,99 @@
{"matrix": [5,16], "x":17.25, "y":5.25}
]
},
+ "LAYOUT_tkl_ansi_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "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.5, "y":0},
+ {"matrix": [0, 7], "x":7.5, "y":0},
+ {"matrix": [0, 8], "x":8.5, "y":0},
+ {"matrix": [0, 9], "x":9.5, "y":0},
+ {"matrix": [0,10], "x":11, "y":0},
+ {"matrix": [0,11], "x":12, "y":0},
+ {"matrix": [0,12], "x":13, "y":0},
+ {"matrix": [0,13], "x":14, "y":0},
+ {"matrix": [0,14], "x":15.25, "y":0},
+ {"matrix": [0,15], "x":16.25, "y":0},
+ {"matrix": [0,16], "x":17.25, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [1, 2], "x":2, "y":1.25},
+ {"matrix": [1, 3], "x":3, "y":1.25},
+ {"matrix": [1, 4], "x":4, "y":1.25},
+ {"matrix": [1, 5], "x":5, "y":1.25},
+ {"matrix": [1, 6], "x":6, "y":1.25},
+ {"matrix": [1, 7], "x":7, "y":1.25},
+ {"matrix": [1, 8], "x":8, "y":1.25},
+ {"matrix": [1, 9], "x":9, "y":1.25},
+ {"matrix": [1,10], "x":10, "y":1.25},
+ {"matrix": [1,11], "x":11, "y":1.25},
+ {"matrix": [1,12], "x":12, "y":1.25},
+ {"matrix": [1,13], "x":13, "y":1.25, "w":2},
+ {"matrix": [1,14], "x":15.25, "y":1.25},
+ {"matrix": [1,15], "x":16.25, "y":1.25},
+ {"matrix": [1,16], "x":17.25, "y":1.25},
+
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.25},
+ {"matrix": [2, 2], "x":2.5, "y":2.25},
+ {"matrix": [2, 3], "x":3.5, "y":2.25},
+ {"matrix": [2, 4], "x":4.5, "y":2.25},
+ {"matrix": [2, 5], "x":5.5, "y":2.25},
+ {"matrix": [2, 6], "x":6.5, "y":2.25},
+ {"matrix": [2, 7], "x":7.5, "y":2.25},
+ {"matrix": [2, 8], "x":8.5, "y":2.25},
+ {"matrix": [2, 9], "x":9.5, "y":2.25},
+ {"matrix": [2,10], "x":10.5, "y":2.25},
+ {"matrix": [2,11], "x":11.5, "y":2.25},
+ {"matrix": [2,12], "x":12.5, "y":2.25},
+ {"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
+ {"matrix": [2,14], "x":15.25, "y":2.25},
+ {"matrix": [2,15], "x":16.25, "y":2.25},
+ {"matrix": [2,16], "x":17.25, "y":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.25},
+ {"matrix": [3, 2], "x":2.75, "y":3.25},
+ {"matrix": [3, 3], "x":3.75, "y":3.25},
+ {"matrix": [3, 4], "x":4.75, "y":3.25},
+ {"matrix": [3, 5], "x":5.75, "y":3.25},
+ {"matrix": [3, 6], "x":6.75, "y":3.25},
+ {"matrix": [3, 7], "x":7.75, "y":3.25},
+ {"matrix": [3, 8], "x":8.75, "y":3.25},
+ {"matrix": [3, 9], "x":9.75, "y":3.25},
+ {"matrix": [3,10], "x":10.75, "y":3.25},
+ {"matrix": [3,11], "x":11.75, "y":3.25},
+ {"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
+
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+ {"matrix": [4, 2], "x":2.25, "y":4.25},
+ {"matrix": [4, 3], "x":3.25, "y":4.25},
+ {"matrix": [4, 4], "x":4.25, "y":4.25},
+ {"matrix": [4, 5], "x":5.25, "y":4.25},
+ {"matrix": [4, 6], "x":6.25, "y":4.25},
+ {"matrix": [4, 7], "x":7.25, "y":4.25},
+ {"matrix": [4, 8], "x":8.25, "y":4.25},
+ {"matrix": [4, 9], "x":9.25, "y":4.25},
+ {"matrix": [4,10], "x":10.25, "y":4.25},
+ {"matrix": [4,11], "x":11.25, "y":4.25},
+ {"matrix": [4,12], "x":12.25, "y":4.25, "w":2.75},
+ {"matrix": [4,15], "x":16.25, "y":4.25},
+
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
+ {"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
+ {"matrix": [5, 6], "x":4, "y":5.25, "w":7},
+ {"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
+ {"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
+ {"matrix": [5,14], "x":15.25, "y":5.25},
+ {"matrix": [5,15], "x":16.25, "y":5.25},
+ {"matrix": [5,16], "x":17.25, "y":5.25}
+ ]
+ },
"LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
@@ -485,6 +676,101 @@
{"matrix": [5,16], "x":17.25, "y":5.25}
]
},
+ "LAYOUT_tkl_ansi_wkl_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "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.5, "y":0},
+ {"matrix": [0, 7], "x":7.5, "y":0},
+ {"matrix": [0, 8], "x":8.5, "y":0},
+ {"matrix": [0, 9], "x":9.5, "y":0},
+ {"matrix": [0,10], "x":11, "y":0},
+ {"matrix": [0,11], "x":12, "y":0},
+ {"matrix": [0,12], "x":13, "y":0},
+ {"matrix": [0,13], "x":14, "y":0},
+ {"matrix": [0,14], "x":15.25, "y":0},
+ {"matrix": [0,15], "x":16.25, "y":0},
+ {"matrix": [0,16], "x":17.25, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [1, 2], "x":2, "y":1.25},
+ {"matrix": [1, 3], "x":3, "y":1.25},
+ {"matrix": [1, 4], "x":4, "y":1.25},
+ {"matrix": [1, 5], "x":5, "y":1.25},
+ {"matrix": [1, 6], "x":6, "y":1.25},
+ {"matrix": [1, 7], "x":7, "y":1.25},
+ {"matrix": [1, 8], "x":8, "y":1.25},
+ {"matrix": [1, 9], "x":9, "y":1.25},
+ {"matrix": [1,10], "x":10, "y":1.25},
+ {"matrix": [1,11], "x":11, "y":1.25},
+ {"matrix": [1,12], "x":12, "y":1.25},
+ {"matrix": [1,13], "x":13, "y":1.25},
+ {"matrix": [3,13], "x":14, "y":1.25},
+ {"matrix": [1,14], "x":15.25, "y":1.25},
+ {"matrix": [1,15], "x":16.25, "y":1.25},
+ {"matrix": [1,16], "x":17.25, "y":1.25},
+
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.25},
+ {"matrix": [2, 2], "x":2.5, "y":2.25},
+ {"matrix": [2, 3], "x":3.5, "y":2.25},
+ {"matrix": [2, 4], "x":4.5, "y":2.25},
+ {"matrix": [2, 5], "x":5.5, "y":2.25},
+ {"matrix": [2, 6], "x":6.5, "y":2.25},
+ {"matrix": [2, 7], "x":7.5, "y":2.25},
+ {"matrix": [2, 8], "x":8.5, "y":2.25},
+ {"matrix": [2, 9], "x":9.5, "y":2.25},
+ {"matrix": [2,10], "x":10.5, "y":2.25},
+ {"matrix": [2,11], "x":11.5, "y":2.25},
+ {"matrix": [2,12], "x":12.5, "y":2.25},
+ {"matrix": [2,13], "x":13.5, "y":2.25, "w":1.5},
+ {"matrix": [2,14], "x":15.25, "y":2.25},
+ {"matrix": [2,15], "x":16.25, "y":2.25},
+ {"matrix": [2,16], "x":17.25, "y":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.25},
+ {"matrix": [3, 2], "x":2.75, "y":3.25},
+ {"matrix": [3, 3], "x":3.75, "y":3.25},
+ {"matrix": [3, 4], "x":4.75, "y":3.25},
+ {"matrix": [3, 5], "x":5.75, "y":3.25},
+ {"matrix": [3, 6], "x":6.75, "y":3.25},
+ {"matrix": [3, 7], "x":7.75, "y":3.25},
+ {"matrix": [3, 8], "x":8.75, "y":3.25},
+ {"matrix": [3, 9], "x":9.75, "y":3.25},
+ {"matrix": [3,10], "x":10.75, "y":3.25},
+ {"matrix": [3,11], "x":11.75, "y":3.25},
+ {"matrix": [3,12], "x":12.75, "y":3.25, "w":2.25},
+
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":2.25},
+ {"matrix": [4, 2], "x":2.25, "y":4.25},
+ {"matrix": [4, 3], "x":3.25, "y":4.25},
+ {"matrix": [4, 4], "x":4.25, "y":4.25},
+ {"matrix": [4, 5], "x":5.25, "y":4.25},
+ {"matrix": [4, 6], "x":6.25, "y":4.25},
+ {"matrix": [4, 7], "x":7.25, "y":4.25},
+ {"matrix": [4, 8], "x":8.25, "y":4.25},
+ {"matrix": [4, 9], "x":9.25, "y":4.25},
+ {"matrix": [4,10], "x":10.25, "y":4.25},
+ {"matrix": [4,11], "x":11.25, "y":4.25},
+ {"matrix": [4,12], "x":12.25, "y":4.25, "w":1.75},
+ {"matrix": [4,13], "x":14, "y":4.25},
+ {"matrix": [4,15], "x":16.25, "y":4.25},
+
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
+ {"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
+ {"matrix": [5, 6], "x":4, "y":5.25, "w":7},
+ {"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
+ {"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
+ {"matrix": [5,14], "x":15.25, "y":5.25},
+ {"matrix": [5,15], "x":16.25, "y":5.25},
+ {"matrix": [5,16], "x":17.25, "y":5.25}
+ ]
+ },
"LAYOUT_tkl_iso": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
@@ -777,6 +1063,100 @@
{"matrix": [5,16], "x":17.25, "y":5.25}
]
},
+ "LAYOUT_tkl_iso_wkl": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "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.5, "y":0},
+ {"matrix": [0, 7], "x":7.5, "y":0},
+ {"matrix": [0, 8], "x":8.5, "y":0},
+ {"matrix": [0, 9], "x":9.5, "y":0},
+ {"matrix": [0,10], "x":11, "y":0},
+ {"matrix": [0,11], "x":12, "y":0},
+ {"matrix": [0,12], "x":13, "y":0},
+ {"matrix": [0,13], "x":14, "y":0},
+ {"matrix": [0,14], "x":15.25, "y":0},
+ {"matrix": [0,15], "x":16.25, "y":0},
+ {"matrix": [0,16], "x":17.25, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [1, 2], "x":2, "y":1.25},
+ {"matrix": [1, 3], "x":3, "y":1.25},
+ {"matrix": [1, 4], "x":4, "y":1.25},
+ {"matrix": [1, 5], "x":5, "y":1.25},
+ {"matrix": [1, 6], "x":6, "y":1.25},
+ {"matrix": [1, 7], "x":7, "y":1.25},
+ {"matrix": [1, 8], "x":8, "y":1.25},
+ {"matrix": [1, 9], "x":9, "y":1.25},
+ {"matrix": [1,10], "x":10, "y":1.25},
+ {"matrix": [1,11], "x":11, "y":1.25},
+ {"matrix": [1,12], "x":12, "y":1.25},
+ {"matrix": [1,13], "x":13, "y":1.25, "w":2},
+ {"matrix": [1,14], "x":15.25, "y":1.25},
+ {"matrix": [1,15], "x":16.25, "y":1.25},
+ {"matrix": [1,16], "x":17.25, "y":1.25},
+
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.25},
+ {"matrix": [2, 2], "x":2.5, "y":2.25},
+ {"matrix": [2, 3], "x":3.5, "y":2.25},
+ {"matrix": [2, 4], "x":4.5, "y":2.25},
+ {"matrix": [2, 5], "x":5.5, "y":2.25},
+ {"matrix": [2, 6], "x":6.5, "y":2.25},
+ {"matrix": [2, 7], "x":7.5, "y":2.25},
+ {"matrix": [2, 8], "x":8.5, "y":2.25},
+ {"matrix": [2, 9], "x":9.5, "y":2.25},
+ {"matrix": [2,10], "x":10.5, "y":2.25},
+ {"matrix": [2,11], "x":11.5, "y":2.25},
+ {"matrix": [2,12], "x":12.5, "y":2.25},
+ {"matrix": [2,14], "x":15.25, "y":2.25},
+ {"matrix": [2,15], "x":16.25, "y":2.25},
+ {"matrix": [2,16], "x":17.25, "y":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.25},
+ {"matrix": [3, 2], "x":2.75, "y":3.25},
+ {"matrix": [3, 3], "x":3.75, "y":3.25},
+ {"matrix": [3, 4], "x":4.75, "y":3.25},
+ {"matrix": [3, 5], "x":5.75, "y":3.25},
+ {"matrix": [3, 6], "x":6.75, "y":3.25},
+ {"matrix": [3, 7], "x":7.75, "y":3.25},
+ {"matrix": [3, 8], "x":8.75, "y":3.25},
+ {"matrix": [3, 9], "x":9.75, "y":3.25},
+ {"matrix": [3,10], "x":10.75, "y":3.25},
+ {"matrix": [3,11], "x":11.75, "y":3.25},
+ {"matrix": [3,12], "x":12.75, "y":3.25},
+ {"matrix": [2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":1.25},
+ {"matrix": [4, 1], "x":1.25, "y":4.25},
+ {"matrix": [4, 2], "x":2.25, "y":4.25},
+ {"matrix": [4, 3], "x":3.25, "y":4.25},
+ {"matrix": [4, 4], "x":4.25, "y":4.25},
+ {"matrix": [4, 5], "x":5.25, "y":4.25},
+ {"matrix": [4, 6], "x":6.25, "y":4.25},
+ {"matrix": [4, 7], "x":7.25, "y":4.25},
+ {"matrix": [4, 8], "x":8.25, "y":4.25},
+ {"matrix": [4, 9], "x":9.25, "y":4.25},
+ {"matrix": [4,10], "x":10.25, "y":4.25},
+ {"matrix": [4,11], "x":11.25, "y":4.25},
+ {"matrix": [4,12], "x":12.25, "y":4.25, "w":2.75},
+ {"matrix": [4,15], "x":16.25, "y":4.25},
+
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
+ {"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
+ {"matrix": [5, 6], "x":4, "y":5.25, "w":7},
+ {"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
+ {"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
+ {"matrix": [5,14], "x":15.25, "y":5.25},
+ {"matrix": [5,15], "x":16.25, "y":5.25},
+ {"matrix": [5,16], "x":17.25, "y":5.25}
+ ]
+ },
"LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
@@ -875,6 +1255,102 @@
{"matrix": [5,16], "x":17.25, "y":5.25}
]
},
+ "LAYOUT_tkl_iso_wkl_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x":0, "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.5, "y":0},
+ {"matrix": [0, 7], "x":7.5, "y":0},
+ {"matrix": [0, 8], "x":8.5, "y":0},
+ {"matrix": [0, 9], "x":9.5, "y":0},
+ {"matrix": [0,10], "x":11, "y":0},
+ {"matrix": [0,11], "x":12, "y":0},
+ {"matrix": [0,12], "x":13, "y":0},
+ {"matrix": [0,13], "x":14, "y":0},
+ {"matrix": [0,14], "x":15.25, "y":0},
+ {"matrix": [0,15], "x":16.25, "y":0},
+ {"matrix": [0,16], "x":17.25, "y":0},
+
+ {"matrix": [1, 0], "x":0, "y":1.25},
+ {"matrix": [1, 1], "x":1, "y":1.25},
+ {"matrix": [1, 2], "x":2, "y":1.25},
+ {"matrix": [1, 3], "x":3, "y":1.25},
+ {"matrix": [1, 4], "x":4, "y":1.25},
+ {"matrix": [1, 5], "x":5, "y":1.25},
+ {"matrix": [1, 6], "x":6, "y":1.25},
+ {"matrix": [1, 7], "x":7, "y":1.25},
+ {"matrix": [1, 8], "x":8, "y":1.25},
+ {"matrix": [1, 9], "x":9, "y":1.25},
+ {"matrix": [1,10], "x":10, "y":1.25},
+ {"matrix": [1,11], "x":11, "y":1.25},
+ {"matrix": [1,12], "x":12, "y":1.25},
+ {"matrix": [1,13], "x":13, "y":1.25},
+ {"matrix": [3,13], "x":14, "y":1.25},
+ {"matrix": [1,14], "x":15.25, "y":1.25},
+ {"matrix": [1,15], "x":16.25, "y":1.25},
+ {"matrix": [1,16], "x":17.25, "y":1.25},
+
+ {"matrix": [2, 0], "x":0, "y":2.25, "w":1.5},
+ {"matrix": [2, 1], "x":1.5, "y":2.25},
+ {"matrix": [2, 2], "x":2.5, "y":2.25},
+ {"matrix": [2, 3], "x":3.5, "y":2.25},
+ {"matrix": [2, 4], "x":4.5, "y":2.25},
+ {"matrix": [2, 5], "x":5.5, "y":2.25},
+ {"matrix": [2, 6], "x":6.5, "y":2.25},
+ {"matrix": [2, 7], "x":7.5, "y":2.25},
+ {"matrix": [2, 8], "x":8.5, "y":2.25},
+ {"matrix": [2, 9], "x":9.5, "y":2.25},
+ {"matrix": [2,10], "x":10.5, "y":2.25},
+ {"matrix": [2,11], "x":11.5, "y":2.25},
+ {"matrix": [2,12], "x":12.5, "y":2.25},
+ {"matrix": [2,14], "x":15.25, "y":2.25},
+ {"matrix": [2,15], "x":16.25, "y":2.25},
+ {"matrix": [2,16], "x":17.25, "y":2.25},
+
+ {"matrix": [3, 0], "x":0, "y":3.25, "w":1.75},
+ {"matrix": [3, 1], "x":1.75, "y":3.25},
+ {"matrix": [3, 2], "x":2.75, "y":3.25},
+ {"matrix": [3, 3], "x":3.75, "y":3.25},
+ {"matrix": [3, 4], "x":4.75, "y":3.25},
+ {"matrix": [3, 5], "x":5.75, "y":3.25},
+ {"matrix": [3, 6], "x":6.75, "y":3.25},
+ {"matrix": [3, 7], "x":7.75, "y":3.25},
+ {"matrix": [3, 8], "x":8.75, "y":3.25},
+ {"matrix": [3, 9], "x":9.75, "y":3.25},
+ {"matrix": [3,10], "x":10.75, "y":3.25},
+ {"matrix": [3,11], "x":11.75, "y":3.25},
+ {"matrix": [3,12], "x":12.75, "y":3.25},
+ {"matrix": [2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+ {"matrix": [4, 0], "x":0, "y":4.25, "w":1.25},
+ {"matrix": [4, 1], "x":1.25, "y":4.25},
+ {"matrix": [4, 2], "x":2.25, "y":4.25},
+ {"matrix": [4, 3], "x":3.25, "y":4.25},
+ {"matrix": [4, 4], "x":4.25, "y":4.25},
+ {"matrix": [4, 5], "x":5.25, "y":4.25},
+ {"matrix": [4, 6], "x":6.25, "y":4.25},
+ {"matrix": [4, 7], "x":7.25, "y":4.25},
+ {"matrix": [4, 8], "x":8.25, "y":4.25},
+ {"matrix": [4, 9], "x":9.25, "y":4.25},
+ {"matrix": [4,10], "x":10.25, "y":4.25},
+ {"matrix": [4,11], "x":11.25, "y":4.25},
+ {"matrix": [4,12], "x":12.25, "y":4.25, "w":1.75},
+ {"matrix": [4,13], "x":14, "y":4.25},
+ {"matrix": [4,15], "x":16.25, "y":4.25},
+
+ {"matrix": [5, 0], "x":0, "y":5.25, "w":1.5},
+ {"matrix": [5, 2], "x":2.5, "y":5.25, "w":1.5},
+ {"matrix": [5, 6], "x":4, "y":5.25, "w":7},
+ {"matrix": [5,11], "x":11, "y":5.25, "w":1.5},
+ {"matrix": [5,13], "x":13.5, "y":5.25, "w":1.5},
+ {"matrix": [5,14], "x":15.25, "y":5.25},
+ {"matrix": [5,15], "x":16.25, "y":5.25},
+ {"matrix": [5,16], "x":17.25, "y":5.25}
+ ]
+ },
"LAYOUT_all": {
"layout": [
{"matrix": [0, 0], "x":0, "y":0},
diff --git a/keyboards/plywrks/ply8x/keymaps/default/keymap.c b/keyboards/plywrks/ply8x/solder/keymaps/default/keymap.c
index 4ca5b29581..4ca5b29581 100644
--- a/keyboards/plywrks/ply8x/keymaps/default/keymap.c
+++ b/keyboards/plywrks/ply8x/solder/keymaps/default/keymap.c
diff --git a/keyboards/plywrks/ply8x/solder/mcuconf.h b/keyboards/plywrks/ply8x/solder/mcuconf.h
new file mode 100644
index 0000000000..aceb2e3dfc
--- /dev/null
+++ b/keyboards/plywrks/ply8x/solder/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Ramon Imbao (@ramonimbao)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 41fd5c8537..a29808d04d 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -14,6 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <stdlib.h>
#include "keycode_lookup.h"
#include "quantum_keycodes.h"
#include "keymap_us.h"
diff --git a/keyboards/splitography/keymaps/default/keymap.c b/keyboards/splitography/keymaps/default/keymap.c
index 9c6c7d6b26..5d26eb9682 100644
--- a/keyboards/splitography/keymaps/default/keymap.c
+++ b/keyboards/splitography/keymaps/default/keymap.c
@@ -214,9 +214,9 @@ void plover(keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
}
diff --git a/keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c b/keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c
index 787f448ffb..a3cb183758 100644
--- a/keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c
+++ b/keyboards/splitography/keymaps/default_with_ctl_shft_alt_switched/keymap.c
@@ -214,9 +214,9 @@ void plover(keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
}
diff --git a/keyboards/splitography/keymaps/dvorak/keymap.c b/keyboards/splitography/keymaps/dvorak/keymap.c
index 992cfd0abb..0edec7043c 100644
--- a/keyboards/splitography/keymaps/dvorak/keymap.c
+++ b/keyboards/splitography/keymaps/dvorak/keymap.c
@@ -214,9 +214,9 @@ void plover(keyrecord_t *record) {
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
- keymap_config.raw = eeconfig_read_keymap();
+ eeconfig_read_keymap(&keymap_config);
keymap_config.nkro = 1;
- eeconfig_update_keymap(keymap_config.raw);
+ eeconfig_update_keymap(&keymap_config);
}
}
diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c
index c9af479bf5..c01fb7b01d 100644
--- a/keyboards/system76/launch_1/launch_1.c
+++ b/keyboards/system76/launch_1/launch_1.c
@@ -16,6 +16,7 @@
*/
#include "quantum.h"
+#include "eeprom.h"
#include "usb_mux.h"
@@ -73,7 +74,7 @@ led_config_t g_led_config = { {
} };
#endif // RGB_MATRIX_ENABLE
-bool eeprom_is_valid(void) {
+bool eeprom_is_valid(void) {
return (
eeprom_read_word(((void *)EEPROM_MAGIC_ADDR)) == EEPROM_MAGIC &&
eeprom_read_byte(((void *)EEPROM_VERSION_ADDR)) == EEPROM_VERSION
diff --git a/keyboards/teleport/native/board.h b/keyboards/teleport/native/board.h
new file mode 100644
index 0000000000..41efeb2c1a
--- /dev/null
+++ b/keyboards/teleport/native/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Moritz Plattner
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/teleport/native/config.h b/keyboards/teleport/native/config.h
index 31d0025883..cd823d725e 100644
--- a/keyboards/teleport/native/config.h
+++ b/keyboards/teleport/native/config.h
@@ -67,6 +67,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef ENABLE_RGB_MATRIX_TYPING_HEATMAP
#define RGB_MATRIX_TYPING_HEATMAP_SLIM
#endif
-
-/* Set HSE clock since it differs from F411 default */
-#define STM32_HSECLK 16000000
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/board.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/board.h
new file mode 100644
index 0000000000..5b80eb2230
--- /dev/null
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/board.h
@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
index 71e60e9cfe..c10d26b9b2 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_post_2013/overnumpad_1xb/config.h
@@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
-#define STM32_HSECLK 16000000
-
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/board.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/board.h
new file mode 100644
index 0000000000..5b80eb2230
--- /dev/null
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/board.h
@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
index 71e60e9cfe..c10d26b9b2 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/overnumpad_1xb/config.h
@@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
-#define STM32_HSECLK 16000000
-
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/board.h b/keyboards/unicomp/pc122/overnumpad_1xb/board.h
new file mode 100644
index 0000000000..5b80eb2230
--- /dev/null
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/board.h
@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/unicomp/pc122/overnumpad_1xb/config.h b/keyboards/unicomp/pc122/overnumpad_1xb/config.h
index 71e60e9cfe..c10d26b9b2 100644
--- a/keyboards/unicomp/pc122/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/pc122/overnumpad_1xb/config.h
@@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
-#define STM32_HSECLK 16000000
-
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/board.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/board.h
new file mode 100644
index 0000000000..5b80eb2230
--- /dev/null
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/board.h
@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
index 71e60e9cfe..c10d26b9b2 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_post_2013/overnumpad_1xb/config.h
@@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
-#define STM32_HSECLK 16000000
-
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/board.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/board.h
new file mode 100644
index 0000000000..5b80eb2230
--- /dev/null
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/board.h
@@ -0,0 +1,8 @@
+// Copyright 2020 Purdea Andrei
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
index 71e60e9cfe..c10d26b9b2 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
@@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
-#define STM32_HSECLK 16000000
-
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20
diff --git a/keyboards/vitamins_included/rev2/rev2.c b/keyboards/vitamins_included/rev2/rev2.c
index e445a3da45..28bd73cc75 100644
--- a/keyboards/vitamins_included/rev2/rev2.c
+++ b/keyboards/vitamins_included/rev2/rev2.c
@@ -12,7 +12,7 @@ bool is_keyboard_left(void) {
gpio_set_pin_input(SPLIT_HAND_PIN);
return x;
#elif defined(EE_HANDS)
- return eeprom_read_byte(EECONFIG_HANDEDNESS);
+ return eeconfig_read_handedness();
#endif
return is_keyboard_master();
diff --git a/keyboards/werk_technica/one/board.h b/keyboards/werk_technica/one/board.h
new file mode 100644
index 0000000000..3ad450d023
--- /dev/null
+++ b/keyboards/werk_technica/one/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/werk_technica/one/config.h b/keyboards/werk_technica/one/config.h
deleted file mode 100644
index 765e70851b..0000000000
--- a/keyboards/werk_technica/one/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Set HSE clock since it differs from F411 default */
-#define STM32_HSECLK 16000000 \ No newline at end of file
diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index 92c43c794d..7e56d98356 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -33,7 +33,7 @@
// Called from via_init() if VIA_ENABLE
// Called from matrix_init_kb() if not VIA_ENABLE
-void via_init_kb(void)
+void wt_main_init(void)
{
// This checks both an EEPROM reset (from bootmagic lite, keycodes)
// and also firmware build date (from via_eeprom_is_valid())
@@ -64,11 +64,9 @@ void via_init_kb(void)
void matrix_init_kb(void)
{
// If VIA is disabled, we still need to load backlight settings.
- // Call via_init_kb() the same way as via_init(), with setting
- // EEPROM valid afterwards.
+ // Call via_init_kb() the same way as via_init_kb() does.
#ifndef VIA_ENABLE
- via_init_kb();
- via_eeprom_set_valid(true);
+ wt_main_init();
#endif // VIA_ENABLE
matrix_init_user();
@@ -109,6 +107,10 @@ void suspend_wakeup_init_kb(void)
// Moving this to the bottom of this source file is a workaround
// for an intermittent compiler error for Atmel compiler.
#ifdef VIA_ENABLE
+void via_init_kb(void) {
+ wt_main_init();
+}
+
void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
uint8_t *command_id = &(data[0]);
uint8_t *channel_id = &(data[1]);
@@ -159,50 +161,3 @@ void via_set_device_indication(uint8_t value)
}
#endif // VIA_ENABLE
-
-//
-// In the case of VIA being disabled, we still need to check if
-// keyboard level EEPROM memory is valid before loading.
-// Thus these are copies of the same functions in VIA, since
-// the backlight settings reuse VIA's EEPROM magic/version,
-// and the ones in via.c won't be compiled in.
-//
-// Yes, this is sub-optimal, and is only here for completeness
-// (i.e. catering to the 1% of people that want wilba.tech LED bling
-// AND want persistent settings BUT DON'T want to use dynamic keymaps/VIA).
-//
-#ifndef VIA_ENABLE
-
-bool via_eeprom_is_valid(void)
-{
- char *p = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
- uint8_t magic0 = ( ( p[2] & 0x0F ) << 4 ) | ( p[3] & 0x0F );
- uint8_t magic1 = ( ( p[5] & 0x0F ) << 4 ) | ( p[6] & 0x0F );
- uint8_t magic2 = ( ( p[8] & 0x0F ) << 4 ) | ( p[9] & 0x0F );
-
- return (eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0 ) == magic0 &&
- eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1 ) == magic1 &&
- eeprom_read_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2 ) == magic2 );
-}
-
-void via_eeprom_set_valid(bool valid)
-{
- char *p = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
- uint8_t magic0 = ( ( p[2] & 0x0F ) << 4 ) | ( p[3] & 0x0F );
- uint8_t magic1 = ( ( p[5] & 0x0F ) << 4 ) | ( p[6] & 0x0F );
- uint8_t magic2 = ( ( p[8] & 0x0F ) << 4 ) | ( p[9] & 0x0F );
-
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+0, valid ? magic0 : 0xFF);
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+1, valid ? magic1 : 0xFF);
- eeprom_update_byte( (void*)VIA_EEPROM_MAGIC_ADDR+2, valid ? magic2 : 0xFF);
-}
-
-void via_eeprom_reset(void)
-{
- // Set the VIA specific EEPROM state as invalid.
- via_eeprom_set_valid(false);
- // Set the TMK/QMK EEPROM state as invalid.
- eeconfig_disable();
-}
-
-#endif // VIA_ENABLE
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index 01fefc8ecc..8359aab135 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -25,6 +25,8 @@
#include "progmem.h"
#include "eeprom.h"
+#include "nvm_eeprom_eeconfig_internal.h" // expose EEPROM addresses, no appetite to move legacy/deprecated code to nvm
+#include "nvm_eeprom_via_internal.h" // expose EEPROM addresses, no appetite to move legacy/deprecated code to nvm
#include "via.h" // uses EEPROM address, lighting value IDs
#define MONO_BACKLIGHT_CONFIG_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index e52d002060..744bcb262d 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -66,6 +66,8 @@
#include "quantum/color.h"
#include "eeprom.h"
+#include "nvm_eeprom_eeconfig_internal.h" // expose EEPROM addresses, no appetite to move legacy/deprecated code to nvm
+#include "nvm_eeprom_via_internal.h" // expose EEPROM addresses, no appetite to move legacy/deprecated code to nvm
#include "via.h" // uses EEPROM address, lighting value IDs
#define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
diff --git a/keyboards/xelus/la_plus/rgb_matrix_kb.inc b/keyboards/xelus/la_plus/rgb_matrix_kb.inc
index 88dd2ab0a2..93d52ec9d0 100644
--- a/keyboards/xelus/la_plus/rgb_matrix_kb.inc
+++ b/keyboards/xelus/la_plus/rgb_matrix_kb.inc
@@ -31,7 +31,7 @@ static void startup_animation_setleds(effect_params_t* params, bool dots) {
} else if (num == 0 || num == 1 || num == 2) {
return;
} else if (num >= 22) {
- eeprom_read_block(&rgb_matrix_config, EECONFIG_RGB_MATRIX, sizeof(rgb_matrix_config));
+ eeconfig_read_rgb_matrix(&rgb_matrix_config);
rgb_matrix_mode_noeeprom(rgb_matrix_config.mode);
return;
}
diff --git a/keyboards/xelus/rs108/board.h b/keyboards/xelus/rs108/board.h
new file mode 100644
index 0000000000..cce4af40f9
--- /dev/null
+++ b/keyboards/xelus/rs108/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Harrison Chan (Xelus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/xelus/rs108/config.h b/keyboards/xelus/rs108/config.h
index 3d3bc49228..883ed2b9aa 100644
--- a/keyboards/xelus/rs108/config.h
+++ b/keyboards/xelus/rs108/config.h
@@ -28,6 +28,3 @@
// Hardware Defines
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-// HSE CLK
-#define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/rs60/rev2_0/board.h b/keyboards/xelus/rs60/rev2_0/board.h
new file mode 100644
index 0000000000..cce4af40f9
--- /dev/null
+++ b/keyboards/xelus/rs60/rev2_0/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Harrison Chan (Xelus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/xelus/rs60/rev2_0/config.h b/keyboards/xelus/rs60/rev2_0/config.h
index 3d3bc49228..883ed2b9aa 100644
--- a/keyboards/xelus/rs60/rev2_0/config.h
+++ b/keyboards/xelus/rs60/rev2_0/config.h
@@ -28,6 +28,3 @@
// Hardware Defines
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-// HSE CLK
-#define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/board.h b/keyboards/xelus/valor_frl_tkl/rev2_0/board.h
new file mode 100644
index 0000000000..cce4af40f9
--- /dev/null
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Harrison Chan (Xelus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h b/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
deleted file mode 100644
index b085b99d88..0000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define STM32_HSECLK 16000000
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/board.h b/keyboards/xelus/valor_frl_tkl/rev2_1/board.h
new file mode 100644
index 0000000000..cce4af40f9
--- /dev/null
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/board.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Harrison Chan (Xelus)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h b/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
deleted file mode 100644
index b085b99d88..0000000000
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Harrison Chan (Xelus)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define STM32_HSECLK 16000000