diff options
| author | QMK Bot <hello@qmk.fm> | 2021-10-14 13:42:04 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-10-14 13:42:04 +0000 |
| commit | 793f4499bfdbcc86cb9e02609ddf469c0294b0af (patch) | |
| tree | fa9aea7648653f3269ac31a59f71b5ddd7337215 | |
| parent | 49e0d2ea03bda1c05f24f0c7558b589db8ade20a (diff) | |
| parent | f9f3a11c2076f6fc378beb8ccbc8500fb060fcf3 (diff) | |
| download | qmk_firmware-793f4499bfdbcc86cb9e02609ddf469c0294b0af.tar.gz qmk_firmware-793f4499bfdbcc86cb9e02609ddf469c0294b0af.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/contra/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/fractal/keymaps/default/keymap.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/keyboards/contra/keymaps/default/keymap.c b/keyboards/contra/keymaps/default/keymap.c index 31e90ed26..6a653d9ce 100644 --- a/keyboards/contra/keymaps/default/keymap.c +++ b/keyboards/contra/keymaps/default/keymap.c | |||
| @@ -222,10 +222,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 222 | #ifdef BACKLIGHT_ENABLE | 222 | #ifdef BACKLIGHT_ENABLE |
| 223 | backlight_step(); | 223 | backlight_step(); |
| 224 | #endif | 224 | #endif |
| 225 | PORTE &= ~(1<<6); | ||
| 226 | } else { | 225 | } else { |
| 227 | unregister_code(KC_RSFT); | 226 | unregister_code(KC_RSFT); |
| 228 | PORTE |= (1<<6); | ||
| 229 | } | 227 | } |
| 230 | return false; | 228 | return false; |
| 231 | break; | 229 | break; |
diff --git a/keyboards/fractal/keymaps/default/keymap.c b/keyboards/fractal/keymaps/default/keymap.c index 8bb1f9831..553dad034 100644 --- a/keyboards/fractal/keymaps/default/keymap.c +++ b/keyboards/fractal/keymaps/default/keymap.c | |||
| @@ -213,10 +213,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 213 | #ifdef BACKLIGHT_ENABLE | 213 | #ifdef BACKLIGHT_ENABLE |
| 214 | backlight_step(); | 214 | backlight_step(); |
| 215 | #endif | 215 | #endif |
| 216 | PORTE &= ~(1<<6); | ||
| 217 | } else { | 216 | } else { |
| 218 | unregister_code(KC_RSFT); | 217 | unregister_code(KC_RSFT); |
| 219 | PORTE |= (1<<6); | ||
| 220 | } | 218 | } |
| 221 | return false; | 219 | return false; |
| 222 | break; | 220 | break; |