summaryrefslogtreecommitdiff
path: root/platforms
diff options
context:
space:
mode:
authorDominik <github@dominikloidolt.at>2023-10-09 18:41:00 +0200
committerGitHub <noreply@github.com>2023-10-09 17:41:00 +0100
commitfa1c1cbbeeb6d7af76eaeb6b282daf6c93983d13 (patch)
treecb41d5c5ab5c4ac51c62349c7da9676bc55bd88b /platforms
parente2e6b3dfd6a27a33db36842c2de5552d8b39a857 (diff)
avrdude: Version 7.2 changes the text output (#22235)
from "could not find USB device with" to "cannot find USB device with" This should fix issue #22234 Co-authored-by: Dominik Loidolt <dominik.loidolt@univie.ac.at>
Diffstat (limited to 'platforms')
-rw-r--r--platforms/avr/flash.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk
index 9c2ab72410..51731f0aa8 100644
--- a/platforms/avr/flash.mk
+++ b/platforms/avr/flash.mk
@@ -130,10 +130,10 @@ avrdude-split-right: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
$(call EXEC_AVRDUDE,eeprom-righthand.eep)
define EXEC_USBASP
- if $(AVRDUDE_PROGRAMMER) -p $(AVRDUDE_MCU) -c usbasp 2>&1 | grep -q "could not find USB device with"; then \
+ if $(AVRDUDE_PROGRAMMER) -p $(AVRDUDE_MCU) -c usbasp 2>&1 | grep -q "\(could not\|cannot\) find USB device with"; then \
printf "$(MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY)" ;\
sleep $(BOOTLOADER_RETRY_TIME) ;\
- until $(AVRDUDE_PROGRAMMER) -p $(AVRDUDE_MCU) -c usbasp 2>&1 | (! grep -q "could not find USB device with"); do\
+ until $(AVRDUDE_PROGRAMMER) -p $(AVRDUDE_MCU) -c usbasp 2>&1 | (! grep -q "\(could not\|cannot\) find USB device with"); do\
printf "." ;\
sleep $(BOOTLOADER_RETRY_TIME) ;\
done ;\