diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-12-29 20:17:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-29 20:17:34 -0800 |
| commit | c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf (patch) | |
| tree | 67dc381a45d59626132c4c59b71c4b36fa971f8b /layouts/community/ergodox | |
| parent | 1a8a842cfb3e87a82afb57ba29ca59c5fa6fe97b (diff) | |
| download | qmk_firmware-c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf.tar.gz qmk_firmware-c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf.zip | |
[Keymap] Reorganization, cleanup and readmes for drashna code (#15617)
Diffstat (limited to 'layouts/community/ergodox')
| -rw-r--r-- | layouts/community/ergodox/drashna/config.h | 7 | ||||
| -rw-r--r-- | layouts/community/ergodox/drashna/keymap.c | 40 |
2 files changed, 6 insertions, 41 deletions
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h index f9daf277f..d669f2729 100644 --- a/layouts/community/ergodox/drashna/config.h +++ b/layouts/community/ergodox/drashna/config.h | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | # endif | 45 | # endif |
| 46 | #endif | 46 | #endif |
| 47 | 47 | ||
| 48 | #define PIMORONI_TRACKBALL_INVERT_X | 48 | #ifdef TAPPING_TERM |
| 49 | #define PIMORONI_TRACKBALL_INVERT_Y | 49 | # undef TAPPING_TERM |
| 50 | #define PIMORONI_TRACKBALL_CLICK | 50 | #endif |
| 51 | #define TAPPING_TERM 185 | ||
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c index 3c9bcfeaa..798680628 100644 --- a/layouts/community/ergodox/drashna/keymap.c +++ b/layouts/community/ergodox/drashna/keymap.c | |||
| @@ -317,7 +317,7 @@ void suspend_power_down_keymap(void) { rgb_matrix_set_suspend_state(true); } | |||
| 317 | 317 | ||
| 318 | void suspend_wakeup_init_keymap(void) { rgb_matrix_set_suspend_state(false); } | 318 | void suspend_wakeup_init_keymap(void) { rgb_matrix_set_suspend_state(false); } |
| 319 | 319 | ||
| 320 | void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { | 320 | bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) { |
| 321 | if (layer_state_is(_GAMEPAD)) { | 321 | if (layer_state_is(_GAMEPAD)) { |
| 322 | RGB_MATRIX_INDICATOR_SET_COLOR(32, 0x00, 0xFF, 0x00); // Q | 322 | RGB_MATRIX_INDICATOR_SET_COLOR(32, 0x00, 0xFF, 0x00); // Q |
| 323 | RGB_MATRIX_INDICATOR_SET_COLOR(31, 0x00, 0xFF, 0xFF); // W | 323 | RGB_MATRIX_INDICATOR_SET_COLOR(31, 0x00, 0xFF, 0xFF); // W |
| @@ -332,43 +332,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { | |||
| 332 | RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 27 : 26), 0x00, 0xFF, 0x00); // 2 | 332 | RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 27 : 26), 0x00, 0xFF, 0x00); // 2 |
| 333 | RGB_MATRIX_INDICATOR_SET_COLOR(25, 0x7A, 0x00, 0xFF); // 3 | 333 | RGB_MATRIX_INDICATOR_SET_COLOR(25, 0x7A, 0x00, 0xFF); // 3 |
| 334 | } | 334 | } |
| 335 | 335 | return true; | |
| 336 | # if defined(RGBLIGHT_ENABLE) | ||
| 337 | if (!userspace_config.rgb_layer_change) | ||
| 338 | # else | ||
| 339 | if (userspace_config.rgb_layer_change) | ||
| 340 | # endif | ||
| 341 | { | ||
| 342 | switch (get_highest_layer(layer_state | default_layer_state)) { | ||
| 343 | case _GAMEPAD: | ||
| 344 | rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 345 | break; | ||
| 346 | case _DIABLO: | ||
| 347 | rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 348 | break; | ||
| 349 | case _RAISE: | ||
| 350 | rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 351 | break; | ||
| 352 | case _LOWER: | ||
| 353 | rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 354 | break; | ||
| 355 | case _ADJUST: | ||
| 356 | rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 357 | break; | ||
| 358 | case _DEFAULT_LAYER_1: | ||
| 359 | rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 360 | break; | ||
| 361 | case _DEFAULT_LAYER_2: | ||
| 362 | rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 363 | break; | ||
| 364 | case _DEFAULT_LAYER_3: | ||
| 365 | rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 366 | break; | ||
| 367 | case _DEFAULT_LAYER_4: | ||
| 368 | rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max); | ||
| 369 | break; | ||
| 370 | } | ||
| 371 | } | ||
| 372 | } | 336 | } |
| 373 | 337 | ||
| 374 | #endif // RGB_MATRIX_INIT | 338 | #endif // RGB_MATRIX_INIT |
