diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-09-07 08:57:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-07 08:57:30 -0700 |
| commit | e88f80a891138d40acddcdd2b3dface8b2a57404 (patch) | |
| tree | 1fa1e8cd0bd15d10970ce55efceaffcddaf01160 /layouts | |
| parent | 79a6c6eda50671b28f32dfb73728fcc1671fe4fc (diff) | |
| download | qmk_firmware-e88f80a891138d40acddcdd2b3dface8b2a57404.tar.gz qmk_firmware-e88f80a891138d40acddcdd2b3dface8b2a57404.zip | |
[Keymap] Big Drashna code update (#6639)
* Add a quefrency keymap
* New Alt-ernate layouts
* Enable Per Key Tapping Term to preserve sanity
* Use underglow and mod lights for status on Corne
* Update the drashna_ms keymap for quefrency
* Disable Audio since there isn't enough space
* Update KC_MAKE to ues :flash target
* Cleanup ergodox layout
* Enable i2c support for Iris
* Add keymap support for CG_SWAP
* Enable RGB Matrix Shutdown mode
* enable heatmap
* Update gitlab CI to install python3
* Remove game macros
These are no longer needed, and haven't been used in ages
* Cleanup planck layout
* Add RGB Matrix fun and RGB cleanup
* Add keycode and config for RGB Matrix idle animations
* Clean up rgb idle animation code
* Add rgb idle keycode to keymaps
* Fix issues with rgb matrix idle animation
* Fix some handling for idle animation
* Reduce idle animation timeout to 15s to be more reasonable
* fix up rgb stuff
* Fix isses with rgb functions not being called for matrix
* Use custom EEPROM Magic Number so testing is easier
* Extend Default Layer macro to support a lot more layers
* Fix bjohnson macropad
* Adjust KC_MAKE to process mods for more consistent behavior
* Fix up rgb stuff on corne
* Corne OLED Overhaul
* Fixes a number of issues with weirdness.
* Fixes issues with keylogger (should be more reliable now)
* Modulaize the OLED render sections
* Rewrite layer display code
* Update URL for Font Editor
Due to odd issues, I ended up rewriting from scratch. And using PROGMEM versions, since I think I was getting memory overflows.
* Update polling rate on all keebs
* Fix planck ez layout config
* Remove macros from Viterbi
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/community/ergodox/drashna/config.h | 2 | ||||
| -rw-r--r-- | layouts/community/ergodox/drashna/keymap.c | 21 | ||||
| -rw-r--r-- | layouts/community/ergodox/drashna/rules.mk | 1 | ||||
| -rw-r--r-- | layouts/community/numpad_5x6/bjohnson/config.h | 2 | ||||
| -rw-r--r-- | layouts/community/numpad_5x6/bjohnson/keymap.c | 7 | ||||
| -rw-r--r-- | layouts/community/numpad_5x6/drashna/rules.mk | 1 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/drashna/config.h | 1 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/drashna/keymap.c | 42 | ||||
| -rw-r--r-- | layouts/community/ortho_4x12/drashna/rules.mk | 3 | ||||
| -rw-r--r-- | layouts/community/ortho_5x12/drashna/keymap.c | 7 | ||||
| -rw-r--r-- | layouts/community/ortho_5x12/drashna/rules.mk | 3 |
11 files changed, 57 insertions, 33 deletions
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h index 821710ed8..0ccf10c31 100644 --- a/layouts/community/ergodox/drashna/config.h +++ b/layouts/community/ergodox/drashna/config.h | |||
| @@ -14,3 +14,5 @@ | |||
| 14 | 14 | ||
| 15 | #undef DEBOUNCE | 15 | #undef DEBOUNCE |
| 16 | #define DEBOUNCE 15 | 16 | #define DEBOUNCE 15 |
| 17 | |||
| 18 | #define TAPPING_TERM_PER_KEY | ||
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c index 763b218f7..6ed4558e2 100644 --- a/layouts/community/ergodox/drashna/keymap.c +++ b/layouts/community/ergodox/drashna/keymap.c | |||
| @@ -23,8 +23,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 23 | #ifndef UNICODE_ENABLE | 23 | #ifndef UNICODE_ENABLE |
| 24 | # define UC(x) KC_NO | 24 | # define UC(x) KC_NO |
| 25 | #endif | 25 | #endif |
| 26 | 26 | #ifdef RGBLIGHT_ENABLE | |
| 27 | extern userspace_config_t userspace_config; | 27 | extern rgblight_config_t rgblight_config; |
| 28 | #endif | ||
| 28 | 29 | ||
| 29 | enum more_custom_keycodes { KC_SWAP_NUM = NEW_SAFE_RANGE }; | 30 | enum more_custom_keycodes { KC_SWAP_NUM = NEW_SAFE_RANGE }; |
| 30 | 31 | ||
| @@ -40,7 +41,7 @@ bool skip_leds = false; | |||
| 40 | LAYOUT_ergodox_pretty_wrapper( \ | 41 | LAYOUT_ergodox_pretty_wrapper( \ |
| 41 | KC_ESC, ________________NUMBER_LEFT________________, UC_FLIP, UC_TABL, ________________NUMBER_RIGHT_______________, KC_MINS, \ | 42 | KC_ESC, ________________NUMBER_LEFT________________, UC_FLIP, UC_TABL, ________________NUMBER_RIGHT_______________, KC_MINS, \ |
| 42 | KC_TAB, K01, K02, K03, K04, K05, TG(_DIABLO), TG(_DIABLO), K06, K07, K08, K09, K0A, KC_BSLS, \ | 43 | KC_TAB, K01, K02, K03, K04, K05, TG(_DIABLO), TG(_DIABLO), K06, K07, K08, K09, K0A, KC_BSLS, \ |
| 43 | KC_C1R3, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \ | 44 | KC_C1R3, ALT_T(K11), K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(KC_QUOT), \ |
| 44 | KC_MLSF, CTL_T(K21), K22, K23, K24, K25, TG(_GAMEPAD), TG(_GAMEPAD), K26, K27, K28, K29, RCTL_T(K2A), KC_MRSF, \ | 45 | KC_MLSF, CTL_T(K21), K22, K23, K24, K25, TG(_GAMEPAD), TG(_GAMEPAD), K26, K27, K28, K29, RCTL_T(K2A), KC_MRSF, \ |
| 45 | KC_GRV, OS_MEH, OS_HYPR, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, UC(0x2E2E), \ | 46 | KC_GRV, OS_MEH, OS_HYPR, KC_LBRC, KC_RBRC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, UC(0x2E2E), \ |
| 46 | OS_LALT, OS_LGUI, OS_RGUI, CTL_T(KC_ESCAPE), \ | 47 | OS_LALT, OS_LGUI, OS_RGUI, CTL_T(KC_ESCAPE), \ |
| @@ -291,8 +292,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 291 | [_ADJUST] = LAYOUT_ergodox_pretty_wrapper( | 292 | [_ADJUST] = LAYOUT_ergodox_pretty_wrapper( |
| 292 | KC_MAKE, _______, _______, _______, _______, _______, _______, KC_NUKE, _________________ADJUST_R1_________________, KC_RST, | 293 | KC_MAKE, _______, _______, _______, _______, _______, _______, KC_NUKE, _________________ADJUST_R1_________________, KC_RST, |
| 293 | VRSN, _________________ADJUST_L1_________________, _______, _______, _______, _______, _______, _______, _______, EEP_RST, | 294 | VRSN, _________________ADJUST_L1_________________, _______, _______, _______, _______, _______, _______, _______, EEP_RST, |
| 294 | _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, TG(_MODS), | 295 | _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL, |
| 295 | _______, _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, KC_MPLY, | 296 | _______, _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, TG(_MODS), |
| 296 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 297 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 297 | _______, _______, _______, _______, | 298 | _______, _______, _______, _______, |
| 298 | _______, _______, | 299 | _______, _______, |
| @@ -464,3 +465,13 @@ void rgb_matrix_indicators_user(void) { | |||
| 464 | } | 465 | } |
| 465 | 466 | ||
| 466 | #endif // RGB_MATRIX_INIT | 467 | #endif // RGB_MATRIX_INIT |
| 468 | |||
| 469 | |||
| 470 | uint16_t get_tapping_term(uint16_t keycode) { | ||
| 471 | if (keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) { | ||
| 472 | if (mod_config(keycode & 0xf) & MOD_MASK_ALT) { | ||
| 473 | return (2 * TAPPING_TERM); | ||
| 474 | } | ||
| 475 | } | ||
| 476 | return TAPPING_TERM; | ||
| 477 | } | ||
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk index f3cd55ea8..f14353f4c 100644 --- a/layouts/community/ergodox/drashna/rules.mk +++ b/layouts/community/ergodox/drashna/rules.mk | |||
| @@ -12,7 +12,6 @@ BOOTMAGIC_ENABLE = yes | |||
| 12 | UNICODE_ENABLE = yes | 12 | UNICODE_ENABLE = yes |
| 13 | UNICDOEMAP_ENABLE = no | 13 | UNICDOEMAP_ENABLE = no |
| 14 | 14 | ||
| 15 | MACROS_ENABLED = no | ||
| 16 | RGBLIGHT_TWINKLE = no | 15 | RGBLIGHT_TWINKLE = no |
| 17 | INDICATOR_LIGHTS = no | 16 | INDICATOR_LIGHTS = no |
| 18 | RGBLIGHT_STARTUP_ANIMATION = yes | 17 | RGBLIGHT_STARTUP_ANIMATION = yes |
diff --git a/layouts/community/numpad_5x6/bjohnson/config.h b/layouts/community/numpad_5x6/bjohnson/config.h index fe2cffec7..668450d88 100644 --- a/layouts/community/numpad_5x6/bjohnson/config.h +++ b/layouts/community/numpad_5x6/bjohnson/config.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM) | 5 | #if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM) |
| 6 | #define RGB_DI_PIN B7 | 6 | #define RGB_DI_PIN B7 |
| 7 | #define RGBLED_NUM 16 // Number of LEDs | 7 | #define RGBLED_NUM 13 // Number of LEDs |
| 8 | #define RGBLIGHT_ANIMATIONS | 8 | #define RGBLIGHT_ANIMATIONS |
| 9 | 9 | ||
| 10 | #define RGBLIGHT_HUE_STEP 12 | 10 | #define RGBLIGHT_HUE_STEP 12 |
diff --git a/layouts/community/numpad_5x6/bjohnson/keymap.c b/layouts/community/numpad_5x6/bjohnson/keymap.c index 79e87e69f..4b15ccdfb 100644 --- a/layouts/community/numpad_5x6/bjohnson/keymap.c +++ b/layouts/community/numpad_5x6/bjohnson/keymap.c | |||
| @@ -25,9 +25,10 @@ void keyboard_post_init_user(void) { | |||
| 25 | uint8_t temp_mode = rgblight_config.mode; | 25 | uint8_t temp_mode = rgblight_config.mode; |
| 26 | rgblight_enable_noeeprom(); | 26 | rgblight_enable_noeeprom(); |
| 27 | rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); | 27 | rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); |
| 28 | for (uint16_t i = 360; i > 0; i--) { | 28 | for (uint16_t i = 255; i > 0; i--) { |
| 29 | rgblight_sethsv_noeeprom( ( i + 180) % 360, 255, 255); | 29 | rgblight_sethsv_noeeprom( ( i + 128) % 255, 255, 255); |
| 30 | wait_ms(8); | 30 | matrix_scan(); |
| 31 | wait_ms(10); | ||
| 31 | } | 32 | } |
| 32 | led_set_user(host_keyboard_leds()); | 33 | led_set_user(host_keyboard_leds()); |
| 33 | rgblight_mode_noeeprom(temp_mode); | 34 | rgblight_mode_noeeprom(temp_mode); |
diff --git a/layouts/community/numpad_5x6/drashna/rules.mk b/layouts/community/numpad_5x6/drashna/rules.mk index 62bbc365d..0bdf97bae 100644 --- a/layouts/community/numpad_5x6/drashna/rules.mk +++ b/layouts/community/numpad_5x6/drashna/rules.mk | |||
| @@ -5,6 +5,5 @@ NO_SECRETS = yes | |||
| 5 | BOOTMAGIC_ENABLE = lite | 5 | BOOTMAGIC_ENABLE = lite |
| 6 | INDICATOR_LIGHTS = no | 6 | INDICATOR_LIGHTS = no |
| 7 | RGBLIGHT_TWINKLE = yes | 7 | RGBLIGHT_TWINKLE = yes |
| 8 | MACROS_ENABLED = no | ||
| 9 | MAKE_BOOTLOADER = yes | 8 | MAKE_BOOTLOADER = yes |
| 10 | RGBLIGHT_STARTUP_ANIMATION = yes | 9 | RGBLIGHT_STARTUP_ANIMATION = yes |
diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h index 30db12965..9f3d2b82d 100644 --- a/layouts/community/ortho_4x12/drashna/config.h +++ b/layouts/community/ortho_4x12/drashna/config.h | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #ifdef RGB_MATRIX_ENABLE | 17 | #ifdef RGB_MATRIX_ENABLE |
| 18 | # define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot) | 18 | # define RGB_MATRIX_KEYPRESSES // reacts to keypresses (will slow down matrix scan by a lot) |
| 19 | // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened) | 19 | // #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened) |
| 20 | # define RGB_MATRIX_FRAMEBUFFER_EFFECTS | ||
| 20 | // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | 21 | // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects |
| 21 | // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 | 22 | // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 |
| 22 | # define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | 23 | # define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended |
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c index 3e26b93fc..26f611c08 100644 --- a/layouts/community/ortho_4x12/drashna/keymap.c +++ b/layouts/community/ortho_4x12/drashna/keymap.c | |||
| @@ -27,6 +27,9 @@ enum planck_keycodes { | |||
| 27 | }; | 27 | }; |
| 28 | #else | 28 | #else |
| 29 | # define BACKLIT OSM(MOD_LSFT) | 29 | # define BACKLIT OSM(MOD_LSFT) |
| 30 | enum planck_keycodes { | ||
| 31 | TH_LVL = NEW_SAFE_RANGE, | ||
| 32 | }; | ||
| 30 | #endif | 33 | #endif |
| 31 | 34 | ||
| 32 | #ifdef KEYBOARD_planck_ez | 35 | #ifdef KEYBOARD_planck_ez |
| @@ -48,8 +51,8 @@ enum planck_keycodes { | |||
| 48 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ | 51 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A \ |
| 49 | ) \ | 52 | ) \ |
| 50 | LAYOUT_ortho_4x12_wrapper( \ | 53 | LAYOUT_ortho_4x12_wrapper( \ |
| 51 | KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC, \ | 54 | KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_DEL, \ |
| 52 | KC_TAB, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_QUOT, \ | 55 | KC_TAB, ALT_T(K11), K12, K13, K14, K15, K16, K17, K18, K19, K1A, RALT_T(KC_QUOT), \ |
| 53 | KC_MLSF, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), KC_ENT, \ | 56 | KC_MLSF, CTL_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, RCTL_T(K2A), KC_ENT, \ |
| 54 | BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1, PLNK_2, PLNK_3, PLNK_4, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | 57 | BACKLIT, OS_LCTL, OS_LALT, OS_LGUI, PLNK_1, PLNK_2, PLNK_3, PLNK_4, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
| 55 | ) | 58 | ) |
| @@ -117,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 117 | KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC, | 120 | KC_TILD, _________________LOWER_L1__________________, _________________LOWER_R1__________________, KC_BSPC, |
| 118 | KC_DEL, _________________LOWER_L2__________________, _________________LOWER_R2__________________, KC_PIPE, | 121 | KC_DEL, _________________LOWER_L2__________________, _________________LOWER_R2__________________, KC_PIPE, |
| 119 | _______, _________________LOWER_L3__________________, _________________LOWER_R3__________________, _______, | 122 | _______, _________________LOWER_L3__________________, _________________LOWER_R3__________________, _______, |
| 120 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY | 123 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 121 | ), | 124 | ), |
| 122 | 125 | ||
| 123 | [_RAISE] = LAYOUT_ortho_4x12_wrapper( | 126 | [_RAISE] = LAYOUT_ortho_4x12_wrapper( |
| @@ -130,8 +133,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 130 | [_ADJUST] = LAYOUT_ortho_4x12_wrapper( | 133 | [_ADJUST] = LAYOUT_ortho_4x12_wrapper( |
| 131 | KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST, | 134 | KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST, |
| 132 | VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST, | 135 | VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST, |
| 133 | _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS, | 136 | TH_LVL, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL, |
| 134 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NUKE | 137 | _______, _______, _______, _______, _______, KC_NUKE, _______, _______, _______, _______, _______, TG_MODS |
| 135 | ) | 138 | ) |
| 136 | 139 | ||
| 137 | }; | 140 | }; |
| @@ -149,7 +152,20 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { | |||
| 149 | } else { | 152 | } else { |
| 150 | unregister_code(KC_RSFT); | 153 | unregister_code(KC_RSFT); |
| 151 | } | 154 | } |
| 152 | return false; | 155 | break; |
| 156 | #endif | ||
| 157 | #ifdef KEYBOARD_planck_ez | ||
| 158 | case TH_LVL: | ||
| 159 | if (record->event.pressed) { | ||
| 160 | keyboard_config.led_level++; | ||
| 161 | if (keyboard_config.led_level > 4) { | ||
| 162 | keyboard_config.led_level = 0; | ||
| 163 | } | ||
| 164 | planck_ez_right_led_level((uint8_t)keyboard_config.led_level * 255 / 4 ); | ||
| 165 | planck_ez_left_led_level((uint8_t)keyboard_config.led_level * 255 / 4 ); | ||
| 166 | eeconfig_update_kb(keyboard_config.raw); | ||
| 167 | layer_state_set_kb(layer_state); | ||
| 168 | } | ||
| 153 | break; | 169 | break; |
| 154 | #endif | 170 | #endif |
| 155 | } | 171 | } |
| @@ -265,7 +281,7 @@ void rgb_matrix_indicators_user(void) { | |||
| 265 | break; | 281 | break; |
| 266 | } | 282 | } |
| 267 | if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) { | 283 | if ((this_mod | this_osm) & MOD_MASK_SHIFT || this_led & (1 << USB_LED_CAPS_LOCK)) { |
| 268 | rgb_matrix_set_color(24, 0x00, 0xFF, 0x00); | 284 | if (!layer_state_cmp(layer_state, _ADJUST)) { rgb_matrix_set_color(24, 0x00, 0xFF, 0x00); } |
| 269 | rgb_matrix_set_color(36, 0x00, 0xFF, 0x00); | 285 | rgb_matrix_set_color(36, 0x00, 0xFF, 0x00); |
| 270 | } | 286 | } |
| 271 | if ((this_mod | this_osm) & MOD_MASK_CTRL) { | 287 | if ((this_mod | this_osm) & MOD_MASK_CTRL) { |
| @@ -353,18 +369,18 @@ void dip_update(uint8_t index, bool active) { | |||
| 353 | 369 | ||
| 354 | #ifdef KEYBOARD_planck_ez | 370 | #ifdef KEYBOARD_planck_ez |
| 355 | layer_state_t layer_state_set_keymap(layer_state_t state) { | 371 | layer_state_t layer_state_set_keymap(layer_state_t state) { |
| 356 | palClearPad(GPIOB, 8); | 372 | planck_ez_left_led_off(); |
| 357 | palClearPad(GPIOB, 9); | 373 | planck_ez_right_led_off(); |
| 358 | switch (biton32(state)) { | 374 | switch (biton32(state)) { |
| 359 | case _LOWER: | 375 | case _LOWER: |
| 360 | palSetPad(GPIOB, 9); | 376 | planck_ez_left_led_on(); |
| 361 | break; | 377 | break; |
| 362 | case _RAISE: | 378 | case _RAISE: |
| 363 | palSetPad(GPIOB, 8); | 379 | planck_ez_right_led_on(); |
| 364 | break; | 380 | break; |
| 365 | case _ADJUST: | 381 | case _ADJUST: |
| 366 | palSetPad(GPIOB, 9); | 382 | planck_ez_right_led_on(); |
| 367 | palSetPad(GPIOB, 8); | 383 | planck_ez_left_led_on(); |
| 368 | break; | 384 | break; |
| 369 | default: | 385 | default: |
| 370 | break; | 386 | break; |
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk index 21ce7ebb1..55f3acd70 100644 --- a/layouts/community/ortho_4x12/drashna/rules.mk +++ b/layouts/community/ortho_4x12/drashna/rules.mk | |||
| @@ -33,6 +33,3 @@ NKRO_ENABLE = no | |||
| 33 | else | 33 | else |
| 34 | NKRO_ENABLE = yes | 34 | NKRO_ENABLE = yes |
| 35 | endif | 35 | endif |
| 36 | |||
| 37 | |||
| 38 | MACROS_ENABLED = no | ||
diff --git a/layouts/community/ortho_5x12/drashna/keymap.c b/layouts/community/ortho_5x12/drashna/keymap.c index 26be99af5..86a78336c 100644 --- a/layouts/community/ortho_5x12/drashna/keymap.c +++ b/layouts/community/ortho_5x12/drashna/keymap.c | |||
| @@ -29,10 +29,11 @@ | |||
| 29 | LAYOUT_ortho_5x12_wrapper( \ | 29 | LAYOUT_ortho_5x12_wrapper( \ |
| 30 | KC_GRV, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC, \ | 30 | KC_GRV, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC, \ |
| 31 | KC_TAB, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_BSPC, \ | 31 | KC_TAB, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, KC_BSPC, \ |
| 32 | KC_ESC, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_QUOT, \ | 32 | KC_ESC, ALT_T(K21), K22, K23, K24, K25, K26, K27, K28, K29, K2A, RALT_T(KC_QUOT), \ |
| 33 | KC_MLSF, CTL_T(K31), K32, K33, K34, K35, K36, K37, K38, K39, CTL_T(K3A), KC_ENT, \ | 33 | KC_MLSF, CTL_T(K31), K32, K33, K34, K35, K36, K37, K38, K39, RCTL_T(K3A), KC_ENT, \ |
| 34 | KC_NO, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | 34 | KC_NO, OS_LCTL, OS_LALT, OS_LGUI, SP_LWER, BK_LWER, DL_RAIS, ET_RAIS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
| 35 | ) | 35 | ) |
| 36 | |||
| 36 | #define LAYOUT_ortho_5x12_base_wrapper(...) LAYOUT_ortho_5x12_base(__VA_ARGS__) | 37 | #define LAYOUT_ortho_5x12_base_wrapper(...) LAYOUT_ortho_5x12_base(__VA_ARGS__) |
| 37 | 38 | ||
| 38 | 39 | ||
| @@ -132,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 132 | [_ADJUST] = LAYOUT_ortho_5x12_wrapper( \ | 133 | [_ADJUST] = LAYOUT_ortho_5x12_wrapper( \ |
| 133 | KC_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RST, | 134 | KC_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RST, |
| 134 | VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EEP_RST, | 135 | VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EEP_RST, |
| 135 | _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, _______, | 136 | _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL, |
| 136 | _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS, | 137 | _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS, |
| 137 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 138 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 138 | ) | 139 | ) |
diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk index ee7c2ad63..0606f3e52 100644 --- a/layouts/community/ortho_5x12/drashna/rules.mk +++ b/layouts/community/ortho_5x12/drashna/rules.mk | |||
| @@ -18,6 +18,3 @@ NKRO_ENABLE = no | |||
| 18 | else | 18 | else |
| 19 | NKRO_ENABLE = yes | 19 | NKRO_ENABLE = yes |
| 20 | endif | 20 | endif |
| 21 | |||
| 22 | |||
| 23 | MACROS_ENABLED = no | ||
