Skip to content

Commit

Permalink
Squashed 'applications/external/' changes from b65288e391..fa9648df8e
Browse files Browse the repository at this point in the history
fa9648df8e Merge t5577_raw_writer from https://github.com/zinongli/T5577_Raw_Writer
c9c23b9191 Merge esp_flasher from https://github.com/0xchocolate/flipperzero-esp-flasher
f425ad3 Merge pull request #9 from zinongli/revert-8-patch-1
e11cc49 Fix fap build (#28)
4ded47a Revert "Update t5577_writer.c"

git-subtree-dir: applications/external
git-subtree-split: fa9648df8ee55cb0a0b08fcb9458c133d46e4670
  • Loading branch information
RogueMaster committed Aug 4, 2024
1 parent 6459ae8 commit 4836229
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions esp_flasher/application.fam
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
App(
appid="esp_flasher",
name="[ESP] ESP Flasher",
fap_version=(1, 5),
fap_version=(1, 6),
apptype=FlipperAppType.EXTERNAL,
entry_point="esp_flasher_app",
requires=["gui"],
Expand Down Expand Up @@ -30,6 +30,10 @@ App(
],
),
],
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",
)
2 changes: 1 addition & 1 deletion esp_flasher/lib/esp-serial-flasher/include/esp_loader.h
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ esp_loader_error_t esp_loader_change_transmission_rate(uint32_t transmission_rat
* - ESP_LOADER_ERROR_INVALID_RESPONSE Internal error
* - ESP_LOADER_ERROR_UNSUPPORTED_FUNC Unsupported on the target
*/
#if defined(MD5_ENABLED) && MD5_ENABLED
#if MD5_ENABLED
esp_loader_error_t esp_loader_flash_verify(void);
#endif
/**
Expand Down

0 comments on commit 4836229

Please sign in to comment.