Explorar o código

[fix] dfu-programmer <0.7 doesn't support --force flag (#10292)

Fixes <https://github.com/qmk/qmk_firmware/issues/10286>.
Frans de Jonge %!s(int64=4) %!d(string=hai) anos
pai
achega
2b9f200a2a
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      tmk_core/avr.mk

+ 2 - 1
tmk_core/avr.mk

@@ -122,13 +122,14 @@ define EXEC_DFU
 		if [ "$(1)" ]; then \
 			$(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\
 		fi; \
+		$(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
 	else \
 		$(DFU_PROGRAMMER) $(MCU) erase; \
 		if [ "$(1)" ]; then \
 			$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\
 		fi; \
+		$(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\
 	fi; \
-	$(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
 	$(DFU_PROGRAMMER) $(MCU) reset
 endef