diff options
| author |  Brian Choromanski <BrianChoromanski@gmail.com> | 2018-03-16 16:20:09 -0400 |
|---|---|---|
| committer |  Jack Humbert <jack.humb@gmail.com> | 2018-03-16 16:20:09 -0400 |
| commit | 6c74d734c274f70ce72150ecbd844f8eff5040c4 (patch) | |
| tree | 2e675ef4f061ae47f27f854f7659692f54646453 /keyboards/planck | |
| parent | ad1a868701102fdf031c2d187b7fb9b656040fc6 (diff) | |
| download | qmk_firmware-6c74d734c274f70ce72150ecbd844f8eff5040c4.tar.gz | |
Fixed various keymaps and the allocation of "key_combos" (#2526)
* Fixed plank keymaps so that they will compile for planck light
* tv44:budi now compiles
* s60_x:amnesia0287 now compiles
* Fixed allocation of key_combos so that narze keymap for planck can compile correctly
* Disabled rgb on ergodone and infinity
* Enabled tap dance so it compiles
* Added return statement so it compiles
* If compiling on light disable extra functionality
* Properly redefined variable so it compiles
Diffstat (limited to 'keyboards/planck')
| -rw-r--r-- | keyboards/planck/keymaps/piemod/rules.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/keyboards/planck/keymaps/piemod/rules.mk b/keyboards/planck/keymaps/piemod/rules.mk index 1e48872e3..84cb02bd7 100644 --- a/keyboards/planck/keymaps/piemod/rules.mk +++ b/keyboards/planck/keymaps/piemod/rules.mk @@ -1,10 +1,18 @@ SUBPROJECT_DEFAULT = rev4 MOUSEKEY_ENABLE = yes -BLUETOOTH_ENABLE = yes EXTRAKEY_ENABLE = yes AUDIO_ENABLE = yes +ifeq ($(MCU),at90usb1286) +BOOTMAGIC_ENABLE = no +CONSOLE_ENABLE = no +COMMAND_ENABLE = no +BLUETOOTH_ENABLE = no +else +BLUETOOTH_ENABLE = yes +endif + ifndef QUANTUM_DIR include ../../../../Makefile endif |