Skip to content

Commit

Permalink
Merge branch '0xchocolate:main' into qodana-automation-1284731249
Browse files Browse the repository at this point in the history
  • Loading branch information
Jimmy23222 authored Sep 21, 2024
2 parents 6db7c55 + f4ee150 commit c372ced
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions application.fam
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
App(
appid="esp_flasher",
name="ESP Flasher",
fap_version=(1,5),
fap_version=(1,6),
apptype=FlipperAppType.EXTERNAL,
entry_point="esp_flasher_app",
requires=["gui"],
Expand All @@ -25,6 +25,6 @@ App(
cdefines=["SERIAL_FLASHER_INTERFACE_UART=1", "MD5_ENABLED=1", "SERIAL_FLASHER_WRITE_BLOCK_RETRIES=10"],
),
],
cdefines=["SERIAL_FLASHER_INTERFACE_UART=1"],
cdefines=["SERIAL_FLASHER_INTERFACE_UART=1", "MD5_ENABLED=1", "SERIAL_FLASHER_WRITE_BLOCK_RETRIES=10"],
fap_icon_assets="assets",
)
9 changes: 7 additions & 2 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
## v1.5
## v1.6

Fixes app to build with the new API. Thanks @Willy-JL for doing the hard part!
No functional changes, just fixing the build after apparent toolchain updates on dev.

<3 @0xchocolate (cococode)


## v1.5

Fixes app to build with the new API. Thanks @Willy-JL for doing the hard part!


## v1.4

Turbo mode (gotta go fast)! The app now supports flashing as fast as possible (921600 baud with built-in retries). In my testing, this sped up a 1:37min flash to 23 seconds. Now we can't go back to the slow way!
Expand Down

0 comments on commit c372ced

Please sign in to comment.