Skip to content

Commit

Permalink
Resync with 0.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@203Null
203Null committed Dec 1, 2024
1 parent 4fd9c05 commit c54bdfa
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 1,405 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ _bin/
sdkconfig~
*.yml~
ports/espressif/apps/self_update/main/bootloader_bin.c
ports/espressif/build
2 changes: 1 addition & 1 deletion lib/tinyusb
Submodule tinyusb updated 2312 files
4 changes: 2 additions & 2 deletions ports/espressif/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ fullclean:
@rm -rf $(SELF_BUILD)

app bootloader clean flash bootloader-flash app-flash erase-flash monitor dfu-flash dfu size size-components size-files:
idf.py -B$(BUILD) -DBOARD=$(BOARD) $(SERIAL_OPT) $@
idf.py -B$(BUILD) -DBOARD=$(BOARD) $(SERIAL_OPT) $@

combined.bin: $(BUILD)/combined.bin

$(BUILD)/combined.bin: app
cd $(BUILD)
cd $(BUILD); \
esptool.py --chip $(IDF_TARGET) merge_bin --output combined.bin $(strip $(file < $(BUILD)/flash_args))

combined-flash: $(BUILD)/combined.bin
Expand Down
Loading

0 comments on commit c54bdfa

Please sign in to comment.