Ver código fonte

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

Fixes <https://github.com/qmk/qmk_firmware/issues/10286>.
Frans de Jonge 4 anos atrás
pai
commit
2b9f200a2a
1 arquivos alterados com 2 adições e 1 exclusões
  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