mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-07-07 20:25:35 -04:00
Got everything working
- can't have a layout macro start with LAYOUT. Now it's just KLOR(...) - Turn off extra features for AVR MCU in post_rules.mk. This helps all customizations remain in the keymap. - Updatd documentation
This commit is contained in:
parent
555c17e3cd
commit
0c479c0502
8 changed files with 39 additions and 104 deletions
|
@ -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_KLOR(
|
[_QWERTY] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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_KLOR(
|
[_COLEMAK] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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_KLOR(
|
[_LOWER] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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_KLOR(
|
[_RAISE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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_KLOR(
|
[_ADJUST] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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(
|
[_TEMPLATE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
@ -253,7 +253,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ │ │ │ │ │ │ │
|
│ │ │ │ │ │ │ │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
|
||||||
|
|
||||||
[_TEMPLATE] = LAYOUT(
|
[_TEMPLATE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
@ -276,7 +276,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ │ │ │ ││ │ │ │ │
|
│ │ │ │ ││ │ │ │ │
|
||||||
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
|
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
|
||||||
|
|
||||||
[_TEMPLATE] = LAYOUT(
|
[_TEMPLATE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
@ -300,7 +300,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ │ │ │ │ │ │ │
|
│ │ │ │ │ │ │ │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
|
||||||
|
|
||||||
[_TEMPLATE] = LAYOUT(
|
[_TEMPLATE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
|
|
@ -4,9 +4,11 @@ DYNAMIC_MACRO_ENABLE = no
|
||||||
COMBO_ENABLE = no
|
COMBO_ENABLE = no
|
||||||
KEY_OVERRIDE_ENABLE = no
|
KEY_OVERRIDE_ENABLE = no
|
||||||
|
|
||||||
|
# These features will be disabled in post_rules.mk if using an AVR MCU
|
||||||
AUDIO_ENABLE = yes
|
AUDIO_ENABLE = yes
|
||||||
MUSIC_ENABLE = yes
|
MUSIC_ENABLE = yes
|
||||||
HAPTIC_ENABLE = no
|
HAPTIC_ENABLE = no
|
||||||
|
RGB_MATRIX_ENABLE = no
|
||||||
|
|
||||||
# Choose your layout
|
# Choose your layout
|
||||||
KLOR_LAYOUT = polydactyl
|
KLOR_LAYOUT = polydactyl
|
|
@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPACE │
|
│ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPACE │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
||||||
|
|
||||||
[_QWERTY] = LAYOUT_KLOR(
|
[_QWERTY] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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,
|
||||||
|
@ -138,7 +138,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPCE │
|
│ CTRL │ LOWER │ SPACE │ │ ENTER │ RAISE │ BSPCE │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
||||||
|
|
||||||
[_COLEMAK] = LAYOUT_KLOR(
|
[_COLEMAK] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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,
|
||||||
|
@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ ▼ │ ▼ │ ▼ │ │ ▼ │ ADJUST │ 0 │
|
│ ▼ │ ▼ │ ▼ │ │ ▼ │ ADJUST │ 0 │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
||||||
|
|
||||||
[_LOWER] = LAYOUT_KLOR(
|
[_LOWER] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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,
|
||||||
|
@ -185,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ │ ADJUST │ ▼ │ │ ▼ │ ▼ │ ▼ │
|
│ │ ADJUST │ ▼ │ │ ▼ │ ▼ │ ▼ │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
||||||
|
|
||||||
[_RAISE] = LAYOUT_KLOR(
|
[_RAISE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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,
|
||||||
|
@ -208,7 +208,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ ▼ │ ▼ │ ▼ │ │ ▼ │ ▼ │ ▼ │
|
│ ▼ │ ▼ │ ▼ │ │ ▼ │ ▼ │ ▼ │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘ */
|
||||||
|
|
||||||
[_ADJUST] = LAYOUT_KLOR(
|
[_ADJUST] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
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,
|
||||||
|
@ -232,7 +232,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ │ │ │ ││ │ │ │ │
|
│ │ │ │ ││ │ │ │ │
|
||||||
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
|
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
|
||||||
|
|
||||||
[_TEMPLATE] = LAYOUT(
|
[_TEMPLATE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
@ -255,7 +255,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ │ │ │ │ │ │ │
|
│ │ │ │ │ │ │ │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
|
||||||
|
|
||||||
[_TEMPLATE] = LAYOUT(
|
[_TEMPLATE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
@ -278,7 +278,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ │ │ │ ││ │ │ │ │
|
│ │ │ │ ││ │ │ │ │
|
||||||
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
|
└─────────┴─────────┴─────────┴─────────┘└─────────┴─────────┴─────────┴─────────┘
|
||||||
|
|
||||||
[_TEMPLATE] = LAYOUT(
|
[_TEMPLATE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
@ -302,7 +302,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
│ │ │ │ │ │ │ │
|
│ │ │ │ │ │ │ │
|
||||||
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
|
└─────────┴─────────┴─────────┘ └─────────┴─────────┴─────────┘
|
||||||
|
|
||||||
[_TEMPLATE] = LAYOUT(
|
[_TEMPLATE] = KLOR(
|
||||||
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
//╷ ╷ ╷ ╷ ╷ ╷ ╷╷ ╷ ╷ ╷ ╷ ╷ ╷
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||||
|
|
|
@ -4,6 +4,7 @@ DYNAMIC_MACRO_ENABLE = no
|
||||||
COMBO_ENABLE = no
|
COMBO_ENABLE = no
|
||||||
KEY_OVERRIDE_ENABLE = no
|
KEY_OVERRIDE_ENABLE = no
|
||||||
|
|
||||||
|
# These features will be disabled in post_rules.mk if using an AVR MCU
|
||||||
AUDIO_ENABLE = yes
|
AUDIO_ENABLE = yes
|
||||||
MUSIC_ENABLE = yes
|
MUSIC_ENABLE = yes
|
||||||
HAPTIC_ENABLE = yes
|
HAPTIC_ENABLE = yes
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
{ R25, R24, R23, R22, R21, R20 }, \
|
{ R25, R24, R23, R22, R21, R20 }, \
|
||||||
{ ___, R34, R33, R32, R31, R30 }, \
|
{ ___, R34, R33, R32, R31, R30 }, \
|
||||||
}
|
}
|
||||||
//# define LAYOUT(...) LAYOUT_polydactyl(__VA_ARGS__)
|
|
||||||
#elif defined(KLOR_KONRAD)
|
#elif defined(KLOR_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, \
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
{ R25, R24, R23, R22, R21, R20 }, \
|
{ R25, R24, R23, R22, R21, R20 }, \
|
||||||
{ ___, R34, R33, R32, ___, R30 }, \
|
{ ___, R34, R33, R32, ___, R30 }, \
|
||||||
}
|
}
|
||||||
//# define LAYOUT(...) LAYOUT_konrad(__VA_ARGS__)
|
|
||||||
#elif defined(KLOR_YUBITSUME)
|
#elif defined(KLOR_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, \
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
{ ___, R24, R23, R22, R21, R20 }, \
|
{ ___, R24, R23, R22, R21, R20 }, \
|
||||||
{ ___, R34, R33, R32, R31, R30 }, \
|
{ ___, R34, R33, R32, R31, R30 }, \
|
||||||
}
|
}
|
||||||
//# define LAYOUT(...) LAYOUT_yubitsume(__VA_ARGS__)
|
|
||||||
#elif defined(KLOR_SAEGEWERK)
|
#elif defined(KLOR_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, \
|
||||||
|
@ -88,85 +88,8 @@
|
||||||
{ ___, R24, R23, R22, R21, R20 }, \
|
{ ___, R24, R23, R22, R21, R20 }, \
|
||||||
{ ___, R34, R33, R32, ___, R30 }, \
|
{ ___, R34, R33, R32, ___, R30 }, \
|
||||||
}
|
}
|
||||||
//# define LAYOUT_KLOR(...) LAYOUT_saegewerk(__VA_ARGS__)
|
|
||||||
#endif //KLOR_POLYDACTL
|
#endif //KLOR_POLYDACTL
|
||||||
|
|
||||||
/*
|
|
||||||
#ifdef KLOR_POLYDACTYL
|
|
||||||
# define LAYOUT_polydactyl( \
|
|
||||||
L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
|
|
||||||
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
|
||||||
L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25, \
|
|
||||||
L31, L32, L33, L34, R31, R32, R33, R34 \
|
|
||||||
) \
|
|
||||||
{ \
|
|
||||||
{ ___, L01, L02, L03, L04, L05 }, \
|
|
||||||
{ L10, L11, L12, L13, L14, L15 }, \
|
|
||||||
{ L20, L21, L22, L23, L24, L25 }, \
|
|
||||||
{ ___, L31, L32, L33, L34, L35 }, \
|
|
||||||
{ ___, R04, R03, R02, R01, R00 }, \
|
|
||||||
{ R15, R14, R13, R12, R11, R10 }, \
|
|
||||||
{ R25, R24, R23, R22, R21, R20 }, \
|
|
||||||
{ ___, R34, R33, R32, R31, R30 }, \
|
|
||||||
}
|
|
||||||
# define LAYOUT(...) LAYOUT_polydactyl(__VA_ARGS__)
|
|
||||||
#elif defined(KLOR_KONRAD)
|
|
||||||
# define LAYOUT_konrad( \
|
|
||||||
L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
|
|
||||||
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
|
||||||
L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25, \
|
|
||||||
L31, L32, L33, R32, R33, R34 \
|
|
||||||
) \
|
|
||||||
{ \
|
|
||||||
{ ___, L01, L02, L03, L04, L05 }, \
|
|
||||||
{ L10, L11, L12, L13, L14, L15 }, \
|
|
||||||
{ L20, L21, L22, L23, L24, L25 }, \
|
|
||||||
{ ___, L31, L32, L33, ___, L35 }, \
|
|
||||||
{ ___, R04, R03, R02, R01, R00 }, \
|
|
||||||
{ R15, R14, R13, R12, R11, R10 }, \
|
|
||||||
{ R25, R24, R23, R22, R21, R20 }, \
|
|
||||||
{ ___, R34, R33, R32, ___, R30 }, \
|
|
||||||
}
|
|
||||||
# define LAYOUT(...) LAYOUT_konrad(__VA_ARGS__)
|
|
||||||
#elif defined(KLOR_YUBITSUME)
|
|
||||||
# define LAYOUT_yubitsume( \
|
|
||||||
L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
|
|
||||||
L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
|
|
||||||
L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, \
|
|
||||||
L31, L32, L33, L34, R31, R32, R33, R34 \
|
|
||||||
) \
|
|
||||||
{ \
|
|
||||||
{ ___, L01, L02, L03, L04, L05 }, \
|
|
||||||
{ ___, L11, L12, L13, L14, L15 }, \
|
|
||||||
{ ___, L21, L22, L23, L24, L25 }, \
|
|
||||||
{ ___, L31, L32, L33, L34, L35 }, \
|
|
||||||
{ ___, R04, R03, R02, R01, R00 }, \
|
|
||||||
{ ___, R14, R13, R12, R11, R10 }, \
|
|
||||||
{ ___, R24, R23, R22, R21, R20 }, \
|
|
||||||
{ ___, R34, R33, R32, R31, R30 }, \
|
|
||||||
}
|
|
||||||
# define LAYOUT(...) LAYOUT_yubitsume(__VA_ARGS__)
|
|
||||||
#elif defined(KLOR_SAEGEWERK)
|
|
||||||
# define LAYOUT_saegewerk( \
|
|
||||||
L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, \
|
|
||||||
L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \
|
|
||||||
L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, \
|
|
||||||
L31, L32, L33, R32, R33, R34 \
|
|
||||||
) \
|
|
||||||
{ \
|
|
||||||
{ ___, L01, L02, L03, L04, L05 }, \
|
|
||||||
{ ___, L11, L12, L13, L14, L15 }, \
|
|
||||||
{ ___, L21, L22, L23, L24, L25 }, \
|
|
||||||
{ ___, L31, L32, L33, ___, L35 }, \
|
|
||||||
{ ___, R04, R03, R02, R01, R00 }, \
|
|
||||||
{ ___, R14, R13, R12, R11, R10 }, \
|
|
||||||
{ ___, R24, R23, R22, R21, R20 }, \
|
|
||||||
{ ___, R34, R33, R32, ___, R30 }, \
|
|
||||||
}
|
|
||||||
# define LAYOUT(...) LAYOUT_saegewerk(__VA_ARGS__)
|
|
||||||
#endif //KLOR_POLYDACTL
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
|
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
|
||||||
return OLED_ROTATION_180;
|
return OLED_ROTATION_180;
|
||||||
|
@ -246,7 +169,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] =
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# if defined (KLOR_POLYDACTL) || defined(KLOR_YUBITSUME)
|
# if defined (KLOR_POLYDACTYL) || 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 = { {
|
||||||
|
|
|
@ -32,11 +32,11 @@
|
||||||
|
|
||||||
|
|
||||||
#ifdef KLOR_POLYDACTYL
|
#ifdef KLOR_POLYDACTYL
|
||||||
# define LAYOUT_KLOR(...) LAYOUT_polydactyl(__VA_ARGS__)
|
# define KLOR(...) LAYOUT_polydactyl(__VA_ARGS__)
|
||||||
#elif defined(KLOR_KONRAD)
|
#elif defined(KLOR_KONRAD)
|
||||||
# define LAYOUT_KLOR(...) LAYOUT_konrad(__VA_ARGS__)
|
# define KLOR(...) LAYOUT_konrad(__VA_ARGS__)
|
||||||
#elif defined(KLOR_YUBITSUME)
|
#elif defined(KLOR_YUBITSUME)
|
||||||
# define LAYOUT_KLOR(...) LAYOUT_yubitsume(__VA_ARGS__)
|
# define KLOR(...) LAYOUT_yubitsume(__VA_ARGS__)
|
||||||
#elif defined(KLOR_SAEGEWERK)
|
#elif defined(KLOR_SAEGEWERK)
|
||||||
# define LAYOUT_KLOR(...) LAYOUT_saegewerk(__VA_ARGS__)
|
# define KLOR(...) LAYOUT_saegewerk(__VA_ARGS__)
|
||||||
#endif //KLOR_POLYDACTL
|
#endif //KLOR_POLYDACTL
|
||||||
|
|
|
@ -1,7 +1,15 @@
|
||||||
VALID_KLOR_LAYOUTS := polydactyl konrad yubitsume saegewerk
|
VALID_KLOR_LAYOUTS := polydactyl konrad yubitsume saegewerk
|
||||||
|
|
||||||
ifeq ($(filter $(KLOR_LAYOUT),$(VALID_KLOR_LAYOUTS)),)
|
ifeq ($(filter $(KLOR_LAYOUT),$(VALID_KLOR_LAYOUTS)),)
|
||||||
$(call CATASTROPHIC_ERROR,Invalid KLOR_LAYOUT,KLOR_LAYOUT="$(KLOR_LAYOUT)" is not a valid Haptic driver)
|
$(call CATASTROPHIC_ERROR,Invalid KLOR_LAYOUT,KLOR_LAYOUT="$(KLOR_LAYOUT)" is not a valid KLOR Layout)
|
||||||
else
|
else
|
||||||
OPT_DEFS += -DKLOR_$(strip $(shell echo $(KLOR_LAYOUT) | tr '[:lower:]' '[:upper:]'))
|
OPT_DEFS += -DKLOR_$(strip $(shell echo $(KLOR_LAYOUT) | tr '[:lower:]' '[:upper:]'))
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Turn off features for AVR Processors due to memory size
|
||||||
|
ifeq ($(strip $(PLATFORM)),AVR)
|
||||||
|
AUDIO_ENABLE = no
|
||||||
|
MUSIC_ENABLE = no
|
||||||
|
HAPTIC_ENABLE = no
|
||||||
|
RGB_MATRIX_ENABLE = no
|
||||||
endif
|
endif
|
|
@ -31,6 +31,7 @@ Features
|
||||||
|
|
||||||
- Can choose layout based on keymap rules.mk configuration. Before keyboard configuration would need to be changed
|
- 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`
|
- Converted as much as possible to data driven configuration: `info.json`
|
||||||
|
- the build will automatically turn off audio, haptics, and rgb matrix for AVR MCU. A user can configure all rules in the keymap rules.mk for RP2040 and not have to edit code just for AVR firmware
|
||||||
|
|
||||||
What I did not test
|
What I did not test
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue