Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-17 04:34:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update wifi marauder app

Browse Source
This commit is contained in:
MX
2023-07-10 16:52:12 +03:00
parent e56b970eb4
commit b451fa91de
9 changed files with 264 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_console_output.c vendored
View File

@@ -182,6 +182,11 @@ bool wifi_marauder_scene_console_output_on_event(void* context, SceneManagerEven
consumed = true;
} else if(event.type == SceneManagerEventTypeTick) {
consumed = true;
} else {
if(app->flash_worker_busy) {
// ignore button presses while flashing
consumed = true;
}
}
return consumed;

172
applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_flasher.c vendored
View File

@@ -1,9 +1,14 @@
#include "../wifi_marauder_app_i.h"
#include "../wifi_marauder_flasher.h"
enum SubmenuIndex {
SubmenuIndexS3Mode,
SubmenuIndexBoot,
SubmenuIndexPart,
SubmenuIndexNvs,
SubmenuIndexBootApp0,
SubmenuIndexApp,
SubmenuIndexCustom,
SubmenuIndexFlash,
};
@@ -20,16 +25,30 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
// TODO refactor
switch(index) {
case SubmenuIndexS3Mode:
// toggle S3 mode
app->selected_flash_options[SelectedFlashS3Mode] = !app->selected_flash_options[SelectedFlashS3Mode];
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break;
case SubmenuIndexBoot:
if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy(
app->bin_file_path_boot,
furi_string_get_cstr(selected_filepath),
sizeof(app->bin_file_path_boot));
app->selected_flash_options[SelectedFlashBoot] = !app->selected_flash_options[SelectedFlashBoot];
if (app->selected_flash_options[SelectedFlashBoot]) {
if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy(
app->bin_file_path_boot,
furi_string_get_cstr(selected_filepath),
sizeof(app->bin_file_path_boot));
}
}
if (app->bin_file_path_boot[0] == '\0') {
// if user didn't select a file, leave unselected
app->selected_flash_options[SelectedFlashBoot] = false;
}
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break;
case SubmenuIndexPart:
app->selected_flash_options[SelectedFlashPart] = !app->selected_flash_options[SelectedFlashPart];
if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy(
@@ -37,8 +56,44 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
furi_string_get_cstr(selected_filepath),
sizeof(app->bin_file_path_part));
}
if (app->bin_file_path_part[0] == '\0') {
// if user didn't select a file, leave unselected
app->selected_flash_options[SelectedFlashPart] = false;
}
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break;
case SubmenuIndexNvs:
app->selected_flash_options[SelectedFlashNvs] = !app->selected_flash_options[SelectedFlashNvs];
if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy(
app->bin_file_path_nvs,
furi_string_get_cstr(selected_filepath),
sizeof(app->bin_file_path_nvs));
}
if (app->bin_file_path_nvs[0] == '\0') {
// if user didn't select a file, leave unselected
app->selected_flash_options[SelectedFlashNvs] = false;
}
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break;
case SubmenuIndexBootApp0:
app->selected_flash_options[SelectedFlashBootApp0] = !app->selected_flash_options[SelectedFlashBootApp0];
if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy(
app->bin_file_path_boot_app0,
furi_string_get_cstr(selected_filepath),
sizeof(app->bin_file_path_boot_app0));
}
if (app->bin_file_path_boot_app0[0] == '\0') {
// if user didn't select a file, leave unselected
app->selected_flash_options[SelectedFlashBootApp0] = false;
}
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break;
case SubmenuIndexApp:
app->selected_flash_options[SelectedFlashApp] = !app->selected_flash_options[SelectedFlashApp];
if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy(
@@ -46,10 +101,39 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
furi_string_get_cstr(selected_filepath),
sizeof(app->bin_file_path_app));
}
if (app->bin_file_path_app[0] == '\0') {
// if user didn't select a file, leave unselected
app->selected_flash_options[SelectedFlashApp] = false;
}
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break;
case SubmenuIndexCustom:
app->selected_flash_options[SelectedFlashCustom] = !app->selected_flash_options[SelectedFlashCustom];
if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy(
app->bin_file_path_custom,
furi_string_get_cstr(selected_filepath),
sizeof(app->bin_file_path_custom));
}
if (app->bin_file_path_custom[0] == '\0') {
// if user didn't select a file, leave unselected
app->selected_flash_options[SelectedFlashCustom] = false;
}
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break;
case SubmenuIndexFlash:
// TODO error checking
scene_manager_next_scene(app->scene_manager, WifiMarauderSceneConsoleOutput);
// count how many options are selected
app->num_selected_flash_options = 0;
for (bool* option = &app->selected_flash_options[SelectedFlashBoot]; option < &app->selected_flash_options[NUM_FLASH_OPTIONS]; ++option) {
if (*option) {
++app->num_selected_flash_options;
}
}
if (app->num_selected_flash_options) {
// only start next scene if at least one option is selected
scene_manager_next_scene(app->scene_manager, WifiMarauderSceneConsoleOutput);
}
break;
}
@@ -57,31 +141,83 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
furi_string_free(predefined_filepath);
}
void wifi_marauder_scene_flasher_on_enter(void* context) {
WifiMarauderApp* app = context;
#define STR_SELECT "[x]"
#define STR_UNSELECT "[ ]"
#define STR_BOOT "Bootloader (" TOSTRING(ESP_ADDR_BOOT) ")"
#define STR_BOOT_S3 "Bootloader (" TOSTRING(ESP_ADDR_BOOT_S3) ")"
#define STR_PART "Part Table (" TOSTRING(ESP_ADDR_PART) ")"
#define STR_NVS "NVS (" TOSTRING(ESP_ADDR_NVS) ")"
#define STR_BOOT_APP0 "boot_app0 (" TOSTRING(ESP_ADDR_BOOT_APP0) ")"
#define STR_APP "Firmware (" TOSTRING(ESP_ADDR_APP) ")"
#define STR_CUSTOM "Custom"
#define STR_FLASH_S3 "[>] FLASH (ESP32-S3)"
#define STR_FLASH "[>] FLASH"
static void _refresh_submenu(WifiMarauderApp* app) {
Submenu* submenu = app->submenu;
submenu_reset(app->submenu);
submenu_set_header(submenu, "Browse for files to flash");
submenu_add_item(
submenu, "Bootloader", SubmenuIndexBoot, wifi_marauder_scene_flasher_callback, app);
submenu, app->selected_flash_options[SelectedFlashS3Mode] ? "[x] Using ESP32-S3" : "[ ] Check if using S3", SubmenuIndexS3Mode, wifi_marauder_scene_flasher_callback, app);
const char* strSelectBootloader = STR_UNSELECT " " STR_BOOT;
if (app->selected_flash_options[SelectedFlashS3Mode]) {
if (app->selected_flash_options[SelectedFlashBoot]) {
strSelectBootloader = STR_SELECT " " STR_BOOT_S3;
} else {
strSelectBootloader = STR_UNSELECT " " STR_BOOT_S3;
}
} else {
if (app->selected_flash_options[SelectedFlashBoot]) {
strSelectBootloader = STR_SELECT " " STR_BOOT;
} else {
strSelectBootloader = STR_UNSELECT " " STR_BOOT;
}
}
submenu_add_item(
submenu, "Partition Table", SubmenuIndexPart, wifi_marauder_scene_flasher_callback, app);
submenu, strSelectBootloader, SubmenuIndexBoot, wifi_marauder_scene_flasher_callback, app);
submenu_add_item(
submenu, "Application", SubmenuIndexApp, wifi_marauder_scene_flasher_callback, app);
submenu, app->selected_flash_options[SelectedFlashPart] ? STR_SELECT " " STR_PART : STR_UNSELECT " " STR_PART, SubmenuIndexPart, wifi_marauder_scene_flasher_callback, app);
submenu_add_item(
submenu, "[>] FLASH", SubmenuIndexFlash, wifi_marauder_scene_flasher_callback, app);
submenu, app->selected_flash_options[SelectedFlashNvs] ? STR_SELECT " " STR_NVS : STR_UNSELECT " " STR_NVS, SubmenuIndexNvs, wifi_marauder_scene_flasher_callback, app);
submenu_add_item(
submenu, app->selected_flash_options[SelectedFlashBootApp0] ? STR_SELECT " " STR_BOOT_APP0 : STR_UNSELECT " " STR_BOOT_APP0, SubmenuIndexBootApp0, wifi_marauder_scene_flasher_callback, app);
submenu_add_item(
submenu, app->selected_flash_options[SelectedFlashApp] ? STR_SELECT " " STR_APP : STR_UNSELECT " " STR_APP, SubmenuIndexApp, wifi_marauder_scene_flasher_callback, app);
// TODO: custom addr
//submenu_add_item(
// submenu, app->selected_flash_options[SelectedFlashCustom] ? STR_SELECT " " STR_CUSTOM : STR_UNSELECT " " STR_CUSTOM, SubmenuIndexCustom, wifi_marauder_scene_flasher_callback, app);
submenu_add_item(
submenu, app->selected_flash_options[SelectedFlashS3Mode] ? STR_FLASH_S3 : STR_FLASH, SubmenuIndexFlash, wifi_marauder_scene_flasher_callback, app);
submenu_set_selected_item(
submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneFlasher));
view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
}
void wifi_marauder_scene_flasher_on_enter(void* context) {
WifiMarauderApp* app = context;
memset(app->selected_flash_options, 0, sizeof(app->selected_flash_options));
app->bin_file_path_boot[0] = '\0';
app->bin_file_path_part[0] = '\0';
app->bin_file_path_nvs[0] = '\0';
app->bin_file_path_boot_app0[0] = '\0';
app->bin_file_path_app[0] = '\0';
app->bin_file_path_custom[0] = '\0';
_refresh_submenu(app);
}
bool wifi_marauder_scene_flasher_on_event(void* context, SceneManagerEvent event) {
//WifiMarauderApp* app = context;
UNUSED(context);
UNUSED(event);
WifiMarauderApp* app = context;
bool consumed = false;
if (event.type == SceneManagerEventTypeCustom) {
if (event.event == WifiMarauderEventRefreshSubmenu) {
_refresh_submenu(app);
consumed = true;
}
}
return consumed;
}

1
applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c vendored
View File

@@ -243,7 +243,6 @@ void wifi_marauder_scene_start_on_enter(void* context) {
}
bool wifi_marauder_scene_start_on_event(void* context, SceneManagerEvent event) {
UNUSED(context);
WifiMarauderApp* app = context;
bool consumed = false;