Home Explore Help
Sign In
logic855
/
qmk_firmware
mirror of https://github.com/qmk/qmk_firmware.git
1
0
Fork 1
Files Issues 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master' into develop

QMK Bot 3 years ago
parent
cf935d97ae 300a0def4e
commit
713003b7fd
3 changed files with 3 additions and 4 deletions
Split View Show Diff Stats
  1. 1 1
      keyboards/era/era65/keymaps/default/keymap.c
  2. 1 1
      keyboards/era/era65/keymaps/via/keymap.c
  3. 1 2
      keyboards/era/era65/rules.mk

+ 1 - 1
keyboards/era/era65/keymaps/default/keymap.c
View File 

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

+ 1 - 1
keyboards/era/era65/keymaps/via/keymap.c
View File 

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

+ 1 - 2
keyboards/era/era65/rules.mk
View File 

@@ -1,2 +1 @@
 
-BACKLIGHT_DRIVER = pwm
 
-DEBOUNCE_TYPE = asym_eager_defer_pk
 
+BACKLIGHT_DRIVER = pwm