Move avrdude flashing script from individual keyboard rules.mk to common location...

Port detection script is now more informative and better handles first time flashing of a Pro Micro

diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk
index 0efa785505a707c0a5138b13e8ef653034ddf7b8..1aee5313c1ee122fb0feebc44dc52caef52651b0 100644 (file)
--- a/keyboards/deltasplit75/rules.mk
+++ b/keyboards/deltasplit75/rules.mk
@@ -73,15 +73,3 @@ USE_I2C ?= yes
 SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [[ -z $$USB ]]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/keyboards/handwired/atreus50/rules.mk b/keyboards/handwired/atreus50/rules.mk
index 5e808dfa7f7ee0d8da79d4250a8e09b1d957ca89..2e2d48f6ab58efbe580d1705a7295238f785126e 100644 (file)
--- a/keyboards/handwired/atreus50/rules.mk
+++ b/keyboards/handwired/atreus50/rules.mk
@@ -67,15 +67,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [[ -z $$USB ]]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/keyboards/handwired/magicforce61/rules.mk b/keyboards/handwired/magicforce61/rules.mk
index 913bcb93e2fcb6576bb89f9bdd253d3b6f588709..a3fdd3d707f0811af8458af9903310d48d71d33d 100644 (file)
--- a/keyboards/handwired/magicforce61/rules.mk
+++ b/keyboards/handwired/magicforce61/rules.mk
@@ -69,15 +69,3 @@ AUDIO_ENABLE ?= no           # Audio output on port C6
 ifndef QUANTUM_DIR
        include ../../../Makefile
 endif
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [[ -z $$USB ]]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/keyboards/handwired/magicforce68/rules.mk b/keyboards/handwired/magicforce68/rules.mk
index 0e07bde403abe3d9f1f5075ea9bb82a5c2576be1..0d21623cedae67b7cfb23f6f5aafc91d56246779 100644 (file)
--- a/keyboards/handwired/magicforce68/rules.mk
+++ b/keyboards/handwired/magicforce68/rules.mk
@@ -69,15 +69,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
 ifndef QUANTUM_DIR
        include ../../../Makefile
 endif
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [[ -z $$USB ]]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/keyboards/handwired/numpad20/rules.mk b/keyboards/handwired/numpad20/rules.mk
index 0e07bde403abe3d9f1f5075ea9bb82a5c2576be1..0d21623cedae67b7cfb23f6f5aafc91d56246779 100644 (file)
--- a/keyboards/handwired/numpad20/rules.mk
+++ b/keyboards/handwired/numpad20/rules.mk
@@ -69,15 +69,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
 ifndef QUANTUM_DIR
        include ../../../Makefile
 endif
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [[ -z $$USB ]]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/keyboards/handwired/ortho5x13/rules.mk b/keyboards/handwired/ortho5x13/rules.mk
index 0e07bde403abe3d9f1f5075ea9bb82a5c2576be1..0d21623cedae67b7cfb23f6f5aafc91d56246779 100644 (file)
--- a/keyboards/handwired/ortho5x13/rules.mk
+++ b/keyboards/handwired/ortho5x13/rules.mk
@@ -69,15 +69,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
 ifndef QUANTUM_DIR
        include ../../../Makefile
 endif
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [[ -z $$USB ]]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk
index cc87ee31c602a11bb59bf5d1b36d4bf354aa7ff1..c2b7d556ebd48f36e0dc9862360b82ccffe8a75b 100644 (file)
--- a/keyboards/lets_split/rules.mk
+++ b/keyboards/lets_split/rules.mk
@@ -74,15 +74,3 @@ USE_I2C = yes
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [ -z $$USB ]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/keyboards/nyquist/rules.mk b/keyboards/nyquist/rules.mk
index dfcff1d9026e2de91cbd1cadb1bea691c1052b3a..3f40ff2f827e14980f1e72f34ddad9ba43a94ea8 100644 (file)
--- a/keyboards/nyquist/rules.mk
+++ b/keyboards/nyquist/rules.mk
@@ -73,15 +73,3 @@ USE_I2C = yes
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [[ -z $$USB ]]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk
index dfcff1d9026e2de91cbd1cadb1bea691c1052b3a..3f40ff2f827e14980f1e72f34ddad9ba43a94ea8 100644 (file)
--- a/keyboards/orthodox/rules.mk
+++ b/keyboards/orthodox/rules.mk
@@ -73,15 +73,3 @@ USE_I2C = yes
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
-
-avrdude: build
-       ls /dev/tty* > /tmp/1; \
-       echo "Reset your Pro Micro now"; \
-       while [[ -z $$USB ]]; do \
-         sleep 1; \
-         ls /dev/tty* > /tmp/2; \
-         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
-       done; \
-       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
-
-.PHONY: avrdude

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 4af34ba57419604e9af8a786768122df31d80838..0d0eec3bf34e85d557ee2a90931ce8af2568ea80 100644 (file)
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -144,6 +144,20 @@ dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
        fi
        $(DFU_PROGRAMMER) $(MCU) reset
 
+avrdude: $(BUILD_DIR)/$(TARGET).hex
+       ls /dev/tty* > /tmp/1; \
+       echo "Detecting Pro Micro port, reset your Pro Micro now.\c"; \
+       while [ -z $$USB ]; do \
+         sleep 1; \
+         echo ".\c"; \
+         ls /dev/tty* > /tmp/2; \
+         USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
+       done; \
+       echo ""; \
+       echo "Detected Pro Micro port at $$USB"; \
+       sleep 1; \
+       avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex
+
 # Convert hex to bin.
 flashbin: $(BUILD_DIR)/$(TARGET).hex
        $(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin