diff options
| author | InigoGutierrez <inigogf.95@gmail.com> | 2022-06-27 16:38:28 +0200 |
|---|---|---|
| committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-06-27 16:38:28 +0200 |
| commit | 98b9909429aea0869f7a6f2f44ab386a4a3ff094 (patch) | |
| tree | e1080a61bb89a75edc70818489f8044adf597c48 /keyboards/x16 | |
| parent | b610965fd6d851484025166fb255078b1c809261 (diff) | |
| parent | fa3dd373b4925734d9843ae6014349069ffec353 (diff) | |
| download | qmk_firmware-98b9909429aea0869f7a6f2f44ab386a4a3ff094.tar.gz qmk_firmware-98b9909429aea0869f7a6f2f44ab386a4a3ff094.zip | |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/x16')
| -rw-r--r-- | keyboards/x16/config.h | 2 | ||||
| -rw-r--r-- | keyboards/x16/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/x16/rules.mk | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h index 7dda59b948..8378880d08 100644 --- a/keyboards/x16/config.h +++ b/keyboards/x16/config.h @@ -133,8 +133,6 @@ //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION /* Bootmagic Lite key configuration */ // #define BOOTMAGIC_LITE_ROW 0 diff --git a/keyboards/x16/keymaps/default/keymap.c b/keyboards/x16/keymaps/default/keymap.c index fea518ad31..3f9186c8f2 100644 --- a/keyboards/x16/keymaps/default/keymap.c +++ b/keyboards/x16/keymaps/default/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { MO(1), KC_P0, KC_DOT, KC_ENT ), [1] = LAYOUT_ortho_4x4( - RESET, KC_TRNS, KC_TRNS, KC_DEL, + QK_BOOT, KC_TRNS, KC_TRNS, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY diff --git a/keyboards/x16/rules.mk b/keyboards/x16/rules.mk index dc7d341bbb..1c4073c9ce 100644 --- a/keyboards/x16/rules.mk +++ b/keyboards/x16/rules.mk @@ -7,15 +7,12 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover +NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output |