summaryrefslogtreecommitdiff
path: root/keyboards/splitkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/splitkb')
-rw-r--r--keyboards/splitkb/aurora/lily58/rev1/config.h4
-rw-r--r--keyboards/splitkb/aurora/sweep/rev1/config.h4
-rw-r--r--keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c8
-rw-r--r--keyboards/splitkb/kyria/keymaps/lw/keymap.c6
-rw-r--r--keyboards/splitkb/kyria/keymaps/rmw/keymap.c120
-rw-r--r--keyboards/splitkb/kyria/keymaps/shinze/keymap.c8
-rw-r--r--keyboards/splitkb/kyria/keymaps/tessachka/keymap.c8
-rw-r--r--keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c8
-rw-r--r--keyboards/splitkb/kyria/keymaps/uqs/keymap.c15
-rw-r--r--keyboards/splitkb/kyria/rev1/config.h6
-rw-r--r--keyboards/splitkb/kyria/rev1/info.json65
-rw-r--r--keyboards/splitkb/kyria/rev2/config.h6
-rw-r--r--keyboards/splitkb/kyria/rev2/info.json69
-rw-r--r--keyboards/splitkb/kyria/rev3/config.h4
-rw-r--r--keyboards/splitkb/kyria/rev3/info.json68
-rw-r--r--keyboards/splitkb/zima/config.h9
-rw-r--r--keyboards/splitkb/zima/info.json6
-rw-r--r--keyboards/splitkb/zima/rules.mk2
18 files changed, 97 insertions, 319 deletions
diff --git a/keyboards/splitkb/aurora/lily58/rev1/config.h b/keyboards/splitkb/aurora/lily58/rev1/config.h
index 57a420d49c..1356c62ea1 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/config.h
+++ b/keyboards/splitkb/aurora/lily58/rev1/config.h
@@ -28,7 +28,7 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
-# define RGB_MATRIX_SPLIT RGBLED_SPLIT
+# define RGB_MATRIX_LED_COUNT 68
+# define RGB_MATRIX_SPLIT { 34, 34 }
# define SPLIT_TRANSPORT_MIRROR
#endif
diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
index aa5bd24fde..a3b2cc893e 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/config.h
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -28,7 +28,7 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
-# define RGB_MATRIX_SPLIT RGBLED_SPLIT
+# define RGB_MATRIX_LED_COUNT 46
+# define RGB_MATRIX_SPLIT { 23, 23 }
# define SPLIT_TRANSPORT_MIRROR
#endif
diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
index 3a5aa429d5..e93857f4cc 100644
--- a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c
@@ -384,10 +384,10 @@ static void render_status(void) {
oled_write_P(PSTR("\n"), false);
// Host Keyboard LED Status
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
+ led_t led_state = host_keyboard_led_state();
+ oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
diff --git a/keyboards/splitkb/kyria/keymaps/lw/keymap.c b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
index 1ff1f54d05..8cc29c8463 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
@@ -52,8 +52,6 @@ const uint32_t unicode_map[] PROGMEM = {
[SECTION] = 0x00A7, // §
[DEGREE] = 0x00B0, // °
};
-// usage: X(ACUTE), XP(CEDIL,CEDIL_MAJ)
-
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -74,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_QWERTZ] = LAYOUT(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_DEL,
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, XP(APOST,QUOTE), KC_BSPC, // XP(APOST,QUOTE) or KC_QUOT
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, UP(APOST,QUOTE), KC_BSPC, // UP(APOST,QUOTE) or KC_QUOT
KC_LSFT, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_BSLS, KC_GRV, KC_LPRN, KC_RPRN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SCLN, KC_CAPS,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), MO(2), SC_SENT, KC_MINS, KC_EXLM, KC_SLSH
),
@@ -138,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NAV] = LAYOUT(
_______, KC_BRIU, KC_MNXT, KC_MFFD, KC_MPLY, KC_VOLU, KC_HOME, KC_PGUP, KC_UP, KC_PGDN, _______, KC_DEL,
_______, KC_BRID, KC_MPRV, KC_MRWD, KC_MSTP, KC_VOLD, KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_SCRL, KC_BSPC,
- KC_LSFT, US_ACUT, US_DGRV, US_DCIR, US_DIAE, KC_MUTE, _______, UC_NEXT, KC_RSFT, KC_APP, KC_PSCR, XP(CEDIL,CEDIL_MAJ), XP(SECTION,DEGREE), _______, LCTL(KC_S), KC_INS,
+ KC_LSFT, US_ACUT, US_DGRV, US_DCIR, US_DIAE, KC_MUTE, _______, UC_NEXT, KC_RSFT, KC_APP, KC_PSCR, UP(CEDIL,CEDIL_MAJ), UP(SECTION,DEGREE), _______, LCTL(KC_S), KC_INS,
KC_LCTL, KC_LGUI, KC_LALT, _______, MO(1), MO(2), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V)
),
diff --git a/keyboards/splitkb/kyria/keymaps/rmw/keymap.c b/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
index be7bfe4c7a..59b18de418 100644
--- a/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/rmw/keymap.c
@@ -18,100 +18,60 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [QWERTY] = LAYOUT_stack(
- KC_TAB , KC_Q, KC_W, KC_E, KC_R, KC_T,
- OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_D, LT(FSYM,KC_F), KC_G,
- TD(FRBK2) , KC_Z, KC_X, KC_C, KC_V, KC_B, TO(EDIT), KC_ESCAPE,
- TO(ADJUST), TD(SGCA), TD(AGC), KC_BSPC, TD(SHNTC),
-
- KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
- KC_H, LT(JSYM,KC_J), KC_K, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
- KC_DEL, TO(NUMPAD), KC_N, KC_M, KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MS_BTN1,
- SFTENT, KC_SPC, TD(GCA), TD(CTLALL), KC_CAPS
+ [QWERTY] = LAYOUT_split_3x6_5(
+ KC_TAB , KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
+ OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_D, LT(FSYM,KC_F), KC_G, KC_H, LT(JSYM,KC_J), KC_K, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
+ TD(FRBK2) , KC_Z, KC_X, KC_C, KC_V, KC_B, TO(EDIT), KC_ESCAPE, KC_DEL, TO(NUMPAD), KC_N, KC_M, KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MS_BTN1,
+ TO(ADJUST), TD(SGCA), TD(AGC), KC_BSPC, TD(SHNTC), SFTENT, KC_SPC, TD(GCA), TD(CTLALL), KC_CAPS
),
- [MINIMAK4] = LAYOUT_stack(
- KC_TAB , KC_Q, KC_W, KC_D, KC_R, KC_K,
- OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_T, LT(FSYM,KC_F), KC_G,
- OSM(MOD_LSFT) , KC_Z, KC_X, KC_C, KC_V, KC_B, TO(EDIT), KC_ESCAPE,
- _______, TO(ADJUST), TD(SGCA), KC_BSPC, TD(SHNTC),
-
- KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE,
- KC_H, LT(JSYM,KC_J), KC_E, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
- KC_DEL, TO(NUMPAD), KC_N, KC_M, KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MINS,
- SFTENT, KC_SPC, TD(GCA), TD(CTLALL), _______
+ [MINIMAK4] = LAYOUT_split_3x6_5(
+ KC_TAB , KC_Q, KC_W, KC_D, KC_R, KC_K, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE,
+ OSL(EDIT), KC_A, LT(NUMPAD,KC_S), KC_T, LT(FSYM,KC_F), KC_G, KC_H, LT(JSYM,KC_J), KC_E, KC_L, LT(EDIT,KC_SCLN), KC_QUOT,
+ OSM(MOD_LSFT) , KC_Z, KC_X, KC_C, KC_V, KC_B, TO(EDIT), KC_ESCAPE, KC_DEL, TO(NUMPAD), KC_N, KC_M, KC_COMM, KC_DOT, LT(MEDIA,KC_SLSH), KC_MINS,
+ _______, TO(ADJUST), TD(SGCA), KC_BSPC, TD(SHNTC), SFTENT, KC_SPC, TD(GCA), TD(CTLALL), _______
),
- [NUMPAD] = LAYOUT_stack(
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, TO(QWERTY), _______,
- _______, _______, _______, _______ , _______,
-
- _______, KC_7, KC_8, KC_9, KC_KP_MINUS, _______,
- _______, KC_4, KC_5, KC_6, KC_KP_PLUS , _______,
- _______, TO(EDIT), _______, KC_1, KC_2, KC_3, KC_KP_SLASH, LCTL(KC_RIGHT),
- _______, _______, KC_0, KC_DOT, _______
+ [NUMPAD] = LAYOUT_split_3x6_5(
+ _______, _______, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_KP_MINUS, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, KC_KP_PLUS , _______,
+ _______, _______, _______, _______, _______, _______, TO(QWERTY), _______, _______, TO(EDIT), _______, KC_1, KC_2, KC_3, KC_KP_SLASH, LCTL(KC_RIGHT),
+ _______, _______, _______, _______ , _______, _______, _______, KC_0, KC_DOT, _______
),
- [EDIT] = LAYOUT_stack(
- _______, TASK_MAN, _______, SELW_LEFT, SELW_RIGHT, _______,
- _______, _______ , LGUI(KC_GRV), MVW_LEFT, MVW_RIGHT , _______,
- LCTL(KC_LEFT), R_UNDO, R_CUT , R_COPY , R_PASTE, R_REDO , TO(NUMPAD), FORM_GET,
- _______, _______, _______, DEL_WRD, _______,
-
- NEW_TAB , KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
- R_HOME , KC_LEFT, KC_DOWN, KC_RIGHT, R_END, _______,
- FORM_PUT, TO(QWERTY), SEL_HOME, S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), SEL_END, _______,
- _______, _______, _______, _______, _______
+ [EDIT] = LAYOUT_split_3x6_5(
+ _______, TASK_MAN, _______, SELW_LEFT, SELW_RIGHT, _______, NEW_TAB , KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, _______,
+ _______, _______ , LGUI(KC_GRV), MVW_LEFT, MVW_RIGHT , _______, R_HOME , KC_LEFT, KC_DOWN, KC_RIGHT, R_END, _______,
+ LCTL(KC_LEFT), R_UNDO, R_CUT , R_COPY , R_PASTE, R_REDO , TO(NUMPAD), FORM_GET, FORM_PUT, TO(QWERTY), SEL_HOME, S(KC_LEFT), S(KC_DOWN), S(KC_RIGHT), SEL_END, _______,
+ _______, _______, _______, DEL_WRD, _______, _______, _______, _______, _______, _______
),
- [ADJUST] = LAYOUT_stack(
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
- TO(QWERTY), TO(EDIT), TO(NUMPAD), TO(JSYM), TO(FSYM), TO(MEDIA),
- DF(MINIMAK4), DF(QWERTY), RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______,
- _______, _______, _______, _______, _______,
-
- KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______
+ [ADJUST] = LAYOUT_split_3x6_5(
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+ TO(QWERTY), TO(EDIT), TO(NUMPAD), TO(JSYM), TO(FSYM), TO(MEDIA), _______, _______, _______, _______, _______, _______,
+ DF(MINIMAK4), DF(QWERTY), RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [FSYM] = LAYOUT_stack(
- _______, _______, _______, _______, _______, _______,
- _______, _______, KC_TILD, KC_EXLM, _______, _______,
- LCTL(KC_RIGHT), _______, TO(QWERTY), _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______,
-
- KC_CIRC, KC_AMPR , KC_ASTR, KC_GRV , _______, _______,
- KC_EQUAL, KC_MINUS, KC_UNDS, KC_PIPE, KC_COLON, KC_DQT,
- _______, _______, _______, KC_PLUS, KC_BSLS, KC_SLSH, _______, _______,
- _______, _______, _______, _______, _______
+ [FSYM] = LAYOUT_split_3x6_5(
+ _______, _______, _______, _______, _______, _______, KC_CIRC, KC_AMPR , KC_ASTR, KC_GRV , _______, _______,
+ _______, _______, KC_TILD, KC_EXLM, _______, _______, KC_EQUAL, KC_MINUS, KC_UNDS, KC_PIPE, KC_COLON, KC_DQT,
+ LCTL(KC_RIGHT), _______, TO(QWERTY), _______, _______, _______, _______, _______, _______, _______, _______, KC_PLUS, KC_BSLS, KC_SLSH, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [JSYM] = LAYOUT_stack(
- _______, KC_GRV, KC_AT , KC_LCBR, KC_RCBR, _______,
- _______, KC_HASH, KC_DLR , KC_LPRN, KC_RPRN, KC_LEFT,
- _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______,
- _______, _______, _______, _______, _______,
-
- _______, _______, _______, _______, _______, _______,
- _______, _______, KC_QUES, KC_SLSH, KC_COLON, _______,
- _______, _______, _______, _______, _______, TO(QWERTY), _______, LCTL(KC_LEFT),
- _______, _______, _______, _______, _______
+ [JSYM] = LAYOUT_split_3x6_5(
+ _______, KC_GRV, KC_AT , KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_HASH, KC_DLR , KC_LPRN, KC_RPRN, KC_LEFT, _______, _______, KC_QUES, KC_SLSH, KC_COLON, _______,
+ _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______, _______, _______, _______, TO(QWERTY), _______, LCTL(KC_LEFT),
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [MEDIA] = LAYOUT_stack(
- _______, KC_WH_U, KC_WH_L, KC_MS_UP, KC_WH_R, _______,
- _______, KC_WH_D, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______,
- _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______,
- _______, _______, _______, _______, _______,
-
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______,
- KC_MS_BTN1, KC_MEDIA_PLAY_PAUSE, KC_MRWD, KC_MFFD, _______
+ [MEDIA] = LAYOUT_split_3x6_5(
+ _______, KC_WH_U, KC_WH_L, KC_MS_UP, KC_WH_R, _______, _______, _______, _______, _______, _______, _______,
+ _______, KC_WH_D, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______,
+ _______, _______, _______, _______, _______, KC_MS_BTN1, KC_MEDIA_PLAY_PAUSE, KC_MRWD, KC_MFFD, _______
)
};
diff --git a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
index 3483410525..ecc70055b2 100644
--- a/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/shinze/keymap.c
@@ -210,10 +210,10 @@ static void render_status(void) {
}
// Host Keyboard LED Status
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
+ led_t led_state = host_keyboard_led_state();
+ oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
bool oled_task_user(void) {
diff --git a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
index 6720a6b35c..87f51c4cd3 100644
--- a/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/tessachka/keymap.c
@@ -225,10 +225,10 @@ static void render_status(void) {
}
// Host Keyboard LED Status
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
+ led_t led_state = host_keyboard_led_state();
+ oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
bool oled_task_user(void) {
diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
index 3ed7dbee6e..14ce1b1a6e 100644
--- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c
@@ -286,10 +286,10 @@ static void render_status(void) {
}
// Host Keyboard LED Status
- uint8_t led_usb_state = host_keyboard_leds();
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR(" "), false);
- oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR(" "), false);
+ led_t led_state = host_keyboard_led_state();
+ oled_write_P(led_state.num_lock ? PSTR("NUMLCK ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAPLCK ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCRLCK ") : PSTR(" "), false);
}
bool oled_task_user(void) {
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
index 9d3d6d1f66..398b167e72 100644
--- a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
@@ -22,16 +22,11 @@
R45, R46, R47, \
R32, R33 \
) \
-LAYOUT_stack( \
- L00, L01, L02, L03, L04, L05, \
- L12, L13, L14, L15, L16, L17, \
- L24, L25, L26, L27, L28, L29, L30, L31, \
- L40, L41, L42, L43, L44, \
- \
- R06, R07, R08, R09, R10, R11, \
- R18, R19, R20, R21, R22, R23, \
- R32, R33, R34, R35, R36, R37, R38, R39, \
- R45, R46, R47, R48, R49 \
+LAYOUT_split_3x6_5( \
+ L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \
+ L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \
+ L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
+ L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
)
// clang-format off
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index 3f7655d431..6c21b12a84 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -41,10 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define SOFT_SERIAL_PIN D2
#endif
-#define RGBLED_SPLIT \
- { 10, 10 }
-#define RGBLED_NUM 20
-
#ifdef OLED_ENABLE
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
@@ -53,7 +49,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* RGB matrix support */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
+# define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
# define RGB_MATRIX_SPLIT { 10, 10 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
# define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/splitkb/kyria/rev1/info.json b/keyboards/splitkb/kyria/rev1/info.json
index 2e380145a0..cf849b0430 100644
--- a/keyboards/splitkb/kyria/rev1/info.json
+++ b/keyboards/splitkb/kyria/rev1/info.json
@@ -4,6 +4,10 @@
"pid": "0x9D9D",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 20,
+ "split_count": [10, 10]
+ },
"rgb_matrix": {
"driver": "WS2812"
},
@@ -90,67 +94,6 @@
{"matrix": [7, 3], "x": 12, "y": 3.25},
{"matrix": [7, 4], "x": 13, "y": 3.25}
]
- },
- "LAYOUT_stack": {
- "layout": [
- {"matrix": [0, 7], "x": 0, "y": 0},
- {"matrix": [0, 6], "x": 1, "y": 0},
- {"matrix": [0, 5], "x": 2, "y": 0},
- {"matrix": [0, 4], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
-
- {"matrix": [1, 7], "x": 6, "y": 0},
- {"matrix": [1, 6], "x": 7, "y": 0},
- {"matrix": [1, 5], "x": 8, "y": 0},
- {"matrix": [1, 4], "x": 9, "y": 0},
- {"matrix": [1, 3], "x": 10, "y": 0},
- {"matrix": [1, 2], "x": 11, "y": 0},
-
- {"matrix": [2, 7], "x": 12, "y": 0},
- {"matrix": [2, 6], "x": 13, "y": 0},
- {"matrix": [2, 5], "x": 14, "y": 0},
- {"matrix": [2, 4], "x": 15, "y": 0},
- {"matrix": [2, 3], "x": 16, "y": 0},
- {"matrix": [2, 2], "x": 17, "y": 0},
- {"matrix": [2, 1], "x": 18, "y": 0},
- {"matrix": [2, 0], "x": 19, "y": 0},
-
- {"matrix": [3, 4], "x": 20, "y": 0},
- {"matrix": [3, 3], "x": 21, "y": 0},
- {"matrix": [3, 2], "x": 22, "y": 0},
- {"matrix": [3, 1], "x": 23, "y": 0},
- {"matrix": [3, 0], "x": 24, "y": 0},
-
- {"matrix": [4, 2], "x": 25, "y": 0},
- {"matrix": [4, 3], "x": 26, "y": 0},
- {"matrix": [4, 4], "x": 27, "y": 0},
- {"matrix": [4, 5], "x": 28, "y": 0},
- {"matrix": [4, 6], "x": 29, "y": 0},
- {"matrix": [4, 7], "x": 30, "y": 0},
-
- {"matrix": [5, 2], "x": 31, "y": 0},
- {"matrix": [5, 3], "x": 32, "y": 0},
- {"matrix": [5, 4], "x": 33, "y": 0},
- {"matrix": [5, 5], "x": 34, "y": 0},
- {"matrix": [5, 6], "x": 35, "y": 0},
- {"matrix": [5, 7], "x": 36, "y": 0},
-
- {"matrix": [6, 0], "x": 37, "y": 0},
- {"matrix": [6, 1], "x": 38, "y": 0},
- {"matrix": [6, 2], "x": 39, "y": 0},
- {"matrix": [6, 3], "x": 40, "y": 0},
- {"matrix": [6, 4], "x": 41, "y": 0},
- {"matrix": [6, 5], "x": 42, "y": 0},
- {"matrix": [6, 6], "x": 43, "y": 0},
- {"matrix": [6, 7], "x": 44, "y": 0},
-
- {"matrix": [7, 0], "x": 45, "y": 0},
- {"matrix": [7, 1], "x": 46, "y": 0},
- {"matrix": [7, 2], "x": 47, "y": 0},
- {"matrix": [7, 3], "x": 48, "y": 0},
- {"matrix": [7, 4], "x": 49, "y": 0}
- ]
}
}
}
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 1e8dd02727..198688772b 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -47,10 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define SOFT_SERIAL_PIN D2
#endif
-#define RGBLED_SPLIT \
- { 10, 10 }
-#define RGBLED_NUM 20
-
#ifdef OLED_ENABLE
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
@@ -59,7 +55,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* RGB matrix support */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM // Number of LEDs
+# define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
# define RGB_MATRIX_SPLIT { 10, 10 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
# define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/splitkb/kyria/rev2/info.json b/keyboards/splitkb/kyria/rev2/info.json
index 9b745dc906..b498147ffd 100644
--- a/keyboards/splitkb/kyria/rev2/info.json
+++ b/keyboards/splitkb/kyria/rev2/info.json
@@ -4,6 +4,10 @@
"pid": "0x9D9D",
"device_version": "0.0.2"
},
+ "rgblight": {
+ "led_count": 20,
+ "split_count": [10, 10]
+ },
"rgb_matrix": {
"driver": "WS2812"
},
@@ -33,10 +37,10 @@
}
},
"layout_aliases": {
- "LAYOUT_split_3x6_5": "LAYOUT"
+ "LAYOUT": "LAYOUT_split_3x6_5"
},
"layouts": {
- "LAYOUT": {
+ "LAYOUT_split_3x6_5": {
"layout": [
{"matrix": [0, 7], "x": 0, "y": 0.75},
{"matrix": [0, 6], "x": 1, "y": 0.75},
@@ -96,67 +100,6 @@
{"matrix": [7, 3], "x": 12, "y": 3.25},
{"matrix": [7, 5], "x": 13, "y": 3.25}
]
- },
- "LAYOUT_stack": {
- "layout": [
- {"matrix": [0, 7], "x": 0, "y": 0},
- {"matrix": [0, 6], "x": 1, "y": 0},
- {"matrix": [0, 5], "x": 2, "y": 0},
- {"matrix": [0, 4], "x": 3, "y": 0},
- {"matrix": [0, 3], "x": 4, "y": 0},
- {"matrix": [0, 2], "x": 5, "y": 0},
-
- {"matrix": [1, 7], "x": 6, "y": 0},
- {"matrix": [1, 6], "x": 7, "y": 0},
- {"matrix": [1, 5], "x": 8, "y": 0},
- {"matrix": [1, 4], "x": 9, "y": 0},
- {"matrix": [1, 3], "x": 10, "y": 0},
- {"matrix": [1, 2], "x": 11, "y": 0},
-
- {"matrix": [2, 7], "x": 12, "y": 0},
- {"matrix": [2, 6], "x": 13, "y": 0},
- {"matrix": [2, 5], "x": 14, "y": 0},
- {"matrix": [2, 4], "x": 15, "y": 0},
- {"matrix": [2, 3], "x": 16, "y": 0},
- {"matrix": [2, 2], "x": 17, "y": 0},
- {"matrix": [2, 1], "x": 18, "y": 0},
- {"matrix": [2, 0], "x": 19, "y": 0},
-
- {"matrix": [3, 5], "x": 20, "y": 0},
- {"matrix": [3, 3], "x": 21, "y": 0},
- {"matrix": [3, 2], "x": 22, "y": 0},
- {"matrix": [3, 1], "x": 23, "y": 0},
- {"matrix": [3, 0], "x": 24, "y": 0},
-
- {"matrix": [4, 2], "x": 25, "y": 0},
- {"matrix": [4, 3], "x": 26, "y": 0},
- {"matrix": [4, 4], "x": 27, "y": 0},
- {"matrix": [4, 5], "x": 28, "y": 0},
- {"matrix": [4, 6], "x": 29, "y": 0},
- {"matrix": [4, 7], "x": 30, "y": 0},
-
- {"matrix": [5, 2], "x": 31, "y": 0},
- {"matrix": [5, 3], "x": 32, "y": 0},
- {"matrix": [5, 4], "x": 33, "y": 0},
- {"matrix": [5, 5], "x": 34, "y": 0},
- {"matrix": [5, 6], "x": 35, "y": 0},
- {"matrix": [5, 7], "x": 36, "y": 0},
-
- {"matrix": [6, 0], "x": 37, "y": 0},
- {"matrix": [6, 1], "x": 38, "y": 0},
- {"matrix": [6, 2], "x": 39, "y": 0},
- {"matrix": [6, 3], "x": 40, "y": 0},
- {"matrix": [6, 4], "x": 41, "y": 0},
- {"matrix": [6, 5], "x": 42, "y": 0},
- {"matrix": [6, 6], "x": 43, "y": 0},
- {"matrix": [6, 7], "x": 44, "y": 0},
-
- {"matrix": [7, 0], "x": 45, "y": 0},
- {"matrix": [7, 1], "x": 46, "y": 0},
- {"matrix": [7, 2], "x": 47, "y": 0},
- {"matrix": [7, 3], "x": 48, "y": 0},
- {"matrix": [7, 5], "x": 49, "y": 0}
- ]
}
}
}
diff --git a/keyboards/splitkb/kyria/rev3/config.h b/keyboards/splitkb/kyria/rev3/config.h
index 3c620d9019..5168e8678e 100644
--- a/keyboards/splitkb/kyria/rev3/config.h
+++ b/keyboards/splitkb/kyria/rev3/config.h
@@ -28,7 +28,7 @@
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT RGBLED_NUM
-# define RGB_MATRIX_SPLIT RGBLED_SPLIT
+# define RGB_MATRIX_LED_COUNT 62
+# define RGB_MATRIX_SPLIT { 31, 31 }
# define SPLIT_TRANSPORT_MIRROR
#endif
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json
index 97b953534d..a6f6d8df0f 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -16,8 +16,11 @@
"oled": true,
"rgb_matrix": true
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x6_5"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_split_3x6_5": {
"layout": [
{"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
{"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
@@ -25,6 +28,7 @@
{"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
{"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
+
{"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
{"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
{"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0},
@@ -38,6 +42,7 @@
{"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
{"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
{"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
+
{"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5},
{"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25},
{"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1},
@@ -53,6 +58,7 @@
{"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
{"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
{"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
+
{"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
{"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
{"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
@@ -67,66 +73,6 @@
{"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
{"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
{"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
- {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
- {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
- {"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
- {"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
- {"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25}
- ]
- },
- "LAYOUT_stack": {
- "layout": [
- {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
- {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
- {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
- {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
- {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
-
- {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
- {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
- {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
- {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
- {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
- {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
-
- {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
- {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
- {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
- {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
- {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
- {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
- {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
- {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
-
- {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
- {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
- {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
- {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
- {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
-
- {"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
- {"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
- {"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0},
- {"label": "R04", "matrix": [4, 4], "x": 13.5, "y": 0.25},
- {"label": "R05", "matrix": [4, 5], "x": 14.5, "y": 0.75},
- {"label": "R06", "matrix": [4, 6], "x": 15.5, "y": 0.75},
-
- {"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5},
- {"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25},
- {"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1},
- {"label": "R10", "matrix": [5, 4], "x": 13.5, "y": 1.25},
- {"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75},
- {"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75},
-
- {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
- {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
- {"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
- {"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25},
- {"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2},
- {"label": "R18", "matrix": [6, 4], "x": 13.5, "y": 2.25},
- {"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75},
- {"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75},
{"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
{"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h
index fca70ae030..b031fca8dd 100644
--- a/keyboards/splitkb/zima/config.h
+++ b/keyboards/splitkb/zima/config.h
@@ -21,11 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AUDIO_CLICKY
#define NO_MUSIC_MODE
-#define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -40,5 +35,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RATED_VOLTAGE 3
#define V_PEAK 5
-#define DRV_GREETING alert_750ms
-#define DRV_MODE_DEFAULT buzz
+#define DRV2605L_GREETING alert_750ms
+#define DRV2605L_DEFAULT_MODE buzz
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index 6cb53f372f..f017905224 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -8,6 +8,12 @@
"pid": "0xF75B",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 5,
+ "sleep": true
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk
index fb9a585656..f491893a43 100644
--- a/keyboards/splitkb/zima/rules.mk
+++ b/keyboards/splitkb/zima/rules.mk
@@ -15,6 +15,6 @@ ENCODER_ENABLE = yes # ENables the use of one or more encoders
OLED_ENABLE = yes
OLED_DRIVER = SSD1306 # Enables the use of OLED displays
HAPTIC_ENABLE = yes # Supported but not included by defaut
-HAPTIC_DRIVER = DRV2605L
+HAPTIC_DRIVER = drv2605l
LTO_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 17:17:42 +0000