Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2022-09-10 00:14:43 +00:00
commit 9fd5ddc526

View File

@ -23,6 +23,7 @@ define EXEC_DFU_UTIL
$(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin
endef endef
WB32_DFU_UPDATER ?= wb32-dfu-updater_cli
define EXEC_WB32_DFU_UPDATER define EXEC_WB32_DFU_UPDATER
if ! wb32-dfu-updater_cli -l | grep -q "Found DFU"; then \ if ! wb32-dfu-updater_cli -l | grep -q "Found DFU"; then \
@ -34,7 +35,7 @@ define EXEC_WB32_DFU_UPDATER
done ;\ done ;\
printf "\n" ;\ printf "\n" ;\
fi fi
wb32-dfu-updater_cli -D $(BUILD_DIR)/$(TARGET).bin $(WB32_DFU_UPDATER) -D $(BUILD_DIR)/$(TARGET).bin && $(WB32_DFU_UPDATER) -R
endef endef
dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter