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
This commit is contained in:
Danny Nguyen
Jack Humbert
parent
83b35bf6f6
commit
e0caf94323
10 changed files with 14 additions and 108 deletions
|
|
@ -73,15 +73,3 @@ USE_I2C ?= yes
|
||||||
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -69,15 +69,3 @@ AUDIO_ENABLE ?= no # Audio output on port C6
|
||||||
ifndef QUANTUM_DIR
|
ifndef QUANTUM_DIR
|
||||||
include ../../../Makefile
|
include ../../../Makefile
|
||||||
endif
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -69,15 +69,3 @@ AUDIO_ENABLE = no # Audio output on port C6
|
||||||
ifndef QUANTUM_DIR
|
ifndef QUANTUM_DIR
|
||||||
include ../../../Makefile
|
include ../../../Makefile
|
||||||
endif
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -69,15 +69,3 @@ AUDIO_ENABLE = no # Audio output on port C6
|
||||||
ifndef QUANTUM_DIR
|
ifndef QUANTUM_DIR
|
||||||
include ../../../Makefile
|
include ../../../Makefile
|
||||||
endif
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -69,15 +69,3 @@ AUDIO_ENABLE = no # Audio output on port C6
|
||||||
ifndef QUANTUM_DIR
|
ifndef QUANTUM_DIR
|
||||||
include ../../../Makefile
|
include ../../../Makefile
|
||||||
endif
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -74,15 +74,3 @@ USE_I2C = yes
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -73,15 +73,3 @@ USE_I2C = yes
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -73,15 +73,3 @@ USE_I2C = yes
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
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
|
|
||||||
|
|
|
||||||
|
|
@ -144,6 +144,20 @@ dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
|
||||||
fi
|
fi
|
||||||
$(DFU_PROGRAMMER) $(MCU) reset
|
$(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.
|
# Convert hex to bin.
|
||||||
flashbin: $(BUILD_DIR)/$(TARGET).hex
|
flashbin: $(BUILD_DIR)/$(TARGET).hex
|
||||||
$(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
|
$(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue