diff options
author | James Young <[email protected]> | 2021-08-11 09:48:25 -0700 |
---|---|---|
committer | James Young <[email protected]> | 2021-08-11 09:48:25 -0700 |
commit | 345f6dc4e6910ab11907dfa5382edb12d57a1d7b (patch) | |
tree | b57d00ab7fe59a47f4035ab7463dec5090ef6464 /keyboards/poker87c/rules.mk | |
parent | f4c447f2dfd9146664e3e985cac743abf17ac060 (diff) | |
parent | 02ac0f89c4665f5fc6e57559a8c49d363117fbc0 (diff) | |
download | qmk_firmware-345f6dc4e6910ab11907dfa5382edb12d57a1d7b.tar.gz qmk_firmware-345f6dc4e6910ab11907dfa5382edb12d57a1d7b.zip |
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:
- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
- Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
- Conflict from PR 13947
Diffstat (limited to 'keyboards/poker87c/rules.mk')
-rw-r--r-- | keyboards/poker87c/rules.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/keyboards/poker87c/rules.mk b/keyboards/poker87c/rules.mk index e4f8259605..e8b066aeb6 100644 --- a/keyboards/poker87c/rules.mk +++ b/keyboards/poker87c/rules.mk @@ -8,10 +8,10 @@ BOOTLOADER = atmel-dfu # change yes to no to disable # BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys +MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration +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 @@ -21,7 +21,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -KEY_LOCK_ENABLE = no # Enable KC_LOCK support - -# generated by KBFirmware JSON to QMK Parser -# https://noroadsleft.github.io/kbf_qmk_converter/ +LAYOUTS = tkl_ansi |