Merge branch 'firmware20' into firmware21

This commit is contained in:
Drashna Jael're
2021-10-20 11:13:47 -07:00
2 changed files with 4 additions and 2 deletions

View File

@@ -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

View File

@@ -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)) //Ω