mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-10-09 03:42:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Added Dynamic Layout selection

Browse source 
- Cleanup unused code and updated documentation
- add dynamic layout selection
  - Leveraged common_features.mk framework
  - Configure layout in keymap rules.mk
- Will test more but it is ready to ship
This commit is contained in:
Victor 2024-05-15 07:52:23 -05:00
commit 41a0204fc9
Failed to generate hash of commit
10 changed files with 249 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

1
keyboards/klor/2040/rules.mk
View file

@ -12,5 +12,4 @@ CONVERT_TO = promicro_rp2040
#CONVERT_TO = elite_pi #CONVERT_TO = elite_pi
# AUDIO # AUDIO
AUDIO_ENABLE = yes
AUDIO_DRIVER = pwm_hardware AUDIO_DRIVER = pwm_hardware

49
keyboards/klor/info.json
View file

@ -82,51 +82,7 @@
"sleep": true, "sleep": true,
"default": { "default": {
"hue": 35 "hue": 35
}, }
"layout": [
{"matrix": [3, 4], "x": 102, "y": 63, "flags": 1},
{"matrix": [3, 3], "x": 89, "y": 54, "flags": 1},
{"matrix": [3, 2], "x": 74, "y": 49, "flags": 1},
{"matrix": [2, 5], "x": 75, "y": 34, "flags": 4},
{"matrix": [1, 5], "x": 75, "y": 21, "flags": 4},
{"matrix": [0, 5], "x": 75, "y": 8, "flags": 4},
{"matrix": [0, 4], "x": 60, "y": 6, "flags": 4},
{"matrix": [1, 4], "x": 60, "y": 19, "flags": 4},
{"matrix": [2, 4], "x": 60, "y": 32, "flags": 4},
{"matrix": [3, 1], "x": 58, "y": 48, "flags": 1},
{"matrix": [2, 3], "x": 46, "y": 25, "flags": 4},
{"matrix": [1, 3], "x": 46, "y": 12, "flags": 4},
{"matrix": [0, 3], "x": 46, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 29, "y": 7, "flags": 4},
{"matrix": [1, 2], "x": 30, "y": 20, "flags": 4},
{"matrix": [2, 2], "x": 31, "y": 33, "flags": 4},
{"matrix": [2, 1], "x": 17, "y": 42, "flags": 4},
{"matrix": [1, 1], "x": 15, "y": 30, "flags": 4},
{"matrix": [0, 1], "x": 13, "y": 17, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 28, "flags": 1},
{"matrix": [2, 0], "x": 3, "y": 41, "flags": 1},
{"matrix": [7, 4], "x": 122, "y": 63, "flags": 1},
{"matrix": [7, 3], "x": 135, "y": 54, "flags": 1},
{"matrix": [7, 2], "x": 150, "y": 49, "flags": 1},
{"matrix": [6, 5], "x": 149, "y": 34, "flags": 4},
{"matrix": [5, 5], "x": 149, "y": 21, "flags": 4},
{"matrix": [4, 5], "x": 149, "y": 8, "flags": 4},
{"matrix": [4, 4], "x": 163, "y": 6, "flags": 4},
{"matrix": [5, 4], "x": 163, "y": 19, "flags": 4},
{"matrix": [6, 4], "x": 163, "y": 32, "flags": 4},
{"matrix": [7, 1], "x": 166, "y": 48, "flags": 1},
{"matrix": [6, 3], "x": 178, "y": 25, "flags": 4},
{"matrix": [5, 3], "x": 178, "y": 12, "flags": 4},
{"matrix": [4, 3], "x": 178, "y": 0, "flags": 4},
{"matrix": [4, 2], "x": 195, "y": 7, "flags": 4},
{"matrix": [5, 2], "x": 194, "y": 20, "flags": 4},
{"matrix": [6, 2], "x": 193, "y": 33, "flags": 4},
{"matrix": [4, 1], "x": 206, "y": 42, "flags": 4},
{"matrix": [5, 1], "x": 209, "y": 30, "flags": 4},
{"matrix": [6, 1], "x": 211, "y": 17, "flags": 4},
{"matrix": [5, 0], "x": 224, "y": 28, "flags": 1},
{"matrix": [6, 0], "x": 221, "y": 41, "flags": 1}
]
}, },
"ws2812": { "ws2812": {
"pin": "D3" "pin": "D3"
@ -134,9 +90,6 @@
"audio": { "audio": {
"voices": true "voices": true
}, },
"layout_aliases": {
"LAYOUT": "LAYOUT_polydactyl"
},
"layouts": { "layouts": {
"LAYOUT_konrad": { "LAYOUT_konrad": {
"layout": [ "layout": [

18
keyboards/klor/keymaps/default/keymap.c
View file

@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPACE │ │ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPACE │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
[_QWERTY] = LAYOUT_polydactyl( [_QWERTY] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPCE │ │ CTRL │ LOWER │ SPACE │ ALT ││ CMD/WIN │ ENTER │ RAISE │ BSPCE │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
[_COLEMAK] = LAYOUT_polydactyl( [_COLEMAK] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
KC_TAB, GUI_A, ALT_R, CTL_S, SHT_T, KC_D, KC_H, SHT_N, CTL_E, ALT_I, GUI_O, KC_QUOT, KC_TAB, GUI_A, ALT_R, CTL_S, SHT_T, KC_D, KC_H, SHT_N, CTL_E, ALT_I, GUI_O, KC_QUOT,
@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ ▼ │ ▼ │ ▼ │ ▼ ││ ▼ │ ▼ │ ADJUST │ 0 │ │ ▼ │ ▼ │ ▼ │ ▼ ││ ▼ │ ▼ │ ADJUST │ 0 │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
[_LOWER] = LAYOUT_polydactyl( [_LOWER] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_CAPS, KC_NUM, KC_UP, KC_EQL, KC_LCBR, KC_RCBR, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_NUM, KC_UP, KC_EQL, KC_LCBR, KC_RCBR, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_ESC, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_MINS, KC_DQT, KC_ESC, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_MINS, KC_DQT,
@ -183,7 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ ADJUST │ ▼ │ ▼ ││ ▼ │ ▼ │ ▼ │ ▼ │ │ │ ADJUST │ ▼ │ ▼ ││ ▼ │ ▼ │ ▼ │ ▼ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
[_RAISE] = LAYOUT_polydactyl( [_RAISE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, RALT(KC_U),RALT(KC_3),KC_BSLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, RALT(KC_U),RALT(KC_3),KC_BSLS,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@ -206,7 +206,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ ▼ │ ▼ │ ▼ │ ▼ ││ ▼ │ ▼ │ ▼ │ ▼ │ │ ▼ │ ▼ │ ▼ │ ▼ ││ ▼ │ ▼ │ ▼ │ ▼ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ */
[_ADJUST] = LAYOUT_polydactyl( [_ADJUST] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
AU_TOGG, HF_TOGG, RGB_HUI, RGB_MOD, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F14, AU_TOGG, HF_TOGG, RGB_HUI, RGB_MOD, XXXXXXX, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F14,
QK_BOOT, DB_TOGG, QWERTY, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F12, KC_F13, QK_BOOT, DB_TOGG, QWERTY, RGB_SAI, XXXXXXX, XXXXXXX, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F12, KC_F13,
@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ ││ │ │ │ │ │ │ │ │ ││ │ │ │ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
[_TEMPLATE] = LAYOUT_polydactyl( [_TEMPLATE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -253,7 +253,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
[_TEMPLATE] = LAYOUT_konrad( [_TEMPLATE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -276,7 +276,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ ││ │ │ │ │ │ │ │ │ ││ │ │ │ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
[_TEMPLATE] = LAYOUT_yubitsume( [_TEMPLATE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -300,7 +300,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
[_TEMPLATE] = LAYOUT_saegewerk( [_TEMPLATE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

6
keyboards/klor/keymaps/default/rules.mk
View file

@ -4,5 +4,9 @@ DYNAMIC_MACRO_ENABLE = no
COMBO_ENABLE = no COMBO_ENABLE = no
KEY_OVERRIDE_ENABLE = no KEY_OVERRIDE_ENABLE = no
#HAPTIC FEEBACK AUDIO_ENABLE = yes
MUSIC_ENABLE = yes
HAPTIC_ENABLE = no HAPTIC_ENABLE = no
# Choose your layout
KLOR_LAYOUT = polydactyl

18
keyboards/klor/keymaps/saegewerk/keymap.c
View file

@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPACE │ │ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPACE │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
[_QWERTY] = LAYOUT_saegewerk( [_QWERTY] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 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_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPCE │ │ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPCE │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
[_COLEMAK] = LAYOUT_saegewerk( [_COLEMAK] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN,
GUI_A, ALT_R, CTL_S, SHT_T, KC_D, KC_H, SHT_N, CTL_E, ALT_I, GUI_O, GUI_A, ALT_R, CTL_S, SHT_T, KC_D, KC_H, SHT_N, CTL_E, ALT_I, GUI_O,
@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ ▼ │ ▼ │ ▼ │ │ ▼ │ ADJUST │ 0 │ │ ▼ │ ▼ │ ▼ │ │ ▼ │ ADJUST │ 0 │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
[_LOWER] = LAYOUT_saegewerk( [_LOWER] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_CAPS, KC_NUM, KC_UP, KC_EQL, KC_LCBR, KC_RCBR, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_CAPS, KC_NUM, KC_UP, KC_EQL, KC_LCBR, KC_RCBR, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_MINS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_RBRC, KC_P4, KC_P5, KC_P6, KC_MINS,
@ -182,7 +182,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ ADJUST │ ▼ │ │ ▼ │ ▼ │ ▼ │ │ │ ADJUST │ ▼ │ │ ▼ │ ▼ │ ▼ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
[_RAISE] = LAYOUT_saegewerk( [_RAISE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, RALT(KC_U),RALT(KC_3),KC_BSLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, RALT(KC_U),RALT(KC_3),KC_BSLS,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
@ -205,7 +205,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ ▼ │ ▼ │ ▼ │ │ ▼ │ ▼ │ ▼ │ │ ▼ │ ▼ │ ▼ │ │ ▼ │ ▼ │ ▼ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
[_ADJUST] = LAYOUT_saegewerk( [_ADJUST] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
AU_TOGG, HF_TOGG, RGB_HUI, RGB_MOD, QK_BOOT, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F11, AU_TOGG, HF_TOGG, RGB_HUI, RGB_MOD, QK_BOOT, XXXXXXX, KC_F7, KC_F8, KC_F9, KC_F11,
DB_TOGG, QWERTY, RGB_SAI, XXXXXXX, QK_MAKE, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F12, DB_TOGG, QWERTY, RGB_SAI, XXXXXXX, QK_MAKE, XXXXXXX, KC_F4, KC_F5, KC_F6, KC_F12,
@ -229,7 +229,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ ││ │ │ │ │ │ │ │ │ ││ │ │ │ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
[_TEMPLATE] = LAYOUT_polydactyl( [_TEMPLATE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -252,7 +252,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
[_TEMPLATE] = LAYOUT_konrad( [_TEMPLATE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -275,7 +275,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ ││ │ │ │ │ │ │ │ │ ││ │ │ │ │
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
[_TEMPLATE] = LAYOUT_yubitsume( [_TEMPLATE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -299,7 +299,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
[_TEMPLATE] = LAYOUT_saegewerk( [_TEMPLATE] = LAYOUT(
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ //╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

7
keyboards/klor/keymaps/saegewerk/rules.mk
View file

@ -4,9 +4,10 @@ DYNAMIC_MACRO_ENABLE = no
COMBO_ENABLE = no COMBO_ENABLE = no
KEY_OVERRIDE_ENABLE = no KEY_OVERRIDE_ENABLE = no
#HAPTIC FEEBACK AUDIO_ENABLE = yes
MUSIC_ENABLE = yes
HAPTIC_ENABLE = yes HAPTIC_ENABLE = yes
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = yes
MUSIC_ENABLE = yes # Choose your layout
KLOR_LAYOUT = saegewerk

39
keyboards/klor/klor.c
View file

@ -17,6 +17,9 @@
#include "klor.h" #include "klor.h"
#ifdef KLOR_POLYDACTL
# define LAYOUT LAYOUT_polydactyl
# define LAYOUT_polydactyl( \ # define LAYOUT_polydactyl( \
L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \ L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
@ -33,8 +36,8 @@
{ R25, R24, R23, R22, R21, R20 }, \ { R25, R24, R23, R22, R21, R20 }, \
{ ___, R34, R33, R32, R31, R30 }, \ { ___, R34, R33, R32, R31, R30 }, \
} }
#elif defined(KLOR_KONRAD)
# define LAYOUT LAYOUT_konrad
# define LAYOUT_konrad( \ # define LAYOUT_konrad( \
L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \ L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
@ -51,8 +54,8 @@
{ R25, R24, R23, R22, R21, R20 }, \ { R25, R24, R23, R22, R21, R20 }, \
{ ___, R34, R33, R32, ___, R30 }, \ { ___, R34, R33, R32, ___, R30 }, \
} }
#elif defined(KLOR_YUBITSUME)
# define LAYOUT LAYOUT_yubitsume
# define LAYOUT_yubitsume( \ # define LAYOUT_yubitsume( \
L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \ L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \ L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
@ -69,8 +72,8 @@
{ ___, R24, R23, R22, R21, R20 }, \ { ___, R24, R23, R22, R21, R20 }, \
{ ___, R34, R33, R32, R31, R30 }, \ { ___, R34, R33, R32, R31, R30 }, \
} }
#elif defined(KLOR_SAEGEWERK)
# define LAYOUT LAYOUT_saegewerk
# define LAYOUT_saegewerk( \ # define LAYOUT_saegewerk( \
L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \ L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \ L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
@ -87,9 +90,7 @@
{ ___, R24, R23, R22, R21, R20 }, \ { ___, R24, R23, R22, R21, R20 }, \
{ ___, R34, R33, R32, ___, R30 }, \ { ___, R34, R33, R32, ___, R30 }, \
} }
#endif //KLOR_POLYDACTL
#define LAYOUT LAYOUT_polydactyl
@ -170,9 +171,10 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] =
// └────────────────┘ └────────────────┘ // └────────────────┘ └────────────────┘
# if defined (KLOR_POLYDACTL) || defined(KLOR_YUBITSUME)
// POLYDACTYL / YUBITSUME // POLYDACTYL / YUBITSUME
// use this matrix if you use the polydactyl or yubitsume layout ────────────────────────────────────┐ // use this matrix if you use the polydactyl or yubitsume layout ────────────────────────────────────┐
/*
led_config_t g_led_config = { { led_config_t g_led_config = { {
//COL 00 01 02 03 04 05 ROW //COL 00 01 02 03 04 05 ROW
{ NO_LED, 18, 13, 12, 6, 5 },//00 { NO_LED, 18, 13, 12, 6, 5 },//00
@ -209,12 +211,13 @@ led_config_t g_led_config = { {
4, 4, 4, 4, 4, 1, 1 4, 4, 4, 4, 4, 1, 1
} }; } };
// ────────────────────────────────────────────────────────────────────────────────────────────────────┘ // ────────────────────────────────────────────────────────────────────────────────────────────────────┘
*/
/*
# elif defined(KLOR_KONRAD)
// KONRAD // KONRAD
// use this matrix if you use the konrad layout ───────────────────────────────────────────────────────┐ // use this matrix if you use the konrad layout ───────────────────────────────────────────────────────┐
led_config_t g_led_config = { { led_config_t g_led_config = { {
//COL 00 01 02 03 04 05 ROW //COL 00 01 02 03 04 05 ROW
{ NO_LED, 17, 12, 11, 5, 4 },//00 { NO_LED, 17, 12, 11, 5, 4 },//00
@ -252,12 +255,11 @@ led_config_t g_led_config = { {
} }; } };
// ────────────────────────────────────────────────────────────────────────────────────────────────────┘ // ────────────────────────────────────────────────────────────────────────────────────────────────────┘
*/
/*
# elif defined(KLOR_SAEGEWERK)
// SAEGEWERK // SAEGEWERK
// use this matrix if you use the saegewerk layout ────────────────────────────────────────────────────┐ // use this matrix if you use the saegewerk layout ────────────────────────────────────────────────────┐
led_config_t g_led_config = { { led_config_t g_led_config = { {
//COL 00 01 02 03 04 05 ROW //COL 00 01 02 03 04 05 ROW
{ NO_LED, 17, 12, 11, 5, 4 },//00 { NO_LED, 17, 12, 11, 5, 4 },//00
@ -295,7 +297,9 @@ led_config_t g_led_config = { {
} }; } };
// ────────────────────────────────────────────────────────────────────────────────────────────────────┘ // ────────────────────────────────────────────────────────────────────────────────────────────────────┘
*/
# endif //KLOR_POLYDACTL || KLOR_YUBITSUME
void suspend_power_down_kb(void) { void suspend_power_down_kb(void) {
rgb_matrix_set_suspend_state(true); rgb_matrix_set_suspend_state(true);
@ -306,6 +310,7 @@ void suspend_wakeup_init_kb(void) {
rgb_matrix_set_suspend_state(false); rgb_matrix_set_suspend_state(false);
suspend_wakeup_init_user(); suspend_wakeup_init_user();
} }
#endif //RGB_MATRIX_ENABLE #endif //RGB_MATRIX_ENABLE

7
keyboards/klor/post_rules.mk Normal file
View file

@ -0,0 +1,7 @@
VALID_KLOR_LAYOUTS := polydactyl konrad yubitsume saegewerk
ifeq ($(filter $(KLOR_LAYOUT),$(VALID_KLOR_LAYOUTS)),)
$(call CATASTROPHIC_ERROR,Invalid KLOR_LAYOUT,KLOR_LAYOUT="$(KLOR_LAYOUT)" is not a valid Haptic driver)
else
OPT_DEFS += -DKLOR_$(strip $(shell echo $(KLOR_LAYOUT) | tr '[:lower:]' '[:upper:]'))
endif

17
keyboards/klor/readme.md
View file

@ -17,10 +17,23 @@
KLOR is 42 keys column-staggered split keyboard made by @geigeigeist. It supports a per key RGB matrix, encoders, OLED displays, haptic feedback, audio, a Pixart Paw3204 trackball and four different layouts, through brake off parts. KLOR is 42 keys column-staggered split keyboard made by @geigeigeist. It supports a per key RGB matrix, encoders, OLED displays, haptic feedback, audio, a Pixart Paw3204 trackball and four different layouts, through brake off parts.
It's schematics are based on the Sofle, while the layout is based on the Yacc46. It's schematics are based on the Sofle, while the layout is based on the Yacc46.
t4croun: this is my attempt at modernizing @geigeigeist's keymap. The repo has not been updated in a few years and QMK has introduced breaking changes. His repo can be found [here](https://github.com/GEIGEIGEIST/qmk-config-klor). Note: Focusing on defining my saegewerk configuration as that is what I have
You can use this command to compile the firmware You can use this command to compile the firmware
`qmk compile -kb klor -km default` `qmk compile -kb klor -km default`
and this command if you want to compile the firmware for a RP2040 based MCU and this command if you want to compile the firmware for a RP2040 based MCU
`qmk compile -kb klor/2040 -km default` `qmk compile -kb klor/2040 -km default`
## t4corun modernization
this is my attempt at modernizing @geigeigeist's repo. It has not been updated in a few years and firmware cannot be built as-is as QMK has introduced breaking changes. @geigeigeist's repo can be found [here](https://github.com/GEIGEIGEIST/qmk-config-klor). Should work for all KLOR variations, but I tested against Saegwerk as that is the one I have
Features
- Can choose layout based on keymap rules.mk configuration. Before keyboard configuration would need to be changed
- Converted as much as possible to data driven configuration: `info.json`
What I did not test
- RGBLight
- Other variations (e.g.Polydactyl)
- Swap Hands

26
keyboards/klor/rules.mk
View file

@ -1,28 +1,4 @@
# A number of these rules were moved into info.json # Features are now defined in info.json when possible
# Build Options
# change yes to no to disable
#
#SWAP_HANDS_ENABLE = yes
#OLED_ENABLE = yes
# HAPTIC FEEDBACK # HAPTIC FEEDBACK
HAPTIC_DRIVER = drv2605l HAPTIC_DRIVER = drv2605l
# PER KEY RGB
#BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
#RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
#RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
# SPACE SAVING
# EXTRAKEY_ENABLE = no
# AUDIO_ENABLE = no
# MUSIC_ENABLE = no
# LTO_ENABLE = no
# CONSOLE_ENABLE = no
# COMMAND_ENABLE = no
# MOUSEKEY_ENABLE = no
# SPACE_CADET_ENABLE = no
# GRAVE_ESC_ENABLE = no
# MAGIC_ENABLE = no