diff options
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/default/keymap.c | 58 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/default_osx/keymap.c | 52 |
2 files changed, 55 insertions, 55 deletions
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c index cbc180d6a..4f0136880 100644 --- a/keyboards/ergodox_ez/keymaps/default/keymap.c +++ b/keyboards/ergodox_ez/keymaps/default/keymap.c | |||
| @@ -150,19 +150,19 @@ const uint16_t PROGMEM fn_actions[] = { | |||
| 150 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 150 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 151 | { | 151 | { |
| 152 | // MACRODOWN only works in this function | 152 | // MACRODOWN only works in this function |
| 153 | switch(id) { | 153 | switch(id) { |
| 154 | case 0: | 154 | case 0: |
| 155 | if (record->event.pressed) { | 155 | if (record->event.pressed) { |
| 156 | SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); | 156 | SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); |
| 157 | } | 157 | } |
| 158 | break; | 158 | break; |
| 159 | case 1: | 159 | case 1: |
| 160 | if (record->event.pressed) { // For resetting EEPROM | 160 | if (record->event.pressed) { // For resetting EEPROM |
| 161 | eeconfig_init(); | 161 | eeconfig_init(); |
| 162 | } | ||
| 163 | break; | ||
| 164 | } | 162 | } |
| 165 | return MACRO_NONE; | 163 | break; |
| 164 | } | ||
| 165 | return MACRO_NONE; | ||
| 166 | }; | 166 | }; |
| 167 | 167 | ||
| 168 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 168 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| @@ -201,23 +201,23 @@ void matrix_init_user(void) { | |||
| 201 | // Runs constantly in the background, in a loop. | 201 | // Runs constantly in the background, in a loop. |
| 202 | void matrix_scan_user(void) { | 202 | void matrix_scan_user(void) { |
| 203 | 203 | ||
| 204 | uint8_t layer = biton32(layer_state); | 204 | uint8_t layer = biton32(layer_state); |
| 205 | 205 | ||
| 206 | ergodox_board_led_off(); | 206 | ergodox_board_led_off(); |
| 207 | ergodox_right_led_1_off(); | 207 | ergodox_right_led_1_off(); |
| 208 | ergodox_right_led_2_off(); | 208 | ergodox_right_led_2_off(); |
| 209 | ergodox_right_led_3_off(); | 209 | ergodox_right_led_3_off(); |
| 210 | switch (layer) { | 210 | switch (layer) { |
| 211 | // TODO: Make this relevant to the ErgoDox EZ. | 211 | // TODO: Make this relevant to the ErgoDox EZ. |
| 212 | case 1: | 212 | case SYMB: |
| 213 | ergodox_right_led_1_on(); | 213 | ergodox_right_led_1_on(); |
| 214 | break; | 214 | break; |
| 215 | case 2: | 215 | case MDIA: |
| 216 | ergodox_right_led_2_on(); | 216 | ergodox_right_led_2_on(); |
| 217 | break; | 217 | break; |
| 218 | default: | 218 | default: |
| 219 | // none | 219 | // none |
| 220 | break; | 220 | break; |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | }; | 223 | }; |
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c index 947c8a007..038940772 100644 --- a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c +++ b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c | |||
| @@ -145,16 +145,16 @@ const uint16_t PROGMEM fn_actions[] = { | |||
| 145 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 145 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) |
| 146 | { | 146 | { |
| 147 | // MACRODOWN only works in this function | 147 | // MACRODOWN only works in this function |
| 148 | switch(id) { | 148 | switch(id) { |
| 149 | case 0: | 149 | case 0: |
| 150 | if (record->event.pressed) { | 150 | if (record->event.pressed) { |
| 151 | register_code(KC_RSFT); | 151 | register_code(KC_RSFT); |
| 152 | } else { | 152 | } else { |
| 153 | unregister_code(KC_RSFT); | 153 | unregister_code(KC_RSFT); |
| 154 | } | ||
| 155 | break; | ||
| 156 | } | 154 | } |
| 157 | return MACRO_NONE; | 155 | break; |
| 156 | } | ||
| 157 | return MACRO_NONE; | ||
| 158 | }; | 158 | }; |
| 159 | 159 | ||
| 160 | // Runs just one time when the keyboard initializes. | 160 | // Runs just one time when the keyboard initializes. |
| @@ -165,23 +165,23 @@ void matrix_init_user(void) { | |||
| 165 | // Runs constantly in the background, in a loop. | 165 | // Runs constantly in the background, in a loop. |
| 166 | void matrix_scan_user(void) { | 166 | void matrix_scan_user(void) { |
| 167 | 167 | ||
| 168 | uint8_t layer = biton32(layer_state); | 168 | uint8_t layer = biton32(layer_state); |
| 169 | 169 | ||
| 170 | ergodox_board_led_off(); | 170 | ergodox_board_led_off(); |
| 171 | ergodox_right_led_1_off(); | 171 | ergodox_right_led_1_off(); |
| 172 | ergodox_right_led_2_off(); | 172 | ergodox_right_led_2_off(); |
| 173 | ergodox_right_led_3_off(); | 173 | ergodox_right_led_3_off(); |
| 174 | switch (layer) { | 174 | switch (layer) { |
| 175 | // TODO: Make this relevant to the ErgoDox EZ. | 175 | // TODO: Make this relevant to the ErgoDox EZ. |
| 176 | case 1: | 176 | case SYMB: |
| 177 | ergodox_right_led_1_on(); | 177 | ergodox_right_led_1_on(); |
| 178 | break; | 178 | break; |
| 179 | case 2: | 179 | case MDIA: |
| 180 | ergodox_right_led_2_on(); | 180 | ergodox_right_led_2_on(); |
| 181 | break; | 181 | break; |
| 182 | default: | 182 | default: |
| 183 | // none | 183 | // none |
| 184 | break; | 184 | break; |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | }; | 187 | }; |
