diff options
| author | Toni <jeder@mail1a.de> | 2016-08-15 19:48:53 +0200 |
|---|---|---|
| committer | Toni <jeder@mail1a.de> | 2016-08-15 19:48:53 +0200 |
| commit | 5ecebc3a66946ac7579bcd3afdacdb61387412d1 (patch) | |
| tree | c1c33b775064ee43a34e81ad859e5111975786e9 /keyboards/atreus/Makefile | |
| parent | 5705a403205c0c1e7c585e1a2edda21e79134ee6 (diff) | |
| parent | cc7acfb416d446a123d10d2c33c3344f1f684f1b (diff) | |
Merge remote-tracking branch 'origin/master' into iso_split_rshift
no idea what is merged
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 95ee1d4d7b..5894d231f9 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) + |