summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Nguyen <danny@80pct.com>2017-08-03 20:23:12 +0200
committerJack Humbert <jack.humb@gmail.com>2017-08-04 02:56:21 +0200
commite0caf94323d5cc0baae38af11984902fb1a5375f (patch)
treebb77118d1e2d8a283d4257229ebea275d04dead7
parent83b35bf6f68d16910b2acfaffa21c82f4ffbfd3a (diff)
downloadqmk_firmware-e0caf94323d5cc0baae38af11984902fb1a5375f.tar.gz
qmk_firmware-e0caf94323d5cc0baae38af11984902fb1a5375f.tar.xz
Move avrdude flashing script from individual keyboard rules.mk to common location and improve script.
Port detection script is now more informative and better handles first time flashing of a Pro Micro
-rw-r--r--keyboards/deltasplit75/rules.mk12
-rw-r--r--keyboards/handwired/atreus50/rules.mk12
-rw-r--r--keyboards/handwired/magicforce61/rules.mk12
-rw-r--r--keyboards/handwired/magicforce68/rules.mk12
-rw-r--r--keyboards/handwired/numpad20/rules.mk12
-rw-r--r--keyboards/handwired/ortho5x13/rules.mk12
-rw-r--r--keyboards/lets_split/rules.mk12
-rw-r--r--keyboards/nyquist/rules.mk12
-rw-r--r--keyboards/orthodox/rules.mk12
-rw-r--r--tmk_core/avr.mk14
10 files changed, 14 insertions, 108 deletions
diff --git a/keyboards/deltasplit75/rules.mk b/keyboards/deltasplit75/rules.mk
index 0efa78550..1aee5313c 100644
--- 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 5e808dfa7..2e2d48f6a 100644
--- 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 913bcb93e..a3fdd3d70 100644
--- 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 0e07bde40..0d21623ce 100644
--- 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 0e07bde40..0d21623ce 100644
--- 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 0e07bde40..0d21623ce 100644
--- 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 cc87ee31c..c2b7d556e 100644
--- 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 dfcff1d90..3f40ff2f8 100644
--- 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 dfcff1d90..3f40ff2f8 100644
--- 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 4af34ba57..0d0eec3bf 100644
--- 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