diff options
| author | QMK Bot <hello@qmk.fm> | 2023-01-20 19:43:58 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-01-20 19:43:58 +0000 |
| commit | 713003b7fdf2e313b60ece775477e8791e948e20 (patch) | |
| tree | 05dfe5206eb4bff1bcac340a27c6902fb0120116 | |
| parent | cf935d97ae479e7a1e1f2f2f248b93e52e4cc69e (diff) | |
| parent | 300a0def4e20507f20b61507ed3dc3c65f3bf6a0 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/era/era65/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/era/era65/keymaps/via/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/era/era65/rules.mk | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/keyboards/era/era65/keymaps/default/keymap.c b/keyboards/era/era65/keymaps/default/keymap.c index b412fe3d08..06e4d2be28 100644 --- a/keyboards/era/era65/keymaps/default/keymap.c +++ b/keyboards/era/era65/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_combo( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/era/era65/keymaps/via/keymap.c b/keyboards/era/era65/keymaps/via/keymap.c index f87b1b9114..ab312135b0 100644 --- a/keyboards/era/era65/keymaps/via/keymap.c +++ b/keyboards/era/era65/keymaps/via/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [1] = LAYOUT_65_combo( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/era/era65/rules.mk b/keyboards/era/era65/rules.mk index 12a6f414c4..2b03e47e93 100644 --- a/keyboards/era/era65/rules.mk +++ b/keyboards/era/era65/rules.mk @@ -1,2 +1 @@ -BACKLIGHT_DRIVER = pwm -DEBOUNCE_TYPE = asym_eager_defer_pk \ No newline at end of file +BACKLIGHT_DRIVER = pwm \ No newline at end of file |