From cc1565f2a3e46f6f364f872962ced35aef5ddae8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 3 Oct 2022 12:26:04 +1100 Subject: `:flash`: print bootloader (#18569) --- platforms/avr/flash.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'platforms/avr/flash.mk') diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk index 6d50e72534..c104f730b3 100644 --- a/platforms/avr/flash.mk +++ b/platforms/avr/flash.mk @@ -168,7 +168,8 @@ endef hid_bootloader: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware $(call EXEC_HID_LUFA) -flash: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware +flash: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware + $(SILENT) || printf "Flashing for bootloader: $(BLUE)$(BOOTLOADER)$(NO_COLOR)\n" ifneq ($(strip $(PROGRAM_CMD)),) $(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD) else ifeq ($(strip $(BOOTLOADER)), caterina) -- cgit v1.2.3 From 96c48a5f4aa461ed31fd4ee61151ac206e16fb5f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 31 Oct 2022 20:16:43 +0000 Subject: Refactor to avoid deprecated wmic execution (#18122) * wmic deprecated? * Update platforms/avr/flash.mk * Update platforms/avr/flash.mk --- platforms/avr/flash.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platforms/avr/flash.mk') diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk index c104f730b3..e058e8d296 100644 --- a/platforms/avr/flash.mk +++ b/platforms/avr/flash.mk @@ -78,7 +78,7 @@ AVRDUDE_PROGRAMMER ?= avrdude define EXEC_AVRDUDE list_devices() { \ if $(GREP) -q -s icrosoft /proc/version; then \ - wmic.exe path Win32_SerialPort get DeviceID 2>/dev/null | LANG=C perl -pne 's/COM(\d+)/COM.($$1-1)/e' | sed 's!COM!/dev/ttyS!' | xargs echo -n | sort; \ + powershell.exe 'Get-CimInstance -Class Win32_SerialPort | Select -ExpandProperty "DeviceID"' 2>/dev/null | sed -e "s/\r//g" | LANG=C perl -pne 's/COM(\d+)/COM.($$1-1)/e' | sed 's!COM!/dev/ttyS!' | sort; \ elif [ "`uname`" = "FreeBSD" ]; then \ ls /dev/tty* | grep -v '\.lock$$' | grep -v '\.init$$'; \ else \ -- cgit v1.2.3