diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-23 04:02:16 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-23 04:02:16 +0000 |
| commit | 19fd0108d3910b4856b1587acf11c8e4052cb7cc (patch) | |
| tree | 4bd249538732512de966d768016169f383f21acc /keyboards/tkc | |
| parent | 529dad88ddac0e64fce06bd6744884606f9d07cd (diff) | |
| parent | 806aa9bc67c77c3899e60c1daef560680865568c (diff) | |
| download | qmk_firmware-19fd0108d3910b4856b1587acf11c8e4052cb7cc.tar.gz qmk_firmware-19fd0108d3910b4856b1587acf11c8e4052cb7cc.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/tkc')
| -rw-r--r-- | keyboards/tkc/candybar/lefty/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/tkc/candybar/righty/rules.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/keyboards/tkc/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk index 1edad0835..c761d2b30 100644 --- a/keyboards/tkc/candybar/lefty/rules.mk +++ b/keyboards/tkc/candybar/lefty/rules.mk | |||
| @@ -8,7 +8,6 @@ MCU = STM32F072 | |||
| 8 | LTO_ENABLE = yes | 8 | LTO_ENABLE = yes |
| 9 | BACKLIGHT_ENABLE = no | 9 | BACKLIGHT_ENABLE = no |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration |
| 11 | ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) | ||
| 12 | MOUSEKEY_ENABLE = no # Mouse keys | 11 | MOUSEKEY_ENABLE = no # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
diff --git a/keyboards/tkc/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk index 1edad0835..c761d2b30 100644 --- a/keyboards/tkc/candybar/righty/rules.mk +++ b/keyboards/tkc/candybar/righty/rules.mk | |||
| @@ -8,7 +8,6 @@ MCU = STM32F072 | |||
| 8 | LTO_ENABLE = yes | 8 | LTO_ENABLE = yes |
| 9 | BACKLIGHT_ENABLE = no | 9 | BACKLIGHT_ENABLE = no |
| 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration | 10 | BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration |
| 11 | ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) | ||
| 12 | MOUSEKEY_ENABLE = no # Mouse keys | 11 | MOUSEKEY_ENABLE = no # Mouse keys |
| 13 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 14 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |