From 365575eaf0b642e9f84424ab56a38dcb971a61de Mon Sep 17 00:00:00 2001 From: jay candel Date: Fri, 22 Nov 2024 02:29:28 +0800 Subject: [PATCH 1/3] add c3, c6 to s3 option reworded to fit inside line --- esp_flasher/application.fam | 2 +- esp_flasher/scenes/esp_flasher_scene_browse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/esp_flasher/application.fam b/esp_flasher/application.fam index 0129093fb..b26275be6 100644 --- a/esp_flasher/application.fam +++ b/esp_flasher/application.fam @@ -1,7 +1,7 @@ App( appid="esp_flasher", name="[ESP] ESP Flasher", - fap_version=(1, 6), + fap_version=(1, 7), apptype=FlipperAppType.EXTERNAL, entry_point="esp_flasher_app", requires=["gui"], diff --git a/esp_flasher/scenes/esp_flasher_scene_browse.c b/esp_flasher/scenes/esp_flasher_scene_browse.c index c8a67fcdc..85578a394 100644 --- a/esp_flasher/scenes/esp_flasher_scene_browse.c +++ b/esp_flasher/scenes/esp_flasher_scene_browse.c @@ -193,7 +193,7 @@ static void _refresh_submenu(EspFlasherApp* app) { submenu_add_item( submenu, app->selected_flash_options[SelectedFlashS3Mode] ? "[x] Using ESP32-S3" : - "[ ] Select if using S3", + "[ ] Select for S3, C3, C6", SubmenuIndexS3Mode, esp_flasher_scene_browse_callback, app); From da7f78530eea9afe57e3b26c9593ddc6c5f60cbe Mon Sep 17 00:00:00 2001 From: jay candel Date: Fri, 22 Nov 2024 02:32:56 +0800 Subject: [PATCH 2/3] update using s3 to Using S3, C3 or C6 --- esp_flasher/scenes/esp_flasher_scene_browse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esp_flasher/scenes/esp_flasher_scene_browse.c b/esp_flasher/scenes/esp_flasher_scene_browse.c index 85578a394..a6a5f1895 100644 --- a/esp_flasher/scenes/esp_flasher_scene_browse.c +++ b/esp_flasher/scenes/esp_flasher_scene_browse.c @@ -192,7 +192,7 @@ static void _refresh_submenu(EspFlasherApp* app) { submenu_set_header(submenu, "Browse for files to flash"); submenu_add_item( submenu, - app->selected_flash_options[SelectedFlashS3Mode] ? "[x] Using ESP32-S3" : + app->selected_flash_options[SelectedFlashS3Mode] ? "[x] Using S3, C3 or C6" : "[ ] Select for S3, C3, C6", SubmenuIndexS3Mode, esp_flasher_scene_browse_callback, From db19deb178a789a7a6cd590d332c6f7e8ee16cf9 Mon Sep 17 00:00:00 2001 From: jay candel Date: Sat, 23 Nov 2024 11:17:18 +0800 Subject: [PATCH 3/3] change s3 flash name to 0x0 since s3 mode is writing bootloader at 0x0 --- esp_flasher/scenes/esp_flasher_scene_browse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esp_flasher/scenes/esp_flasher_scene_browse.c b/esp_flasher/scenes/esp_flasher_scene_browse.c index a6a5f1895..5460be620 100644 --- a/esp_flasher/scenes/esp_flasher_scene_browse.c +++ b/esp_flasher/scenes/esp_flasher_scene_browse.c @@ -180,9 +180,9 @@ static void esp_flasher_scene_browse_callback(void* context, uint32_t index) { #define STR_APP_A "FirmwareA(" TOSTRING(ESP_ADDR_APP_A) ")" #define STR_APP_B "FirmwareB(" TOSTRING(ESP_ADDR_APP_B) ")" #define STR_CUSTOM "Custom" -#define STR_FLASH_S3 "[>] FLASH - slow (S3)" +#define STR_FLASH_S3 "[>] FLASH - slow (0x0)" #define STR_FLASH "[>] FLASH - slow" -#define STR_FLASH_TURBO_S3 "[>] FLASH - fast (S3)" +#define STR_FLASH_TURBO_S3 "[>] FLASH - fast (0x0)" #define STR_FLASH_TURBO "[>] FLASH - fast" static void _refresh_submenu(EspFlasherApp* app) { Submenu* submenu = app->submenu;