diff options
author | Jack Humbert <jack.humb@gmail.com> | 2017-11-27 23:08:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-27 23:08:21 -0500 |
commit | 9fdc27626097ae03b767a09427efc90475d90955 (patch) | |
tree | a555c38f1b714af6e2c2c96187552757d08224b9 /keyboards/planck | |
parent | 9113f3387a670373919fe62899b0ab27e9d89eba (diff) | |
download | qmk_firmware-9fdc27626097ae03b767a09427efc90475d90955.tar.gz |
Updates bootloader settings, adds file size check (#2029)
* pull fuse settings for bootloader jump
* fix 32a chips
* make automatic bootloader selection optional
* quantify bootloaders
* fixs #164, speeds up dfu reset
* fix for chips w/o usb
* missing an n
* fix bootloader sizes, use words for addresses
* fix bmini, pearl, and [[ issue, make things quiet
* ignore avr errors on arm for now
* update settings for the light
* document bootloader stuff
* add bootloader title
Diffstat (limited to 'keyboards/planck')
-rw-r--r-- | keyboards/planck/light/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/planck/rev3/rules.mk | 9 | ||||
-rw-r--r-- | keyboards/planck/rev4/rules.mk | 8 | ||||
-rw-r--r-- | keyboards/planck/rev5/rules.mk | 8 | ||||
-rw-r--r-- | keyboards/planck/rules.mk | 21 |
5 files changed, 19 insertions, 29 deletions
diff --git a/keyboards/planck/light/rules.mk b/keyboards/planck/light/rules.mk index 02c39c43a..1225a5d28 100644 --- a/keyboards/planck/light/rules.mk +++ b/keyboards/planck/light/rules.mk @@ -4,6 +4,4 @@ MOUSEKEY_ENABLE = yes # Mouse keys(+4700) NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -OPT_DEFS += -DBOOTLOADER_SIZE=8192 - MCU = at90usb1286
\ No newline at end of file diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk index 9ecde5958..e51af55c6 100644 --- a/keyboards/planck/rev3/rules.mk +++ b/keyboards/planck/rev3/rules.mk @@ -1,10 +1 @@ - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - AUDIO_ENABLE = no # Audio output on port C6 diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk index 0001fb50f..7e64e7edc 100644 --- a/keyboards/planck/rev4/rules.mk +++ b/keyboards/planck/rev4/rules.mk @@ -1,9 +1 @@ -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - AUDIO_ENABLE = yes # Audio output on port C6 diff --git a/keyboards/planck/rev5/rules.mk b/keyboards/planck/rev5/rules.mk index 29eae4b49..3b22e0a01 100644 --- a/keyboards/planck/rev5/rules.mk +++ b/keyboards/planck/rev5/rules.mk @@ -1,9 +1 @@ -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 -# LUFA bootloader 4096 -# USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - AUDIO_ENABLE = yes # Audio output on port C6
\ No newline at end of file diff --git a/keyboards/planck/rules.mk b/keyboards/planck/rules.mk index 1fed5fa58..439f7db64 100644 --- a/keyboards/planck/rules.mk +++ b/keyboards/planck/rules.mk @@ -34,6 +34,23 @@ ARCH = AVR8 # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. F_USB = $(F_CPU) +# Bootloader +# This definition is optional, and if your keyboard supports multiple bootloaders of +# different sizes, comment this out, and the correct address will be loaded +# automatically (+60). See bootloader.mk for all options. +ifeq ($(strip $(KEYBOARD)), planck/rev3) + BOOTLOADER = atmel-dfu +endif +ifeq ($(strip $(KEYBOARD)), planck/rev4) + BOOTLOADER = atmel-dfu +endif +ifeq ($(strip $(KEYBOARD)), planck/rev5) + BOOTLOADER = qmk-dfu +endif +ifeq ($(strip $(KEYBOARD)), planck/light) + BOOTLOADER = qmk-dfu +endif + # Interrupt driven control endpoint task(+60) OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT @@ -46,9 +63,9 @@ MOUSEKEY_ENABLE = no # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls +MIDI_ENABLE = yes # MIDI controls AUDIO_ENABLE = yes # Audio output on port C6 UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |