X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tmk_core%2Favr.mk;h=106b771507a2ee2e3e18528d4ecf9759ba766498;hb=c5d81a84a0519c78de1b5e165f5f2c1eb773bc11;hp=94e9a7bdbb06b5907732bf92f55912f4f2daf1d0;hpb=ec3e065f0d2c65175384699cb11fa388250fa914;p=qmk_firmware.git

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 94e9a7bdb..106b77150 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -121,22 +121,22 @@ qmk: $(BUILD_DIR)/$(TARGET).hex
 	printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk
 
 # Program the device.
-program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
+program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep check-size
 	$(PROGRAM_CMD)
 
-teensy: $(BUILD_DIR)/$(TARGET).hex
+teensy: $(BUILD_DIR)/$(TARGET).hex check-size
 	$(TEENSY_LOADER_CLI) -mmcu=$(MCU) -w -v $(BUILD_DIR)/$(TARGET).hex
 	
 BATCHISP ?= batchisp 
 
-flip: $(BUILD_DIR)/$(TARGET).hex
+flip: $(BUILD_DIR)/$(TARGET).hex check-size
 	$(BATCHISP) -hardware usb -device $(MCU) -operation erase f
 	$(BATCHISP) -hardware usb -device $(MCU) -operation loadbuffer $(BUILD_DIR)/$(TARGET).hex program
 	$(BATCHISP) -hardware usb -device $(MCU) -operation start reset 0
 	
 DFU_PROGRAMMER ?= dfu-programmer
 
-dfu: $(BUILD_DIR)/$(TARGET).hex sizeafter
+dfu: $(BUILD_DIR)/$(TARGET).hex cpfirmware check-size
 	until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\
 		echo "Error: Bootloader not found. Trying again in 5s." ;\
 		sleep 5 ;\
@@ -168,17 +168,18 @@ dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
 	fi
 	$(DFU_PROGRAMMER) $(MCU) reset
 
-avrdude: $(BUILD_DIR)/$(TARGET).hex
+avrdude: $(BUILD_DIR)/$(TARGET).hex check-size
 	if grep -q -s Microsoft /proc/version; then \
 		echo 'ERROR: AVR flashing cannot be automated within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \
 	else \
+		printf "Detecting USB port, reset your controller now."; \
 		ls /dev/tty* > /tmp/1; \
-		echo "Detecting USB port, reset your controller now.\c"; \
 		while [ -z $$USB ]; do \
-			sleep 1; \
-			echo ".\c"; \
+			sleep 0.5; \
+			printf "."; \
 			ls /dev/tty* > /tmp/2; \
-			USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
+			USB=`comm -13 /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
+			mv /tmp/2 /tmp/1; \
 		done; \
 		echo ""; \
 		echo "Detected controller on USB port at $$USB"; \