diff options
| author | Joshua T <joshua@sonofone.net> | 2016-08-25 06:46:52 +0200 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-08-25 06:46:52 +0200 |
| commit | 42fa91a57dad18ccc3f6bf308f50b3f1e882dadd (patch) | |
| tree | dae1290be66b6af1d498b0cf68fbef44f90d02be /keyboards/atreus/Makefile | |
| parent | cac69cb58029bf246b22038f034205afbedbc695 (diff) | |
| parent | ad206155aa6f87de3fb9f0aefe60685ec12905a8 (diff) | |
| download | qmk_firmware-42fa91a57dad18ccc3f6bf308f50b3f1e882dadd.tar.gz qmk_firmware-42fa91a57dad18ccc3f6bf308f50b3f1e882dadd.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/atreus/Makefile')
| -rw-r--r-- | keyboards/atreus/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/atreus/Makefile b/keyboards/atreus/Makefile index 95ee1d4d7..5894d231f 100644 --- a/keyboards/atreus/Makefile +++ b/keyboards/atreus/Makefile @@ -2,11 +2,11 @@ ifdef TEENSY2 OPT_DEFS += -DATREUS_TEENSY2 - ATRUES_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex + ATREUS_UPLOAD_COMMAND = teensy_loader_cli -w -mmcu=$(MCU) $(TARGET).hex else OPT_DEFS += -DATREUS_ASTAR OPT_DEFS += -DCATERINA_BOOTLOADER - ATRUES_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ + ATREUS_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) endif @@ -84,5 +84,5 @@ endif USB ?= /dev/cu.usbmodem1411 upload: build - $(ATRUES_UPLOAD_COMMAND) -
\ No newline at end of file + $(ATREUS_UPLOAD_COMMAND) + |