diff options
| author | Stanley Lai <stanleylai.sg@gmail.com> | 2016-12-17 13:49:13 -0800 |
|---|---|---|
| committer | Stanley Lai <stanleylai.sg@gmail.com> | 2016-12-17 13:49:13 -0800 |
| commit | b49d7800aeae1009b39b2bff2121864425e73ce9 (patch) | |
| tree | f73447fc32940c7bc6b691a83567186d1afbc991 /tmk_core/avr.mk | |
| parent | 9ecf9073b96799e52a1f1c0d35b57177382902ce (diff) | |
| parent | ae95834f5af7404c04e6fe3446019046278d814b (diff) | |
| download | firmware-b49d7800aeae1009b39b2bff2121864425e73ce9.tar.gz firmware-b49d7800aeae1009b39b2bff2121864425e73ce9.tar.bz2 firmware-b49d7800aeae1009b39b2bff2121864425e73ce9.zip | |
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Diffstat (limited to 'tmk_core/avr.mk')
| -rw-r--r-- | tmk_core/avr.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 3bf2b34f8..5df539def 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -26,7 +26,7 @@ CFLAGS += -fno-inline-small-functions CFLAGS += -fno-strict-aliasing CPPFLAGS += $(COMPILEFLAGS) -CPPFLAGS += -fno-exceptions +CPPFLAGS += -fno-exceptions -std=c++11 LDFLAGS +=-Wl,--gc-sections @@ -107,6 +107,10 @@ flip: $(BUILD_DIR)/$(TARGET).hex batchisp -hardware usb -device $(MCU) -operation start reset 0 dfu: $(BUILD_DIR)/$(TARGET).hex sizeafter + until dfu-programmer $(MCU) get bootloader-version; do\ + echo "Error: Bootloader not found. Trying again in 5s." ;\ + sleep 5 ;\ + done ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1))) dfu-programmer $(MCU) erase --force else @@ -134,6 +138,11 @@ else endif dfu-programmer $(MCU) reset +# Convert hex to bin. +flashbin: $(BUILD_DIR)/$(TARGET).hex + $(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin + $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; + $(COPY) $(BUILD_DIR)/$(TARGET).bin FLASH.bin; # Generate avr-gdb config/init file which does the following: # define the reset signal, load the target file, connect to target, and set |