diff options
| author | Drashna Jael're <drashna@live.com> | 2021-10-20 11:13:47 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-10-20 11:13:47 -0700 |
| commit | acec40a11a16cb7d8773a753bc166abdbb381ab4 (patch) | |
| tree | f68569baf32e509350aa838cba45ed34e9d3985a | |
| parent | 6fa37edf5ed7e4eb5347e5350ed15a0fd9600331 (diff) | |
| parent | 28d29f7df699e057c38a40df8f5452fc4a25d629 (diff) | |
Merge branch 'firmware20' into firmware21
| -rw-r--r-- | keyboards/ergodox_ez/ergodox_ez.c | 4 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_contributions.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c index 47537a71d7..c7fded7fbb 100644 --- a/keyboards/ergodox_ez/ergodox_ez.c +++ b/keyboards/ergodox_ez/ergodox_ez.c @@ -470,8 +470,8 @@ void matrix_scan_kb(void) { } else { uint8_t layer = get_highest_layer(layer_state); - if(layer != 1) { - ergodox_right_led_3_off(); + if(layer != 3) { + ergodox_right_led_3_off(); } } #endif diff --git a/quantum/keymap_extras/keymap_contributions.h b/quantum/keymap_extras/keymap_contributions.h index 2e505eb74d..7c5004bd55 100644 --- a/quantum/keymap_extras/keymap_contributions.h +++ b/quantum/keymap_extras/keymap_contributions.h @@ -367,6 +367,8 @@ #define ES_LA_38 S(KC_1) //! #define ES_LA_39 S(KC_GRAVE) //° #define ES_LA_40 KC_GRAVE //| +#define ES_LA_41 ALGR(KC_COMMA) //< for macOS +#define ES_LA_42 ALGR(KC_DOT) //> for macOS // Extra CMS codes #define CSA_MOMEG RCTL(RSFT(KC_Q)) //Ω |