jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'firmware20' into firmware21

Browse Source
This commit is contained in:
Drashna Jael're
2021-10-20 11:13:47 -07:00
parent 6fa37edf5e 28d29f7df6
commit acec40a11a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/ergodox_ez/ergodox_ez.c
View File

@@ -470,8 +470,8 @@ void matrix_scan_kb(void) {
} }
else { else {
uint8_t layer = get_highest_layer(layer_state); uint8_t layer = get_highest_layer(layer_state);
if(layer != 1) { if(layer != 3) {
ergodox_right_led_3_off(); ergodox_right_led_3_off();
} }
} }
#endif #endif

2
quantum/keymap_extras/keymap_contributions.h
View File

@@ -367,6 +367,8 @@
#define ES_LA_38 S(KC_1) //! #define ES_LA_38 S(KC_1) //!
#define ES_LA_39 S(KC_GRAVE) //° #define ES_LA_39 S(KC_GRAVE) //°
#define ES_LA_40 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 // Extra CMS codes
#define CSA_MOMEG RCTL(RSFT(KC_Q)) //Ω #define CSA_MOMEG RCTL(RSFT(KC_Q)) //Ω