aboutsummaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/aek64/aek64.c13
-rw-r--r--keyboards/handwired/alcor_dactyl/keyboard.json5
-rw-r--r--keyboards/handwired/alcor_dactyl/rules.mk1
-rw-r--r--keyboards/handwired/battleship_gamepad/battleship_gamepad.c8
-rw-r--r--keyboards/handwired/battleship_gamepad/config.h21
-rw-r--r--keyboards/handwired/battleship_gamepad/keyboard.json8
-rw-r--r--keyboards/handwired/battleship_gamepad/rules.mk1
-rw-r--r--keyboards/handwired/bento/rev1/config.h (renamed from keyboards/handwired/elrgo_s/keymaps/default/config.h)6
-rw-r--r--keyboards/handwired/bento/rev1/rev1.c28
-rw-r--r--keyboards/handwired/brain/keyboard.json4
-rw-r--r--keyboards/handwired/chiron/config.h21
-rw-r--r--keyboards/handwired/chiron/keyboard.json7
-rw-r--r--keyboards/handwired/chiron/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/colorlice/colorlice.c29
-rw-r--r--keyboards/handwired/colorlice/keyboard.json6
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h3
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h3
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h3
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h3
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h23
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h23
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h24
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h23
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h23
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h1
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json6
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk3
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h23
-rw-r--r--keyboards/handwired/dactyl_minidox/config.h25
-rw-r--r--keyboards/handwired/dactyl_minidox/dactyl_minidox.c66
-rw-r--r--keyboards/handwired/dactyl_minidox/keyboard.json56
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c26
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/default/keymap.json13
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h105
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c76
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h36
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c386
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk18
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/via/config.h22
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c37
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/via/keymap.json18
-rw-r--r--keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_minidox/readme.md2
-rw-r--r--keyboards/handwired/dmote/keyboard.json4
-rw-r--r--keyboards/handwired/elrgo_s/keyboard.json4
-rw-r--r--keyboards/handwired/evk/v1_3/v1_3.c9
-rw-r--r--keyboards/handwired/freoduo/keyboard.json4
-rw-r--r--keyboards/handwired/jankrp2040dactyl/keyboard.json5
-rw-r--r--keyboards/handwired/jankrp2040dactyl/rules.mk1
-rw-r--r--keyboards/handwired/jotlily60/keyboard.json4
-rw-r--r--keyboards/handwired/jtallbean/split_65/config.h36
-rw-r--r--keyboards/handwired/jtallbean/split_65/keyboard.json10
-rw-r--r--keyboards/handwired/jtallbean/split_65/split_65.c43
-rw-r--r--keyboards/handwired/ks63/config.h1
-rw-r--r--keyboards/handwired/ks63/keyboard.json4
-rw-r--r--keyboards/handwired/myskeeb/keyboard.json4
-rw-r--r--keyboards/handwired/not_so_minidox/config.h34
-rw-r--r--keyboards/handwired/not_so_minidox/keyboard.json4
-rw-r--r--keyboards/handwired/p65rgb/p65rgb.c31
-rw-r--r--keyboards/handwired/prime_exl_plus/keyboard.json4
-rw-r--r--keyboards/handwired/prime_exl_plus/prime_exl_plus.c19
-rw-r--r--keyboards/handwired/promethium/promethium.c4
-rw-r--r--keyboards/handwired/pytest/has_template/keymaps/default/keymap.c5
-rw-r--r--keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json9
-rw-r--r--keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c23
-rw-r--r--keyboards/handwired/pytest/has_template/readme.md0
-rw-r--r--keyboards/handwired/pytest/has_template/rules.mk0
-rw-r--r--keyboards/handwired/pytest/has_template/templates/keymap.c2
-rw-r--r--keyboards/handwired/pytest/has_template/templates/keymap.json3
-rw-r--r--keyboards/handwired/qc60/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/qc60/proto/keyboard.json4
-rw-r--r--keyboards/handwired/retro_refit/keyboard.json6
-rw-r--r--keyboards/handwired/retro_refit/retro_refit.c12
-rw-r--r--keyboards/handwired/riblee_split/config.h3
-rw-r--r--keyboards/handwired/riblee_split/keyboard.json6
-rw-r--r--keyboards/handwired/riblee_split/rules.mk1
-rw-r--r--keyboards/handwired/selene/keyboard.json5
-rw-r--r--keyboards/handwired/selene/selene.c20
-rw-r--r--keyboards/handwired/selene/selene.h23
-rw-r--r--keyboards/handwired/sick68/keymaps/via/config.h4
-rw-r--r--keyboards/handwired/split65/promicro/keyboard.json4
-rw-r--r--keyboards/handwired/split65/stm32/keyboard.json5
-rw-r--r--keyboards/handwired/split65/stm32/rules.mk1
-rw-r--r--keyboards/handwired/split89/config.h36
-rw-r--r--keyboards/handwired/split89/keyboard.json7
-rw-r--r--keyboards/handwired/split_cloud/keyboard.json4
-rw-r--r--keyboards/handwired/splittest/bluepill/config.h2
-rw-r--r--keyboards/handwired/splittest/bluepill/keyboard.json5
-rw-r--r--keyboards/handwired/splittest/promicro/config.h3
-rw-r--r--keyboards/handwired/splittest/promicro/keyboard.json3
-rw-r--r--keyboards/handwired/splittest/teensy_2/config.h3
-rw-r--r--keyboards/handwired/splittest/teensy_2/keyboard.json3
-rw-r--r--keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h2
-rw-r--r--keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h2
-rw-r--r--keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json4
-rw-r--r--keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c20
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/config.h1
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json3
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h1
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json8
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk3
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h1
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json8
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk2
-rw-r--r--keyboards/handwired/tsubasa/keyboard.json4
-rw-r--r--keyboards/handwired/unk/keymaps/default/config.h23
-rw-r--r--keyboards/handwired/unk/rev1/config.h37
-rw-r--r--keyboards/handwired/unk/rev1/keyboard.json4
-rw-r--r--keyboards/handwired/xealous/config.h3
-rw-r--r--keyboards/handwired/z150/config.h38
-rw-r--r--keyboards/handwired/z150/keyboard.json6
-rw-r--r--keyboards/handwired/z150/z150.c39
112 files changed, 254 insertions, 1590 deletions
diff --git a/keyboards/handwired/aek64/aek64.c b/keyboards/handwired/aek64/aek64.c
index 130d014616..21589b6910 100644
--- a/keyboards/handwired/aek64/aek64.c
+++ b/keyboards/handwired/aek64/aek64.c
@@ -16,21 +16,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
-/*
- * Hardware function pre initialisation.
- * See https://docs.qmk.fm/#/custom_quantum_functions?id=example-keyboard_pre_init_user-implementation
- */
-void keyboard_pre_init_user(void) {
- // Call the keyboard pre init code.
-
+void keyboard_pre_init_kb(void) {
// Set our LED pins as output
gpio_set_pin_output(C3);
+
+ keyboard_pre_init_user();
}
void matrix_init_kb(void) {
-
// Flash the led 1 sec on startup.
gpio_write_pin_high(C3);
wait_ms(1000);
gpio_write_pin_low(C3);
+
+ matrix_init_user();
}
diff --git a/keyboards/handwired/alcor_dactyl/keyboard.json b/keyboards/handwired/alcor_dactyl/keyboard.json
index c179278c09..b38d39bfcc 100644
--- a/keyboards/handwired/alcor_dactyl/keyboard.json
+++ b/keyboards/handwired/alcor_dactyl/keyboard.json
@@ -19,7 +19,10 @@
"rgb_matrix": true
},
"split": {
- "enabled": true
+ "enabled": true,
+ "serial": {
+ "driver": "vendor"
+ }
},
"diode_direction": "COL2ROW",
"matrix_pins": {
diff --git a/keyboards/handwired/alcor_dactyl/rules.mk b/keyboards/handwired/alcor_dactyl/rules.mk
deleted file mode 100644
index 161ec22b16..0000000000
--- a/keyboards/handwired/alcor_dactyl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SERIAL_DRIVER = vendor
diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
index cccc03a287..6bfcb17fd4 100644
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
+++ b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
@@ -16,13 +16,9 @@
#include "quantum.h"
-/* joystick config */
-joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
- [0] = JOYSTICK_AXIS_IN(F5, 1023, 512, 0),
- [1] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023)
-};
-
/* joystick button code (thumbstick pressed) */
void keyboard_pre_init_kb(void) {
gpio_set_pin_input_high(F6);
+
+ keyboard_pre_init_user();
}
diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h
deleted file mode 100644
index b785c80aad..0000000000
--- a/keyboards/handwired/battleship_gamepad/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Andrew Braini
- *
- * 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
-
-/* joystick configuration */
-#define JOYSTICK_BUTTON_COUNT 25
-#define JOYSTICK_AXIS_RESOLUTION 10
diff --git a/keyboards/handwired/battleship_gamepad/keyboard.json b/keyboards/handwired/battleship_gamepad/keyboard.json
index 2832741875..8350f31fdd 100644
--- a/keyboards/handwired/battleship_gamepad/keyboard.json
+++ b/keyboards/handwired/battleship_gamepad/keyboard.json
@@ -13,6 +13,14 @@
"rows": ["B6", "B2", "B3", "B1", "F7"]
},
"diode_direction": "COL2ROW",
+ "joystick": {
+ "button_count": 25,
+ "axis_resolution": 10,
+ "axes": {
+ "x": {"input_pin": "F5", "low": 1023, "rest": 512, "high": 0},
+ "y": {"input_pin": "F4", "low": 0, "rest": 512, "high": 1023}
+ }
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk
deleted file mode 100644
index c5ab560bca..0000000000
--- a/keyboards/handwired/battleship_gamepad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-JOYSTICK_DRIVER = analog
diff --git a/keyboards/handwired/elrgo_s/keymaps/default/config.h b/keyboards/handwired/bento/rev1/config.h
index b5f8c85421..aeb48915b9 100644
--- a/keyboards/handwired/elrgo_s/keymaps/default/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 Yaroslav Smirnov <[email protected]>
+/* Copyright 2020 GhostSeven <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -13,8 +13,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#pragma once
-#define MASTER_LEFT
-// #define MASTER_RIGHT
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
diff --git a/keyboards/handwired/bento/rev1/rev1.c b/keyboards/handwired/bento/rev1/rev1.c
deleted file mode 100644
index 1dd5b683f1..0000000000
--- a/keyboards/handwired/bento/rev1/rev1.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2020 GhostSeven <[email protected]>
- *
- * 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 "quantum.h"
-
-void eeconfig_init_kb(void) {
-#ifdef RGBLIGHT_ENABLE
- rgblight_enable(); // Enable RGB by default
- rgblight_sethsv(0, 255, 255); // Set default HSV - red hue, full saturation, full brightness
-#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
- rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
-#endif
-#endif
-
- eeconfig_init_user();
-}
diff --git a/keyboards/handwired/brain/keyboard.json b/keyboards/handwired/brain/keyboard.json
index 95c09ecfc9..c5f8c3682c 100644
--- a/keyboards/handwired/brain/keyboard.json
+++ b/keyboards/handwired/brain/keyboard.json
@@ -40,7 +40,6 @@
},
"split": {
"enabled": true,
- "soft_serial_pin": "D0",
"bootmagic": {
"matrix": [5, 0]
},
@@ -48,6 +47,9 @@
"right": {
"cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D1"]
}
+ },
+ "serial": {
+ "pin": "D0"
}
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h
deleted file mode 100644
index 254bed5c74..0000000000
--- a/keyboards/handwired/chiron/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2019 Mike Hix
-
-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
-
-// Pro Micro Pins RX1
-#define SPLIT_HAND_PIN D2
diff --git a/keyboards/handwired/chiron/keyboard.json b/keyboards/handwired/chiron/keyboard.json
index f02c8cea28..1685a9d477 100644
--- a/keyboards/handwired/chiron/keyboard.json
+++ b/keyboards/handwired/chiron/keyboard.json
@@ -41,7 +41,12 @@
},
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "handedness": {
+ "pin": "D2"
+ },
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h
index 5d8a8a083d..b636b8de81 100644
--- a/keyboards/handwired/chiron/keymaps/default/config.h
+++ b/keyboards/handwired/chiron/keymaps/default/config.h
@@ -17,7 +17,6 @@
#pragma once
#define MASTER_RIGHT
-//#define MASTER_LEFT
#define PERMISSIVE_HOLD
diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c
index ede3fba82f..81e87d8c7a 100644
--- a/keyboards/handwired/colorlice/colorlice.c
+++ b/keyboards/handwired/colorlice/colorlice.c
@@ -37,32 +37,3 @@ led_config_t g_led_config = { {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1
} };
#endif
-
-#ifdef RGB_MATRIX_ENABLE
-void suspend_power_down_kb(void)
-{
- rgb_matrix_set_suspend_state(true);
- suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void)
-{
- rgb_matrix_set_suspend_state(false);
- suspend_wakeup_init_user();
-}
-#endif
-
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- // gpio_write_pin sets the pin high for 1 and low for 0.
- // In this example the pins are inverted, setting
- // it low/0 turns it on, and high/1 turns the LED off.
- // This behavior depends on whether the LED is between the pin
- // and VCC or the pin and GND.
- gpio_write_pin(B2, !led_state.num_lock);
- gpio_write_pin(C6, !led_state.caps_lock);
- gpio_write_pin(B7, !led_state.scroll_lock);
- }
- return res;
-}
diff --git a/keyboards/handwired/colorlice/keyboard.json b/keyboards/handwired/colorlice/keyboard.json
index 77f5ded097..4ccc10527c 100644
--- a/keyboards/handwired/colorlice/keyboard.json
+++ b/keyboards/handwired/colorlice/keyboard.json
@@ -65,6 +65,12 @@
"build": {
"lto": true
},
+ "indicators": {
+ "caps_lock": "C6",
+ "num_lock": "B2",
+ "scroll_lock": "B7",
+ "on_state": 0
+ },
"features": {
"bootmagic": true,
"command": false,
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
index 335ac8cd3e..b0e65f08c9 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/config.h
@@ -21,7 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* Select hand configuration */
-//#define MASTER_LEFT
-//#define MASTER_RIGHT
-
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
index cbacb25ca4..b0e65f08c9 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/config.h
@@ -21,7 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
index 335ac8cd3e..b0e65f08c9 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/config.h
@@ -21,7 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* Select hand configuration */
-//#define MASTER_LEFT
-//#define MASTER_RIGHT
-
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h
index ce7fd324eb..1972348cef 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/via/config.h
@@ -22,7 +22,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h
deleted file mode 100644
index 4d83c191f3..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_4_3/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-
-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 MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
deleted file mode 100644
index 4d83c191f3..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-
-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 MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
deleted file mode 100644
index b63c5788d1..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-//#define EE_HANDS
-// Rows are doubled-up
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
deleted file mode 100644
index 4d83c191f3..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-
-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 MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h b/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
deleted file mode 100644
index 4d83c191f3..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/via/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-
-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 MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
index 9639d4ba1d..2258a17c2e 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
@@ -19,7 +19,6 @@
// in col2row col is input, and row is output
// #define SPLIT_HAND_MATRIX_GRID A10, A4
// 68kohm
-#define SPLIT_HAND_PIN B10
/* connection */
#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode.
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
index 73ce0d27d5..efefb5e550 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
@@ -8,6 +8,12 @@
"enabled": true,
"bootmagic": {
"matrix": [7, 0]
+ },
+ "serial": {
+ "driver": "usart"
+ },
+ "handedness": {
+ "pin": "B10"
}
},
"development_board": "blackpill_f411",
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
deleted file mode 100644
index c018471cad..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# split settings
-# https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver
-SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
deleted file mode 100644
index 4d83c191f3..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-
-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 MASTER_LEFT
-//#define MASTER_RIGHT
-
-//#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_minidox/config.h b/keyboards/handwired/dactyl_minidox/config.h
deleted file mode 100644
index 21ef0b32c2..0000000000
--- a/keyboards/handwired/dactyl_minidox/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-Copyright 2021 @dlford
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#undef LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#undef LOCKING_RESYNC_ENABLE
-
-/* Enables This makes it easier for fast typists to use dual-function keys */
-#undef PERMISSIVE_HOLD
diff --git a/keyboards/handwired/dactyl_minidox/dactyl_minidox.c b/keyboards/handwired/dactyl_minidox/dactyl_minidox.c
deleted file mode 100644
index 5afb908d02..0000000000
--- a/keyboards/handwired/dactyl_minidox/dactyl_minidox.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright 2021 @dlford
-
-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 "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-
-// LED Layout
-// Columns
-// 0 1 2 3 4 5 6 7 8 9 10 11
-// Physical (Center: 133)
-// 20 41 61 81 102 122 143 163 183 204 224 244
-// Rows Physical (Center: 54)
-// 17 12 11 06 05 23 24 29 30 35 0 21
-// 16 13 10 07 04 22 25 28 31 34 1 43
-// 15 14 09 08 03 21 26 27 32 33 2 64
-// 02 01 00 18 19 20 3 85
-
-led_config_t g_led_config = { {
- // Key matrix to LED index
- // Left 1-18
- {17, 12, 11, 6, 5},
- {16, 13, 10, 7, 4},
- {15, 14, 9, 8, 3},
- {NO_LED, NO_LED, 2, 1, 0},
- // Right 1-18
- {23, 24, 29, 30, 35},
- {22, 25, 28, 31, 34},
- {21, 26, 27, 32, 33},
- {18, 19, 20, NO_LED, NO_LED},
-}, {
- // LED index to physical position
- // Left 1-18
- {122,85},{102,85},{81,85},{102,64},{102,43},{102,21},
- {81,21},{81,43},{81,64},{61,64},{61,43},{61,21},
- {41,21},{41,43},{41,64},{20,64},{20,43},{20,21},
- // Right 1-18
- {143,85},{163,85},{183,85},{163,64},{163,43},{163,21},
- {183,21},{183,43},{183,64},{204,64},{204,43},{204,21},
- {224,21},{224,43},{224,64},{244,64},{244,43},{244,21}
-}, {
- // LED index to flag
- // Left 1-18
- 4,4,4,4,4,4,
- 4,4,4,4,4,4,
- 4,4,4,4,4,4,
- // Right 1-18
- 4,4,4,4,4,4,
- 4,4,4,4,4,4,
- 4,4,4,4,4,4
-} };
-
-#endif
diff --git a/keyboards/handwired/dactyl_minidox/keyboard.json b/keyboards/handwired/dactyl_minidox/keyboard.json
index 36f71ea525..5bd5c5c05a 100644
--- a/keyboards/handwired/dactyl_minidox/keyboard.json
+++ b/keyboards/handwired/dactyl_minidox/keyboard.json
@@ -10,19 +10,55 @@
},
"features": {
"bootmagic": true,
- "console": false,
- "command": false,
"extrakey": true,
"mousekey": true,
- "nkro": true
+ "nkro": true,
+ "rgb_matrix": true
},
"ws2812": {
"pin": "D3"
},
"rgb_matrix": {
- "center_point": [133, 54],
"driver": "ws2812",
- "split_count": [18, 18]
+ "split_count": [18, 18],
+ "layout": [
+ {"matrix": [3, 4], "x": 102, "y": 64, "flags": 4},
+ {"matrix": [3, 3], "x": 82, "y": 64, "flags": 4},
+ {"matrix": [3, 2], "x": 61, "y": 64, "flags": 4},
+ {"matrix": [2, 4], "x": 82, "y": 43, "flags": 4},
+ {"matrix": [1, 4], "x": 82, "y": 22, "flags": 4},
+ {"matrix": [0, 4], "x": 82, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+ {"matrix": [1, 3], "x": 61, "y": 22, "flags": 4},
+ {"matrix": [2, 3], "x": 61, "y": 43, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 43, "flags": 4},
+ {"matrix": [1, 2], "x": 41, "y": 22, "flags": 4},
+ {"matrix": [0, 2], "x": 41, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 21, "y": 0, "flags": 4},
+ {"matrix": [1, 1], "x": 21, "y": 22, "flags": 4},
+ {"matrix": [2, 1], "x": 21, "y": 43, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 43, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 22, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [7, 0], "x": 123, "y": 64, "flags": 4},
+ {"matrix": [7, 1], "x": 143, "y": 64, "flags": 4},
+ {"matrix": [7, 2], "x": 163, "y": 64, "flags": 4},
+ {"matrix": [6, 0], "x": 143, "y": 43, "flags": 4},
+ {"matrix": [5, 0], "x": 143, "y": 22, "flags": 4},
+ {"matrix": [4, 0], "x": 143, "y": 0, "flags": 4},
+ {"matrix": [4, 1], "x": 163, "y": 0, "flags": 4},
+ {"matrix": [5, 1], "x": 163, "y": 22, "flags": 4},
+ {"matrix": [6, 1], "x": 163, "y": 43, "flags": 4},
+ {"matrix": [6, 2], "x": 184, "y": 43, "flags": 4},
+ {"matrix": [5, 2], "x": 184, "y": 22, "flags": 4},
+ {"matrix": [4, 2], "x": 184, "y": 0, "flags": 4},
+ {"matrix": [4, 3], "x": 204, "y": 0, "flags": 4},
+ {"matrix": [5, 3], "x": 204, "y": 22, "flags": 4},
+ {"matrix": [6, 3], "x": 204, "y": 43, "flags": 4},
+ {"matrix": [6, 4], "x": 224, "y": 43, "flags": 4},
+ {"matrix": [5, 4], "x": 224, "y": 22, "flags": 4},
+ {"matrix": [4, 4], "x": 224, "y": 0, "flags": 4}
+ ]
},
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5"],
@@ -34,9 +70,6 @@
"soft_serial_pin": "D0"
},
"development_board": "promicro",
- "layout_aliases": {
- "LAYOUT": "LAYOUT_split_3x5_3"
- },
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
@@ -46,41 +79,34 @@
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
-
{"matrix": [4, 0], "x": 10, "y": 0},
{"matrix": [4, 1], "x": 11, "y": 0},
{"matrix": [4, 2], "x": 12, "y": 0},
{"matrix": [4, 3], "x": 13, "y": 0},
{"matrix": [4, 4], "x": 14, "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": [5, 0], "x": 10, "y": 1},
{"matrix": [5, 1], "x": 11, "y": 1},
{"matrix": [5, 2], "x": 12, "y": 1},
{"matrix": [5, 3], "x": 13, "y": 1},
{"matrix": [5, 4], "x": 14, "y": 1},
-
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
-
{"matrix": [6, 0], "x": 10, "y": 2},
{"matrix": [6, 1], "x": 11, "y": 2},
{"matrix": [6, 2], "x": 12, "y": 2},
{"matrix": [6, 3], "x": 13, "y": 2},
{"matrix": [6, 4], "x": 14, "y": 2},
-
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3},
-
{"matrix": [7, 0], "x": 10, "y": 3},
{"matrix": [7, 1], "x": 11, "y": 3},
{"matrix": [7, 2], "x": 12, "y": 3}
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c
deleted file mode 100644
index abd6433558..0000000000
--- a/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /*
- * ┌───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┐
- * │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │
- * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤
- * │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │
- * ├───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┤
- * │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │
- * └───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┘
- * ┌───┐ ┌───┐
- * │GUI├───┐ ┌───┤Alt│
- * └───┤Bsp├───┐ ┌───┤Ent├───┘
- * └───┤ │ │ ├───┘
- * └───┘ └───┘
- */
- [0] = LAYOUT_split_3x5_3(
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT
- )
-};
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.json b/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.json
new file mode 100644
index 0000000000..a7cdca3654
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/default/keymap.json
@@ -0,0 +1,13 @@
+{
+ "keyboard": "handwired/dactyl_minidox",
+ "keymap": "default",
+ "layout": "LAYOUT_split_3x5_3",
+ "layers": [
+ [
+ "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P",
+ "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN",
+ "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH",
+ "KC_LGUI", "KC_BSPC", "KC_SPC", "KC_SPC", "KC_ENT", "KC_RALT"
+ ]
+ ]
+}
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h b/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
deleted file mode 100644
index a37a54c8fc..0000000000
--- a/keyboards/handwired/dactyl_minidox/keymaps/dlford/config.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2021 @dlford
-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 USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS // ./util/docker_build.sh crkbd:dlford:dfu-split-[left|right] (or avrdude-split[left|right])
-
-#define TAPPING_TOGGLE 2 // number of taps to toggle TT
-#define TAPPING_TERM_PER_KEY // milliseconds from tap to hold for mod tap per key
-#define PERMISSIVE_HOLD_PER_KEY // activate mod top hold earlier if another key is pressed AND released per key
-#define QUICK_TAP_TERM_PER_KEY // disable double tap hold key repeat per key
-#undef MOUSEKEY_INTERVAL
-#undef MOUSEKEY_DELAY
-#undef MOUSEKEY_TIME_TO_MAX
-#undef MOUSEKEY_MAX_SPEED
-#undef MOUSEKEY_WHEEL_DELAY
-#define MK_KINETIC_SPEED
-#define MOUSEKEY_DELAY 100
-#define MOUSEKEY_INTERVAL 35
-#define MOUSEKEY_MOVE_DELTA 5
-#define MOUSEKEY_INITIAL_SPEED 1
-#define MOUSEKEY_DECELERATED_SPEED 10
-#define MOUSEKEY_BASE_SPEED 1200
-#define MOUSEKEY_ACCELERATED_SPEED 4800
-
-#ifdef RGB_MATRIX_ENABLE
-// # define RGB_MATRIX_TIMEOUT 300000 // number of milliseconds to wait until disabling effects
-// # define RGB_MATRIX_SLEEP // turn off effects when suspended
-# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-# define RGB_MATRIX_HUE_STEP 8
-# define RGB_MATRIX_SAT_STEP 8
-# define RGB_MATRIX_VAL_STEP 8
-# define RGB_MATRIX_SPD_STEP 10
-
-// Enable animations
-// # define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue speed is hue for secondary hue
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom speed controls how much gradient changes
-// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right speed controls how much gradient changes
-// # define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation
-// # define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right
-// # define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness
-// # define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient
-// # define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right
-// # define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
-// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
-// # define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
-// # define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradent Chevron shapped scrolling left to right
-// # define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard
-// # define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
-// # define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
-// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
-// # define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue
-// # define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation
-// # define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time then shifts back
-// # define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right then back to the left
-# define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
-// # define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Required for the following two effects
-// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM!
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation
-// # define RGB_MATRIX_KEYPRESSES // reacts to keypresses, required for the remaining effects
-// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue pulses keys hit to shifted hue then fades to current hue
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-// # define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
-#endif
-
-// Features I don't want, remove to save space
-// #define NO_ACTION_ONESHOT // Used by caps word
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_MACRO
-#define NO_USB_STARTUP_CHECK
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c b/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c
deleted file mode 100644
index ee295c7305..0000000000
--- a/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-// For full documentation, see
-// https://getreuer.info/posts/keyboards/caps-word
-
-#include "caps_word.h"
-bool caps_word_enabled = false;
-
-bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
- static bool shifted = false;
-
- if (!caps_word_enabled) {
- // Pressing both shift keys at the same time enables caps word.
- if (((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT)
- == MOD_MASK_SHIFT) {
- clear_mods();
- clear_oneshot_mods();
- shifted = false;
- caps_word_enabled = true;
- return false;
- }
- return true;
- }
-
- if (!record->event.pressed) { return true; }
-
- if (!((get_mods() | get_oneshot_mods()) & ~MOD_MASK_SHIFT)) {
- switch (keycode) {
- case QK_MOD_TAP ... QK_MOD_TAP_MAX:
- case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
- // Earlier return if this has not been considered tapped yet.
- if (record->tap.count == 0) { return true; }
- // Get the base tapping keycode of a mod- or layer-tap key.
- keycode &= 0xff;
- }
-
- switch (keycode) {
- // Letter keys should be shifted.
- case KC_A ... KC_Z:
- if (!shifted) { register_code(KC_LSFT); }
- shifted = true;
- return true;
-
- // Keycodes that continue caps word but shouldn't get shifted.
- case KC_1 ... KC_0:
- case KC_BSPC:
- case KC_MINS:
- case KC_UNDS:
- if (shifted) { unregister_code(KC_LSFT); }
- shifted = false;
- return true;
-
- // Any other keycode disables caps word.
- }
- }
-
- // Disable caps word.
- caps_word_enabled = false;
- if (shifted) { unregister_code(KC_LSFT); }
- shifted = false;
- return true;
-}
-
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h b/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h
deleted file mode 100644
index a609a32544..0000000000
--- a/keyboards/handwired/dactyl_minidox/keymaps/dlford/features/caps_word.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2021 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-// Caps Word, activated by pressing both shift keys at the same time.
-//
-// This library implements "Caps Word", which is like conventional Caps Lock,
-// but automatically disables itself at the end of the word. This is useful for
-// typing all-caps identifiers like `MOD_MASK_ALT`.
-//
-// Caps Word is activated by pressing the left and right shift keys at the same
-// time. This way you don't need a dedicated key for using Caps Word. I've
-// tested that this works as expected with one-shot mods and Space Cadet Shift.
-// If your shift keys are mod-taps, activate Caps Word by holding both shift
-// mod-tap keys until the tapping term, release them, then begin typing.
-//
-// For full documentation, see
-// https://getreuer.info/posts/keyboards/caps-word
-
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-bool process_caps_word(uint16_t keycode, keyrecord_t* record);
-extern bool caps_word_enabled;
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c
deleted file mode 100644
index bdacde1a85..0000000000
--- a/keyboards/handwired/dactyl_minidox/keymaps/dlford/keymap.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2021 @dlford
-
-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
-#include "features/caps_word.h"
-
-// Layers
-enum layers {
- _QWERTY = 0,
- _COLEMAK,
- _NAVIGATION,
- _SPECIAL,
- _MOUSE,
-};
-
-static uint16_t default_animation = RGB_MATRIX_CYCLE_SPIRAL;
-static int default_speed = 50;
-static uint16_t secondary_animation = RGB_MATRIX_HUE_WAVE;
-static int secondary_speed = 150;
-static bool is_macro_recording = false;
-
-// Init
-void keyboard_post_init_user(void) {
- rgb_matrix_sethsv_noeeprom(HSV_PURPLE);
- rgb_matrix_mode_noeeprom(default_animation);
- rgb_matrix_set_speed_noeeprom(default_speed);
-}
-
-// Permissive hold per key
-bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case LT(3, KC_SPC):
- return true; // Enable permissive hold
- case LT(2, KC_TAB):
- return true;
- default:
- return false; // Disable permissive hold
- }
-}
-
-// Tapping force hold per key
-uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case LT(3, KC_SPC):
- return 0; // Enable force hold
- case LT(2, KC_TAB):
- return 0;
- default:
- return QUICK_TAP_TERM; // Disable force hold
- }
-}
-
-// Tapping term per key
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case C_S_T(KC_E):
- case C_S_T(KC_I):
- return 215;
- default:
- return 190;
- }
-}
-
-// RGB timeout
-#define RGB_CUSTOM_TIMEOUT 5 // in minutes
-static uint16_t idle_timer = 0;
-static uint8_t halfmin_counter = 0;
-static bool led_on = true;
-void matrix_scan_user(void) {
- if (is_keyboard_master()) {
- // idle_timer needs to be set one time
- if (idle_timer == 0) idle_timer = timer_read();
-
- if (led_on && timer_elapsed(idle_timer) > 30000) {
- halfmin_counter++;
- idle_timer = timer_read();
- }
-
- if (led_on && halfmin_counter >= RGB_CUSTOM_TIMEOUT * 2) {
- rgb_matrix_disable_noeeprom();
- led_on = false;
- halfmin_counter = 0;
- }
- }
-}
-
-// Macros
-enum macro_events {
- M_KEYMAP = SAFE_RANGE,
- M_COMM,
- M_DOT,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- // RGB resume
- if (is_keyboard_master()) {
- if (record->event.pressed) {
- if (led_on == false) {
- rgb_matrix_enable_noeeprom();
- led_on = true;
- }
- idle_timer = timer_read();
- halfmin_counter = 0;
- }
- }
-
- // Caps word
- if (!process_caps_word(keycode, record)) { return false; }
-
- // Macros
- const uint8_t mods = get_mods();
- static uint8_t backstepCounter = 0;
- static bool keyDown = false;
- switch (keycode) {
- case M_KEYMAP:
- if (record->event.pressed) {
- SEND_STRING("https://raw.githubusercontent.com/dlford/qmk_firmware/master/keyboards/crkbd/keymaps/dlford/legends.svg");
- }
- return false;
- case M_COMM:
- if (record->event.pressed) {
- if ((mods & MOD_BIT(KC_LCTL)) && (mods & MOD_BIT(KC_LSFT) && (mods & MOD_BIT(KC_LALT)))) {
- backstepCounter = 1;
- clear_mods();
- SEND_STRING("<>");
- } else if ((mods & MOD_BIT(KC_LCTL)) && (mods & MOD_BIT(KC_LALT))) {
- backstepCounter = 1;
- clear_mods();
- SEND_STRING("()");
- } else if ((mods & MOD_BIT(KC_LCTL)) && (mods & MOD_BIT(KC_LSFT))) {
- backstepCounter = 2;
- clear_mods();
- SEND_STRING("{};");
- } else if (mods & MOD_BIT(KC_LCTL)) {
- backstepCounter = 1;
- clear_mods();
- SEND_STRING("{}");
- } else if ((mods & MOD_BIT(KC_LALT)) && (mods & MOD_BIT(KC_LSFT))) {
- backstepCounter = 2;
- clear_mods();
- SEND_STRING("[];");
- } else if (mods & MOD_BIT(KC_LALT)) {
- backstepCounter = 1;
- clear_mods();
- SEND_STRING("[]");
- } else {
- keyDown = true;
- register_code(KC_COMM);
- return true;
- }
- if (backstepCounter) {
- while (backstepCounter > 0) {
- tap_code(KC_LEFT);
- backstepCounter--;
- }
- set_mods(mods);
- }
- } else {
- if (keyDown) {
- unregister_code(KC_COMM);
- keyDown = false;
- return true;
- }
- }
- return false;
- case M_DOT:
- if (record->event.pressed) {
- if (mods & MOD_BIT(KC_LCTL)) {
- clear_mods();
- SEND_STRING("=>");
- } else if (mods & MOD_BIT(KC_LALT)) {
- clear_mods();
- SEND_STRING("->");
- } else {
- keyDown = true;
- register_code(KC_DOT);
- return true;
- }
- } else {
- if (keyDown) {
- unregister_code(KC_DOT);
- keyDown = false;
- return true;
- }
- }
- set_mods(mods);
- return false;
- }
-
- return true;
-}
-
-// RGB Layers (Enable animations in config.h)
-layer_state_t layer_state_set_user(layer_state_t state) {
- switch (get_highest_layer(state)) {
- case _SPECIAL:
- rgb_matrix_sethsv_noeeprom(HSV_ORANGE);
- rgb_matrix_set_speed_noeeprom(secondary_speed);
- rgb_matrix_mode_noeeprom(secondary_animation);
- break;
- case _NAVIGATION:
- rgb_matrix_sethsv_noeeprom(HSV_BLUE);
- rgb_matrix_set_speed_noeeprom(secondary_speed);
- rgb_matrix_mode_noeeprom(secondary_animation);
- break;
- case _MOUSE:
- rgb_matrix_sethsv_noeeprom(HSV_GREEN);
- rgb_matrix_set_speed_noeeprom(secondary_speed);
- rgb_matrix_mode_noeeprom(secondary_animation);
- break;
- default:
- rgb_matrix_sethsv_noeeprom(HSV_PURPLE);
- rgb_matrix_set_speed_noeeprom(default_speed);
- rgb_matrix_mode_noeeprom(default_animation);
- break;
- }
- return state;
-}
-
-// Dynamic Macro Recording Backlight
-void dynamic_macro_record_start_user(int8_t direction) {
- is_macro_recording = true;
-}
-
-void dynamic_macro_record_end_user(int8_t direction) {
- is_macro_recording = false;
-}
-
-// Indicators
-bool rgb_matrix_indicators_user(void) {
- if (host_keyboard_led_state().caps_lock || caps_word_enabled) {
- // Left master
- rgb_matrix_set_color(3, RGB_RED);
- // Right master
- rgb_matrix_set_color(21, RGB_RED);
- }
- if (is_macro_recording) {
- // Left master
- rgb_matrix_set_color(4, RGB_ORANGE);
- // Right master
- rgb_matrix_set_color(22, RGB_ORANGE);
- }
- if (default_layer_state - 1 == _COLEMAK) {
- // Left master
- rgb_matrix_set_color(5, RGB_GREEN);
- // Right master
- rgb_matrix_set_color(23, RGB_GREEN);
- }
- return false;
-}
-
-// Quantum keys / Abbreviations
-enum custom_keycodes {
- VVV = KC_TRNS,
- XXX = KC_NO,
- CSA_Q = MEH_T(KC_Q),
- CSA_F1 = MEH_T(KC_F1),
- CSA_1 = MEH_T(KC_1),
- CA_W = LCA_T(KC_W),
- CA_F2 = LCA_T(KC_F2),
- CA_2 = LCA_T(KC_2),
- CS_E = C_S_T(KC_E),
- CS_F = C_S_T(KC_F),
- CS_I = C_S_T(KC_I),
- CS_U = C_S_T(KC_U),
- CS_F3 = C_S_T(KC_F3),
- CS_3 = C_S_T(KC_3),
- CS_F8 = C_S_T(KC_F8),
- CS_8 = C_S_T(KC_8),
- CA_O = LCA_T(KC_O),
- CA_Y = LCA_T(KC_Y),
- CA_F9 = LCA_T(KC_F9),
- CA_9 = LCA_T(KC_9),
- CSA_P = MEH_T(KC_P),
- CSA_SCLN = MEH_T(KC_SCLN),
- CSA_F10 = MEH_T(KC_F10),
- CSA_0 = MEH_T(KC_0),
- LGUI_A = LGUI_T(KC_A),
- LGUI_FIND = LGUI_T(KC_FIND),
- LGUI_GRV = LGUI_T(KC_GRV),
- LALT_S = LALT_T(KC_S),
- LALT_R = LALT_T(KC_R),
- LALT_HOME = LALT_T(KC_HOME),
- LCTL_D = LCTL_T(KC_D),
- LCTL_S = LCTL_T(KC_S),
- LCTL_PGUP = LCTL_T(KC_PGUP),
- LCTL_LBRC = LCTL_T(KC_LBRC),
- LSFT_F = LSFT_T(KC_F),
- _LSFT_T = LSFT_T(KC_T),
- LSFT_PGDN = LSFT_T(KC_PGDN),
- LSFT_RBRC = LSFT_T(KC_RBRC),
- RSFT_J = RSFT_T(KC_J),
- RSFT_N = RSFT_T(KC_N),
- RSFT_DOWN = RSFT_T(KC_DOWN),
- RSFT_MINS = RSFT_T(KC_MINS),
- RCTL_K = RCTL_T(KC_K),
- RCTL_E = RCTL_T(KC_E),
- RCTL_UP = RCTL_T(KC_UP),
- RCTL_EQL = RCTL_T(KC_EQL),
- RALT_L = RALT_T(KC_L),
- RALT_I = RALT_T(KC_I),
- RALT_RGHT = RALT_T(KC_RGHT),
- RALT_BSLS = RALT_T(KC_BSLS),
- RGUI_SCLN = RGUI_T(KC_SCLN),
- RGUI_O = RGUI_T(KC_O),
- RGUI_F11 = RGUI_T(KC_F11),
- RGUI_QUOT = RGUI_T(KC_QUOT),
- LT3_SPC = LT(3,KC_SPC),
- LT2_TAB = LT(2,KC_TAB),
- DF_QWERTY = DF(0),
- DF_COLEMAK = DF(1),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- CSA_Q, CA_W, CS_E, KC_R, KC_T, KC_Y, KC_U, CS_I, CA_O, CSA_P,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- LGUI_A, LALT_S, LCTL_D, LSFT_F, KC_G, KC_H, RSFT_J, RCTL_K, RALT_L, RGUI_SCLN,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, M_COMM, M_DOT, KC_SLSH,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_ESC, LT3_SPC, KC_BSPC, KC_DEL, LT2_TAB, KC_ENT
- // |--------+--------+--------| |--------+--------+--------|
- ),
- [_COLEMAK] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- CSA_Q, CA_W, CS_F, KC_P, KC_G, KC_J, KC_L, CS_U, CA_Y, CSA_SCLN,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- LGUI_A, LALT_R, LCTL_S, _LSFT_T, KC_D, KC_H, RSFT_N, RCTL_E, RALT_I, RGUI_O,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, M_COMM, M_DOT, KC_SLSH,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_ESC, LT3_SPC, KC_BSPC, KC_DEL, LT2_TAB, KC_ENT
- // |--------+--------+--------| |--------+--------+--------|
- ),
- [_NAVIGATION] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- CSA_F1, CA_F2, CS_F3, KC_F4, KC_F5, KC_F6, KC_F7, CS_F8, CA_F9, CSA_F10,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- LGUI_FIND,LALT_HOME,LCTL_PGUP,LSFT_PGDN,KC_END, KC_LEFT,RSFT_DOWN,RCTL_UP,RALT_RGHT,RGUI_F11,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- DF_QWERTY,DF_COLEMAK,KC_VOLD, KC_VOLU, QK_BOOT, KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, KC_F12,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- VVV, TG(4), VVV, VVV, VVV, VVV
- // |--------+--------+--------| |--------+--------+--------|
- ),
- [_SPECIAL] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- CSA_1, CA_2, CS_3, KC_4, KC_5, KC_6, KC_7, CS_8, CA_9, CSA_0,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- LGUI_GRV,KC_LALT,LCTL_LBRC,LSFT_RBRC,KC_LPRN, KC_RPRN,RSFT_MINS,RCTL_EQL,RALT_BSLS,RGUI_QUOT,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- KC_TILD, KC_CAPS, KC_LCBR, KC_RCBR,TG(_MOUSE), EE_CLR, KC_UNDS, KC_PLUS, KC_PIPE, KC_DQUO,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- VVV, VVV, VVV, VVV, TG(4), VVV
- // |--------+--------+--------| |--------+--------+--------|
- ),
- [_MOUSE] = LAYOUT_split_3x5_3(
- //|--------------------------------------------| |--------------------------------------------|
- KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, DM_REC1, KC_WSTP, KC_ACL2, KC_ACL1, KC_ACL0, KC_WFWD,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, DM_PLY1, KC_WREF, KC_BTN1, KC_BTN2, KC_BTN3, KC_WBAK,
- //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
- M_KEYMAP,KC_BTN3, KC_BTN2, KC_BTN1, XXX, XXX, XXX, XXX, XXX, XXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- VVV, TG(4), VVV, VVV, TG(4), VVV
- // |--------+--------+--------| |--------+--------+--------|
- ),
-};
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk b/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
deleted file mode 100644
index 78e059df96..0000000000
--- a/keyboards/handwired/dactyl_minidox/keymaps/dlford/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Includes
-SRC += features/caps_word.c
-
-# Build Options
-# change yes to no to disable
-#
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-DYNAMIC_MACRO_ENABLE = yes # Create macros on the fly
-INDICATOR_LIGHTS = yes # Enable indicator lights for caps lock, etc.
-# TAP_DANCE_ENABLE = yes # Send different keycodes if tapped multiple times
-# KEY_OVERRIDE_ENABLE = yes # Override key combos
-# COMBO_ENABLE = yes # Custom key combos
-
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
-RGBLIGHT_SUPPORTED = yes
-RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/config.h b/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
index bb5b0bf6af..b2ea2ca256 100644
--- a/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/config.h
@@ -1,23 +1,5 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-Copyright 2021 @dlford
-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/>.
-*/
-
+// Copyright 2024 @dlford
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-
#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c b/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c
deleted file mode 100644
index 80b9b62b53..0000000000
--- a/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2022 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include QMK_KEYBOARD_H
-
-enum layers{
- _BASE,
- _RAISE,
- _LOWER,
- _BLANK
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_split_3x5_3(
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- KC_LGUI, KC_BSPC, KC_SPC, KC_SPC, KC_ENT, KC_RALT
- ),
- [_RAISE] = LAYOUT_split_3x5_3(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______
- ),
- [_LOWER] = LAYOUT_split_3x5_3(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______
- ),
- [_BLANK] = LAYOUT_split_3x5_3(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______
- )
-};
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.json b/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.json
new file mode 100644
index 0000000000..332048c3e3
--- /dev/null
+++ b/keyboards/handwired/dactyl_minidox/keymaps/via/keymap.json
@@ -0,0 +1,18 @@
+{
+ "keyboard": "handwired/dactyl_minidox",
+ "keymap": "via",
+ "layout": "LAYOUT_split_3x5_3",
+ "config": {
+ "features": {
+ "via": true
+ }
+ },
+ "layers": [
+ [
+ "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P",
+ "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN",
+ "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH",
+ "KC_LGUI", "KC_BSPC", "KC_SPC", "KC_SPC", "KC_ENT", "KC_RALT"
+ ]
+ ]
+}
diff --git a/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk b/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/handwired/dactyl_minidox/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_minidox/readme.md b/keyboards/handwired/dactyl_minidox/readme.md
index 5826403a80..e3941ad295 100644
--- a/keyboards/handwired/dactyl_minidox/readme.md
+++ b/keyboards/handwired/dactyl_minidox/readme.md
@@ -1,6 +1,6 @@
# Dactyl Minidox
-![DactylMinidox](https://i.imgur.com/PqjgeRfh.jpg)
+![DactylMinidox](https://i.imgur.com/PqjgeRf.jpeg)
A 36 key (3x5+3), split bodied keyboard derived from the [Dactyl ManuForm](/keyboards/handwired/dactyl_manuform/).
diff --git a/keyboards/handwired/dmote/keyboard.json b/keyboards/handwired/dmote/keyboard.json
index fc52fee11e..e6514b17ba 100644
--- a/keyboards/handwired/dmote/keyboard.json
+++ b/keyboards/handwired/dmote/keyboard.json
@@ -36,7 +36,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/handwired/elrgo_s/keyboard.json b/keyboards/handwired/elrgo_s/keyboard.json
index 0da809d2ac..c0ae4beadb 100644
--- a/keyboards/handwired/elrgo_s/keyboard.json
+++ b/keyboards/handwired/elrgo_s/keyboard.json
@@ -23,7 +23,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/evk/v1_3/v1_3.c b/keyboards/handwired/evk/v1_3/v1_3.c
index a568ba3f86..575bf33759 100644
--- a/keyboards/handwired/evk/v1_3/v1_3.c
+++ b/keyboards/handwired/evk/v1_3/v1_3.c
@@ -33,12 +33,3 @@ __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
gpio_write_pin(D5, layer_state_cmp(state, 1));
return state;
}
-
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if (res) {
- // gpio_write_pin sets the pin high for 1 and low for 0.
- gpio_write_pin(D4, led_state.caps_lock);
- }
- return res;
-}
diff --git a/keyboards/handwired/freoduo/keyboard.json b/keyboards/handwired/freoduo/keyboard.json
index 0d23776f4a..d9f4ad4808 100644
--- a/keyboards/handwired/freoduo/keyboard.json
+++ b/keyboards/handwired/freoduo/keyboard.json
@@ -25,7 +25,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"rgblight": {
"hue_steps": 16,
diff --git a/keyboards/handwired/jankrp2040dactyl/keyboard.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json
index c4543b5d12..0d155a70bd 100644
--- a/keyboards/handwired/jankrp2040dactyl/keyboard.json
+++ b/keyboards/handwired/jankrp2040dactyl/keyboard.json
@@ -6,7 +6,10 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "GP0"
+ "soft_serial_pin": "GP0",
+ "serial": {
+ "driver": "vendor"
+ }
},
"features": {
diff --git a/keyboards/handwired/jankrp2040dactyl/rules.mk b/keyboards/handwired/jankrp2040dactyl/rules.mk
deleted file mode 100644
index 743228e94b..0000000000
--- a/keyboards/handwired/jankrp2040dactyl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SERIAL_DRIVER = vendor \ No newline at end of file
diff --git a/keyboards/handwired/jotlily60/keyboard.json b/keyboards/handwired/jotlily60/keyboard.json
index 65faa354a5..7a8a2a50d9 100644
--- a/keyboards/handwired/jotlily60/keyboard.json
+++ b/keyboards/handwired/jotlily60/keyboard.json
@@ -24,7 +24,9 @@
},
"split": {
"enabled": true,
- "soft_serial_pin": "D3"
+ "serial": {
+ "pin": "D3"
+ }
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h
deleted file mode 100644
index 2ae835db9d..0000000000
--- a/keyboards/handwired/jtallbean/split_65/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2020 jtallbean
-
-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 SPLIT_HAND_PIN D5
-
-/*
- * 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
diff --git a/keyboards/handwired/jtallbean/split_65/keyboard.json b/keyboards/handwired/jtallbean/split_65/keyboard.json
index c8be82da8d..b10e6c6cc0 100644
--- a/keyboards/handwired/jtallbean/split_65/keyboard.json
+++ b/keyboards/handwired/jtallbean/split_65/keyboard.json
@@ -27,14 +27,22 @@
"rows": ["F4", "F1", "F0", "C7", "B6"]
},
"diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "B0"
+ },
"split": {
"enabled": true,
- "soft_serial_pin": "D0",
+ "handedness": {
+ "pin": "D5"
+ },
"matrix_pins": {
"right": {
"cols": ["B4", "B5", "B6", "C6", "C7", "D4", "D6", "D3", "D2"],
"rows": ["E6", "F0", "F1", "F7", "D7"]
}
+ },
+ "serial": {
+ "pin": "D0"
}
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/jtallbean/split_65/split_65.c b/keyboards/handwired/jtallbean/split_65/split_65.c
deleted file mode 100644
index b75b12137f..0000000000
--- a/keyboards/handwired/jtallbean/split_65/split_65.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 jtallbean
- *
- * 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 "quantum.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-void matrix_init_kb(void) {
- // put your keyboard start-up code here
- // runs once when the firmware starts up
-
- // Set our LED pins as output
- gpio_set_pin_output(B0);
- gpio_write_pin_low(B0);
-
- matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
- // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
- bool res = led_update_user(led_state);
- if(res) {
- // gpio_write_pin sets the pin high for 1 and low for 0.
- gpio_write_pin(B0, led_state.caps_lock);
- }
- return res;
-}
diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h
index 9b05e85d64..e35e4a7e5e 100644
--- a/keyboards/handwired/ks63/config.h
+++ b/keyboards/handwired/ks63/config.h
@@ -44,5 +44,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define MASTER_LEFT
diff --git a/keyboards/handwired/ks63/keyboard.json b/keyboards/handwired/ks63/keyboard.json
index 6040074f07..09e59975e8 100644
--- a/keyboards/handwired/ks63/keyboard.json
+++ b/keyboards/handwired/ks63/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/myskeeb/keyboard.json b/keyboards/handwired/myskeeb/keyboard.json
index f2da286f19..c75f40cf46 100644
--- a/keyboards/handwired/myskeeb/keyboard.json
+++ b/keyboards/handwired/myskeeb/keyboard.json
@@ -16,11 +16,13 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D3",
"matrix_pins": {
"right": {
"cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"]
}
+ },
+ "serial": {
+ "pin": "D3"
}
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h
deleted file mode 100644
index 7b7d4c06ae..0000000000
--- a/keyboards/handwired/not_so_minidox/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-
-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 EE_HANDS
-
-#define MASTER_LEFT
-//#define MASTER_RIGHT
-
-/* 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
diff --git a/keyboards/handwired/not_so_minidox/keyboard.json b/keyboards/handwired/not_so_minidox/keyboard.json
index c3cc598840..fa68a823af 100644
--- a/keyboards/handwired/not_so_minidox/keyboard.json
+++ b/keyboards/handwired/not_so_minidox/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/p65rgb/p65rgb.c b/keyboards/handwired/p65rgb/p65rgb.c
deleted file mode 100644
index 3d7185f9d1..0000000000
--- a/keyboards/handwired/p65rgb/p65rgb.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2019 marhalloweenvt
- *
- * 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 "quantum.h"
-
-#ifdef RGB_MATRIX_ENABLE
-void suspend_power_down_kb(void)
-{
- rgb_matrix_set_suspend_state(true);
- suspend_power_down_user();
-}
-
-void suspend_wakeup_init_kb(void)
-{
- rgb_matrix_set_suspend_state(false);
- suspend_wakeup_init_user();
-}
-#endif
diff --git a/keyboards/handwired/prime_exl_plus/keyboard.json b/keyboards/handwired/prime_exl_plus/keyboard.json
index 43825a0ad8..a234bceb02 100644
--- a/keyboards/handwired/prime_exl_plus/keyboard.json
+++ b/keyboards/handwired/prime_exl_plus/keyboard.json
@@ -8,6 +8,10 @@
"pid": "0x6579",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "B0",
+ "num_lock": "B1"
+ },
"rgblight": {
"led_count": 10,
"animations": {
diff --git a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
index 1865b6c502..164c954b8b 100644
--- a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
+++ b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
@@ -16,32 +16,17 @@
#include "quantum.h"
void matrix_init_kb(void) {
- // set CapsLock LED to output and low
- gpio_set_pin_output(B0);
- gpio_write_pin_low(B0);
- // set NumLock LED to output and low
- gpio_set_pin_output(B1);
- gpio_write_pin_low(B1);
- // set ScrollLock LED to output and low
gpio_set_pin_output(B2);
gpio_write_pin_low(B2);
-}
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- gpio_write_pin(B1, led_state.num_lock);
- gpio_write_pin(B0, led_state.caps_lock);
- //gpio_write_pin(B2, led_state.scroll_lock);
- }
- return res;
+ matrix_init_user();
}
//function for layer indicator LED
layer_state_t layer_state_set_kb(layer_state_t state)
{
if (get_highest_layer(state) == 1) {
- gpio_write_pin_high(B2);
+ gpio_write_pin_high(B2);
} else {
gpio_write_pin_low(B2);
}
diff --git a/keyboards/handwired/promethium/promethium.c b/keyboards/handwired/promethium/promethium.c
index e9df7dfe87..63139ac09d 100644
--- a/keyboards/handwired/promethium/promethium.c
+++ b/keyboards/handwired/promethium/promethium.c
@@ -17,7 +17,7 @@ __attribute__ ((weak))
void battery_poll(uint8_t level) {
}
-void matrix_scan_kb(void) {
+void housekeeping_task_kb(void) {
static uint16_t counter = BATTERY_POLL;
counter++;
@@ -25,6 +25,4 @@ void matrix_scan_kb(void) {
counter = 0;
battery_poll(battery_level());
}
-
- matrix_scan_user();
}
diff --git a/keyboards/handwired/pytest/has_template/keymaps/default/keymap.c b/keyboards/handwired/pytest/has_template/keymaps/default/keymap.c
deleted file mode 100644
index a5782f7a13..0000000000
--- a/keyboards/handwired/pytest/has_template/keymaps/default/keymap.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- LAYOUT_ortho_1x1(KC_A)
-};
diff --git a/keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json b/keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json
deleted file mode 100644
index cbdce6db32..0000000000
--- a/keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "keyboard": "handwired/pytest/has_template",
- "keymap": "default_json",
- "layout": "LAYOUT_ortho_1x1",
- "layers": [["KC_A"]],
- "author": "qmk",
- "notes": "This file is a keymap.json file for handwired/pytest/has_template",
- "version": 1
-}
diff --git a/keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c b/keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c
deleted file mode 100644
index 65cd4cebea..0000000000
--- a/keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "audio.h"
-
-/* THIS FILE WAS GENERATED AND IS EXPERIMENTAL!
- *
- * This file was generated by qmk-compile-json. You may or may not want to
- * edit it directly.
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(KC_ENTER)
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_UP);
- } else {
- tap_code(KC_DOWN);
- }
- }
- return true;
-};
diff --git a/keyboards/handwired/pytest/has_template/readme.md b/keyboards/handwired/pytest/has_template/readme.md
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pytest/has_template/readme.md
+++ /dev/null
diff --git a/keyboards/handwired/pytest/has_template/rules.mk b/keyboards/handwired/pytest/has_template/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pytest/has_template/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/pytest/has_template/templates/keymap.c b/keyboards/handwired/pytest/has_template/templates/keymap.c
deleted file mode 100644
index 6cb25d5226..0000000000
--- a/keyboards/handwired/pytest/has_template/templates/keymap.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include QMK_KEYBOARD_H
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};
diff --git a/keyboards/handwired/pytest/has_template/templates/keymap.json b/keyboards/handwired/pytest/has_template/templates/keymap.json
deleted file mode 100644
index 04928564e9..0000000000
--- a/keyboards/handwired/pytest/has_template/templates/keymap.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "documentation": "This file is a keymap.json file for handwired/pytest/has_template"
-}
diff --git a/keyboards/handwired/qc60/keymaps/default/config.h b/keyboards/handwired/qc60/keymaps/default/config.h
index 6202f57ec5..eaf0f1b249 100644
--- a/keyboards/handwired/qc60/keymaps/default/config.h
+++ b/keyboards/handwired/qc60/keymaps/default/config.h
@@ -2,4 +2,3 @@
#define USE_I2C
-#define MASTER_LEFT
diff --git a/keyboards/handwired/qc60/proto/keyboard.json b/keyboards/handwired/qc60/proto/keyboard.json
index 0015ac5f66..810df8b7ae 100644
--- a/keyboards/handwired/qc60/proto/keyboard.json
+++ b/keyboards/handwired/qc60/proto/keyboard.json
@@ -30,7 +30,9 @@
"diode_direction": "ROW2COL",
"split": {
"enabled": true,
- "soft_serial_pin": "D0"
+ "serial": {
+ "pin": "D0"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/retro_refit/keyboard.json b/keyboards/handwired/retro_refit/keyboard.json
index 1e7812d578..7acdb48b44 100644
--- a/keyboards/handwired/retro_refit/keyboard.json
+++ b/keyboards/handwired/retro_refit/keyboard.json
@@ -23,6 +23,12 @@
"resync": true
}
},
+ "indicators": {
+ "caps_lock": "D0",
+ "num_lock": "D1",
+ "scroll_lock": "C6",
+ "on_state": 0
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "D2", "D3", "C7", "D5"],
"rows": ["D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"]
diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c
index b62d94d741..08e8e1d528 100644
--- a/keyboards/handwired/retro_refit/retro_refit.c
+++ b/keyboards/handwired/retro_refit/retro_refit.c
@@ -1,5 +1,4 @@
#include "quantum.h"
-#include "led.h"
void matrix_init_kb(void) {
// put your keyboard start-up code here
@@ -11,14 +10,3 @@ void matrix_init_kb(void) {
matrix_init_user();
};
-
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- gpio_write_pin(D0, !led_state.caps_lock);
- gpio_write_pin(D1, !led_state.num_lock);
- gpio_write_pin(C6, !led_state.scroll_lock);
-
- }
- return res;
-} \ No newline at end of file
diff --git a/keyboards/handwired/riblee_split/config.h b/keyboards/handwired/riblee_split/config.h
index c3b0720ba5..f0fa2b1f2f 100644
--- a/keyboards/handwired/riblee_split/config.h
+++ b/keyboards/handwired/riblee_split/config.h
@@ -3,9 +3,6 @@
#pragma once
-// If the pin is high, then the controller assumes it is the left hand, and if it’s low, it’s assumed to be the right side.
-#define SPLIT_HAND_PIN C15
-
#define SERIAL_USART_FULL_DUPLEX
#define SERIAL_USART_TX_PIN B6
#define SERIAL_USART_RX_PIN B7
diff --git a/keyboards/handwired/riblee_split/keyboard.json b/keyboards/handwired/riblee_split/keyboard.json
index 49b5ca3a54..f24dbe2ce6 100644
--- a/keyboards/handwired/riblee_split/keyboard.json
+++ b/keyboards/handwired/riblee_split/keyboard.json
@@ -25,6 +25,12 @@
},
"split": {
"enabled": true,
+ "handedness": {
+ "pin": "C15"
+ },
+ "serial": {
+ "driver": "usart"
+ },
"transport": {
"sync_matrix_state": true
}
diff --git a/keyboards/handwired/riblee_split/rules.mk b/keyboards/handwired/riblee_split/rules.mk
deleted file mode 100644
index c6e2988321..0000000000
--- a/keyboards/handwired/riblee_split/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/selene/keyboard.json b/keyboards/handwired/selene/keyboard.json
index 592b51aaf4..34eec11664 100644
--- a/keyboards/handwired/selene/keyboard.json
+++ b/keyboards/handwired/selene/keyboard.json
@@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "A2",
+ "num_lock": "A0",
+ "scroll_lock": "A1"
+ },
"rgblight": {
"led_count": 50
},
diff --git a/keyboards/handwired/selene/selene.c b/keyboards/handwired/selene/selene.c
index b0924c06f4..49df43314b 100644
--- a/keyboards/handwired/selene/selene.c
+++ b/keyboards/handwired/selene/selene.c
@@ -15,24 +15,10 @@
*/
-#include "selene.h"
+#include "quantum.h"
-void matrix_init_kb(void){
- gpio_set_pin_output(NUM_LOCK_PIN);
- gpio_set_pin_output(CAPS_LOCK_PIN);
- gpio_set_pin_output(SCROLL_LOCK_PIN);
-}
-
-void keyboard_post_init_user(void) {
+void keyboard_post_init_kb(void) {
rgblight_setrgb(0xff, 0xff, 0xff);
-}
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- gpio_write_pin(NUM_LOCK_PIN, led_state.num_lock);
- gpio_write_pin(CAPS_LOCK_PIN, led_state.caps_lock);
- gpio_write_pin(SCROLL_LOCK_PIN, led_state.scroll_lock);
- }
- return res;
+ keyboard_post_init_user();
}
diff --git a/keyboards/handwired/selene/selene.h b/keyboards/handwired/selene/selene.h
deleted file mode 100644
index bcd4215e36..0000000000
--- a/keyboards/handwired/selene/selene.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Bpendragon
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define NUM_LOCK_PIN A0
-#define CAPS_LOCK_PIN A2
-#define SCROLL_LOCK_PIN A1
diff --git a/keyboards/handwired/sick68/keymaps/via/config.h b/keyboards/handwired/sick68/keymaps/via/config.h
index 4ce1e3e785..bf6fd3ea4f 100644
--- a/keyboards/handwired/sick68/keymaps/via/config.h
+++ b/keyboards/handwired/sick68/keymaps/via/config.h
@@ -15,6 +15,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/>.
*/
-#define ENCODERS_PAD_A { F0 }
-#define ENCODERS_PAD_B { F1 }
+#define ENCODER_A_PINS { F0 }
+#define ENCODER_B_PINS { F1 }
#define ENCODER_RESOLUTION 4
diff --git a/keyboards/handwired/split65/promicro/keyboard.json b/keyboards/handwired/split65/promicro/keyboard.json
index 5efdd93629..8b50ea8429 100644
--- a/keyboards/handwired/split65/promicro/keyboard.json
+++ b/keyboards/handwired/split65/promicro/keyboard.json
@@ -16,7 +16,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D3"
+ "serial": {
+ "pin": "D3"
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
diff --git a/keyboards/handwired/split65/stm32/keyboard.json b/keyboards/handwired/split65/stm32/keyboard.json
index 6763c5eb88..5d838de5f7 100644
--- a/keyboards/handwired/split65/stm32/keyboard.json
+++ b/keyboards/handwired/split65/stm32/keyboard.json
@@ -7,7 +7,10 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "A9"
+ "serial": {
+ "driver": "usart",
+ "pin": "A9"
+ }
},
"development_board": "proton_c",
"features": {
diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk
deleted file mode 100644
index c6e2988321..0000000000
--- a/keyboards/handwired/split65/stm32/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h
deleted file mode 100644
index e12db37b97..0000000000
--- a/keyboards/handwired/split89/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 jurassic73
-
-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
-
-/* this will be tied to high (VCC with a 2k to 10k resistor) on the left keyboard half and tied to low (GND using a wire jumper only) on the right keyboard half. This allows a user to plug in a USB cable to either side and function correctly with or without a TRS/TRRS cable with a single hex file. */
-#define SPLIT_HAND_PIN D1
-
-/*
- * 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
diff --git a/keyboards/handwired/split89/keyboard.json b/keyboards/handwired/split89/keyboard.json
index d28953ab5f..fdd092745f 100644
--- a/keyboards/handwired/split89/keyboard.json
+++ b/keyboards/handwired/split89/keyboard.json
@@ -29,12 +29,17 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0",
+ "handedness": {
+ "pin": "D1"
+ },
"matrix_pins": {
"right": {
"cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
}
+ },
+ "serial": {
+ "pin": "D0"
}
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/split_cloud/keyboard.json b/keyboards/handwired/split_cloud/keyboard.json
index 8d242cc6e6..fc1d2498df 100644
--- a/keyboards/handwired/split_cloud/keyboard.json
+++ b/keyboards/handwired/split_cloud/keyboard.json
@@ -29,7 +29,9 @@
},
"split": {
"enabled": true,
- "soft_serial_pin": "D3",
+ "serial": {
+ "pin": "D3"
+ },
"matrix_pins": {
"right": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
diff --git a/keyboards/handwired/splittest/bluepill/config.h b/keyboards/handwired/splittest/bluepill/config.h
index d19bb3dee8..af29e34088 100644
--- a/keyboards/handwired/splittest/bluepill/config.h
+++ b/keyboards/handwired/splittest/bluepill/config.h
@@ -3,8 +3,6 @@
#pragma once
-#define SPLIT_HAND_PIN A7
-
#if !(defined(USE_SDI1_ON_STANDARD_ROLE_PINS) || defined(USE_SDI1_ON_ALTERNATE_ROLE_PINS) || defined(USE_SDI2))
#define USE_SDI1_ON_STANDARD_ROLE_PINS
#endif
diff --git a/keyboards/handwired/splittest/bluepill/keyboard.json b/keyboards/handwired/splittest/bluepill/keyboard.json
index 5c061a7119..42859f5ee8 100644
--- a/keyboards/handwired/splittest/bluepill/keyboard.json
+++ b/keyboards/handwired/splittest/bluepill/keyboard.json
@@ -3,6 +3,11 @@
"cols": ["B1"],
"rows": ["B10"]
},
+ "split": {
+ "handedness": {
+ "pin": "A7"
+ }
+ },
"diode_direction": "COL2ROW",
"development_board": "bluepill",
"features": {
diff --git a/keyboards/handwired/splittest/promicro/config.h b/keyboards/handwired/splittest/promicro/config.h
index 4458ddaffe..2c39af2df7 100644
--- a/keyboards/handwired/splittest/promicro/config.h
+++ b/keyboards/handwired/splittest/promicro/config.h
@@ -16,8 +16,5 @@
#pragma once
-
// use I2C on AVR
#define USE_I2C
-
-#define SPLIT_HAND_PIN F6
diff --git a/keyboards/handwired/splittest/promicro/keyboard.json b/keyboards/handwired/splittest/promicro/keyboard.json
index 2f5929cc00..8aca1c3de7 100644
--- a/keyboards/handwired/splittest/promicro/keyboard.json
+++ b/keyboards/handwired/splittest/promicro/keyboard.json
@@ -5,6 +5,9 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "handedness": {
+ "pin": "F6"
+ },
"soft_serial_pin": "D1"
},
"ws2812": {
diff --git a/keyboards/handwired/splittest/teensy_2/config.h b/keyboards/handwired/splittest/teensy_2/config.h
index 20672a381f..f7033863e0 100644
--- a/keyboards/handwired/splittest/teensy_2/config.h
+++ b/keyboards/handwired/splittest/teensy_2/config.h
@@ -16,11 +16,8 @@
#pragma once
-
// use I2C on AVR
#define USE_I2C
-#define SPLIT_HAND_PIN F0
-
// teensy has vbus detection issues - use usb detection instead
#define SPLIT_USB_DETECT
diff --git a/keyboards/handwired/splittest/teensy_2/keyboard.json b/keyboards/handwired/splittest/teensy_2/keyboard.json
index 68ab3f92c4..c10b20a173 100644
--- a/keyboards/handwired/splittest/teensy_2/keyboard.json
+++ b/keyboards/handwired/splittest/teensy_2/keyboard.json
@@ -5,6 +5,9 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "handedness": {
+ "pin": "F0"
+ },
"soft_serial_pin": "D1"
},
"ws2812": {
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
index 4afee280a0..a0dfe233aa 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/default/config.h
@@ -20,7 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_I2C
/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
index 22d68ab390..b0d6f7113e 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_I2C
/* Select hand configuration */
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
#define EE_HANDS
#define LCPO_KEYS KC_LCTL,KC_TRNS,KC_LBRC
diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json
index fe277ebde0..5f524ea445 100644
--- a/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json
@@ -23,12 +23,14 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0",
"matrix_pins": {
"right": {
"cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["B5", "B4", "E6", "D7", "C6"]
}
+ },
+ "serial": {
+ "pin": "D0"
}
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
index 786c1b4a73..fa9b6ef0fd 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
@@ -60,14 +60,14 @@ static const uint8_t delay_sel[] = {MATRIX_IO_DELAY_MULSEL};
extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
-static inline void setPinOutput_writeLow(pin_t pin) {
+static inline void gpio_atomic_set_pin_output_low(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
gpio_set_pin_output(pin);
gpio_write_pin_low(pin);
}
}
-static inline void setPinInputHigh_atomic(pin_t pin) {
+static inline void gpio_atomic_set_pin_input_high(pin_t pin) {
ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); }
}
@@ -108,13 +108,13 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
#elif defined(DIODE_DIRECTION)
# if (DIODE_DIRECTION == COL2ROW)
-static void select_row(uint8_t row) { setPinOutput_writeLow(row_pins[row]); }
+static void select_row(uint8_t row) { gpio_atomic_set_pin_output_low(row_pins[row]); }
-static void unselect_row(uint8_t row) { setPinInputHigh_atomic(row_pins[row]); }
+static void unselect_row(uint8_t row) { gpio_atomic_set_pin_input_high(row_pins[row]); }
static void unselect_rows(void) {
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh_atomic(row_pins[x]);
+ gpio_atomic_set_pin_input_high(row_pins[x]);
}
}
@@ -125,7 +125,7 @@ static void init_pins(void) {
# endif
unselect_rows();
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
- setPinInputHigh_atomic(col_pins[x]);
+ gpio_atomic_set_pin_input_high(col_pins[x]);
}
}
@@ -218,20 +218,20 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
# elif (DIODE_DIRECTION == ROW2COL)
-static void select_col(uint8_t col) { setPinOutput_writeLow(col_pins[col]); }
+static void select_col(uint8_t col) { gpio_atomic_set_pin_output_low(col_pins[col]); }
-static void unselect_col(uint8_t col) { setPinInputHigh_atomic(col_pins[col]); }
+static void unselect_col(uint8_t col) { gpio_atomic_set_pin_input_high(col_pins[col]); }
static void unselect_cols(void) {
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
- setPinInputHigh_atomic(col_pins[x]);
+ gpio_atomic_set_pin_input_high(col_pins[x]);
}
}
static void init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh_atomic(row_pins[x]);
+ gpio_atomic_set_pin_input_high(row_pins[x]);
}
}
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index 9d283866b4..ba187a8376 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_HAND_PIN A6
// #define DEBUG_LED_PIN D6
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
index 825c59ac72..e5730a4586 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
@@ -19,6 +19,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
+ "handedness": {
+ "pin": "A6"
+ },
"soft_serial_pin": "D3",
"bootmagic": {
"matrix": [4, 5]
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index a2818e7176..b10fe7de74 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// #define USB_VBUS_PIN B10
-#define SPLIT_HAND_PIN C14 // high = left, low = right
// WS2812 RGB LED strip input and number of LEDs
#define WS2812_PWM_DRIVER PWMD3 // default: PWMD2
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
index 499390c610..a9070f2cc7 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
@@ -15,6 +15,14 @@
"audio": {
"driver": "dac_additive"
},
+ "split": {
+ "handedness": {
+ "pin": "C14"
+ },
+ "serial": {
+ "driver": "usart"
+ }
+ },
"ws2812": {
"pin": "A6",
"driver": "pwm"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
deleted file mode 100644
index 22915ec000..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# KEYBOARD_SHARED_EP = yes
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 87f830e175..64169da7e5 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// #define USB_VBUS_PIN B10 // doesn't seem to work for me on one of my controllers... */
-#define SPLIT_HAND_PIN C14 // high = left, low = right
// WS2812 RGB LED strip input and number of LEDs
#define WS2812_PWM_DRIVER PWMD2 // default: PWMD2
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
index 7182ee1701..c7d38c0daf 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
@@ -18,6 +18,14 @@
"audio": {
"driver": "pwm_hardware"
},
+ "split": {
+ "handedness": {
+ "pin": "C14"
+ },
+ "serial": {
+ "driver": "usart"
+ },
+ },
"ws2812": {
"pin": "A1",
"driver": "pwm"
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
index f26cbbced1..4aa582e7a2 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@@ -1,4 +1,2 @@
KEYBOARD_SHARED_EP = yes
MOUSE_SHARED_EP = yes
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/tsubasa/keyboard.json b/keyboards/handwired/tsubasa/keyboard.json
index 05fd05968a..31e6bb72cc 100644
--- a/keyboards/handwired/tsubasa/keyboard.json
+++ b/keyboards/handwired/tsubasa/keyboard.json
@@ -46,7 +46,6 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D3",
"encoder": {
"right": {
"rotary": [
@@ -54,6 +53,9 @@
]
}
},
+ "serial": {
+ "pin": "D3"
+ },
"transport": {
"sync": {
"layer_state": true,
diff --git a/keyboards/handwired/unk/keymaps/default/config.h b/keyboards/handwired/unk/keymaps/default/config.h
deleted file mode 100644
index 3d8851ac43..0000000000
--- a/keyboards/handwired/unk/keymaps/default/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Herpiko Dwi Aguno <[email protected]>
-
-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 MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
deleted file mode 100644
index 4e339bd553..0000000000
--- a/keyboards/handwired/unk/rev1/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 Herpiko Dwi Aguno <[email protected]>
-
-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 MASTER_LEFT // Comment this line for the right half firmware
-
-/*
- * 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
diff --git a/keyboards/handwired/unk/rev1/keyboard.json b/keyboards/handwired/unk/rev1/keyboard.json
index bfc4ee3c79..0de8b29f41 100644
--- a/keyboards/handwired/unk/rev1/keyboard.json
+++ b/keyboards/handwired/unk/rev1/keyboard.json
@@ -21,12 +21,14 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
- "soft_serial_pin": "D0",
"matrix_pins": {
"right": {
"cols": ["B1", "B3", "B2", "B6", "F7", "B5", "F6", "F5"],
"rows": ["C6", "D7", "B4", "E6", "D4"]
}
+ },
+ "serial": {
+ "pin": "D0"
}
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h
index a8788a8ad7..6cc6b4d1de 100644
--- a/keyboards/handwired/xealous/config.h
+++ b/keyboards/handwired/xealous/config.h
@@ -21,9 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_I2C
#define SCL_CLOCK 800000UL
-/* Select hand configuration */
-#define MASTER_LEFT
-
//#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
#ifdef AUDIO_ENABLE
diff --git a/keyboards/handwired/z150/config.h b/keyboards/handwired/z150/config.h
deleted file mode 100644
index 7a054266ea..0000000000
--- a/keyboards/handwired/z150/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2020 DmNosachev
-
-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 NUM_LOCK_LED_PIN B5
-#define SCROLL_LOCK_LED_PIN B4
-#define CAPS_LOCK_LED_PIN B3
-
-/*
- * 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
diff --git a/keyboards/handwired/z150/keyboard.json b/keyboards/handwired/z150/keyboard.json
index 0658bb5233..38c92a6537 100644
--- a/keyboards/handwired/z150/keyboard.json
+++ b/keyboards/handwired/z150/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": true,
"nkro": false
},
+ "indicators": {
+ "caps_lock": "B3",
+ "num_lock": "B5",
+ "scroll_lock": "B4",
+ "on_state": 0
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"],
"rows": ["B13", "B14", "B15", "A8", "A9", "A3", "A10", "A1", "A2", "A15", "A0"]
diff --git a/keyboards/handwired/z150/z150.c b/keyboards/handwired/z150/z150.c
deleted file mode 100644
index ab6709eed7..0000000000
--- a/keyboards/handwired/z150/z150.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * 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 "quantum.h"
-
-void matrix_init_kb(void) {
- gpio_set_pin_output(NUM_LOCK_LED_PIN);
- gpio_set_pin_output(CAPS_LOCK_LED_PIN);
- gpio_set_pin_output(SCROLL_LOCK_LED_PIN);
-
- gpio_write_pin_low(NUM_LOCK_LED_PIN);
- gpio_write_pin_low(CAPS_LOCK_LED_PIN);
- gpio_write_pin_low(SCROLL_LOCK_LED_PIN);
-
- matrix_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
- bool res = led_update_user(led_state);
- if(res) {
- gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock);
- gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock);
- gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock);
- }
- return res;
-}