Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 20:08:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

fbt format

Browse Source
This commit is contained in:
MX
2023-07-10 16:52:58 +03:00
parent b451fa91de
commit 9c6d0e7f21
4 changed files with 109 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,11 +27,13 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
switch(index) { switch(index) {
case SubmenuIndexS3Mode: case SubmenuIndexS3Mode:
// toggle S3 mode // toggle S3 mode
app->selected_flash_options[SelectedFlashS3Mode] = !app->selected_flash_options[SelectedFlashS3Mode]; app->selected_flash_options[SelectedFlashS3Mode] =
!app->selected_flash_options[SelectedFlashS3Mode];
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu); view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break; break;
case SubmenuIndexBoot: case SubmenuIndexBoot:
app->selected_flash_options[SelectedFlashBoot] = !app->selected_flash_options[SelectedFlashBoot]; app->selected_flash_options[SelectedFlashBoot] =
!app->selected_flash_options[SelectedFlashBoot];
if(app->selected_flash_options[SelectedFlashBoot]) { if(app->selected_flash_options[SelectedFlashBoot]) {
if(dialog_file_browser_show( if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) { app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
@@ -48,7 +50,8 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu); view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break; break;
case SubmenuIndexPart: case SubmenuIndexPart:
app->selected_flash_options[SelectedFlashPart] = !app->selected_flash_options[SelectedFlashPart]; app->selected_flash_options[SelectedFlashPart] =
!app->selected_flash_options[SelectedFlashPart];
if(dialog_file_browser_show( if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) { app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy( strncpy(
@@ -63,7 +66,8 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu); view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break; break;
case SubmenuIndexNvs: case SubmenuIndexNvs:
app->selected_flash_options[SelectedFlashNvs] = !app->selected_flash_options[SelectedFlashNvs]; app->selected_flash_options[SelectedFlashNvs] =
!app->selected_flash_options[SelectedFlashNvs];
if(dialog_file_browser_show( if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) { app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy( strncpy(
@@ -78,7 +82,8 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu); view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break; break;
case SubmenuIndexBootApp0: case SubmenuIndexBootApp0:
app->selected_flash_options[SelectedFlashBootApp0] = !app->selected_flash_options[SelectedFlashBootApp0]; app->selected_flash_options[SelectedFlashBootApp0] =
!app->selected_flash_options[SelectedFlashBootApp0];
if(dialog_file_browser_show( if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) { app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy( strncpy(
@@ -93,7 +98,8 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu); view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break; break;
case SubmenuIndexApp: case SubmenuIndexApp:
app->selected_flash_options[SelectedFlashApp] = !app->selected_flash_options[SelectedFlashApp]; app->selected_flash_options[SelectedFlashApp] =
!app->selected_flash_options[SelectedFlashApp];
if(dialog_file_browser_show( if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) { app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy( strncpy(
@@ -108,7 +114,8 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu); view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventRefreshSubmenu);
break; break;
case SubmenuIndexCustom: case SubmenuIndexCustom:
app->selected_flash_options[SelectedFlashCustom] = !app->selected_flash_options[SelectedFlashCustom]; app->selected_flash_options[SelectedFlashCustom] =
!app->selected_flash_options[SelectedFlashCustom];
if(dialog_file_browser_show( if(dialog_file_browser_show(
app->dialogs, selected_filepath, predefined_filepath, &browser_options)) { app->dialogs, selected_filepath, predefined_filepath, &browser_options)) {
strncpy( strncpy(
@@ -125,7 +132,9 @@ static void wifi_marauder_scene_flasher_callback(void* context, uint32_t index)
case SubmenuIndexFlash: case SubmenuIndexFlash:
// count how many options are selected // count how many options are selected
app->num_selected_flash_options = 0; app->num_selected_flash_options = 0;
for (bool* option = &app->selected_flash_options[SelectedFlashBoot]; option < &app->selected_flash_options[NUM_FLASH_OPTIONS]; ++option) { for(bool* option = &app->selected_flash_options[SelectedFlashBoot];
option < &app->selected_flash_options[NUM_FLASH_OPTIONS];
++option) {
if(*option) { if(*option) {
++app->num_selected_flash_options; ++app->num_selected_flash_options;
} }
@@ -159,7 +168,12 @@ static void _refresh_submenu(WifiMarauderApp* app) {
submenu_set_header(submenu, "Browse for files to flash"); submenu_set_header(submenu, "Browse for files to flash");
submenu_add_item( submenu_add_item(
submenu, app->selected_flash_options[SelectedFlashS3Mode] ? "[x] Using ESP32-S3" : "[ ] Check if using S3", SubmenuIndexS3Mode, 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; const char* strSelectBootloader = STR_UNSELECT " " STR_BOOT;
if(app->selected_flash_options[SelectedFlashS3Mode]) { if(app->selected_flash_options[SelectedFlashS3Mode]) {
if(app->selected_flash_options[SelectedFlashBoot]) { if(app->selected_flash_options[SelectedFlashBoot]) {
@@ -177,18 +191,42 @@ static void _refresh_submenu(WifiMarauderApp* app) {
submenu_add_item( submenu_add_item(
submenu, strSelectBootloader, SubmenuIndexBoot, wifi_marauder_scene_flasher_callback, app); submenu, strSelectBootloader, SubmenuIndexBoot, wifi_marauder_scene_flasher_callback, app);
submenu_add_item( submenu_add_item(
submenu, app->selected_flash_options[SelectedFlashPart] ? STR_SELECT " " STR_PART : STR_UNSELECT " " STR_PART, SubmenuIndexPart, 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_add_item(
submenu, app->selected_flash_options[SelectedFlashNvs] ? STR_SELECT " " STR_NVS : STR_UNSELECT " " STR_NVS, SubmenuIndexNvs, 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_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,
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_add_item(
submenu, app->selected_flash_options[SelectedFlashApp] ? STR_SELECT " " STR_APP : STR_UNSELECT " " STR_APP, SubmenuIndexApp, wifi_marauder_scene_flasher_callback, app); submenu,
app->selected_flash_options[SelectedFlashApp] ? STR_SELECT " " STR_APP :
STR_UNSELECT " " STR_APP,
SubmenuIndexApp,
wifi_marauder_scene_flasher_callback,
app);
// TODO: custom addr // TODO: custom addr
//submenu_add_item( //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, app->selected_flash_options[SelectedFlashCustom] ? STR_SELECT " " STR_CUSTOM : STR_UNSELECT " " STR_CUSTOM, SubmenuIndexCustom, wifi_marauder_scene_flasher_callback, app);
submenu_add_item( submenu_add_item(
submenu, app->selected_flash_options[SelectedFlashS3Mode] ? STR_FLASH_S3 : STR_FLASH, SubmenuIndexFlash, wifi_marauder_scene_flasher_callback, app); submenu,
app->selected_flash_options[SelectedFlashS3Mode] ? STR_FLASH_S3 : STR_FLASH,
SubmenuIndexFlash,
wifi_marauder_scene_flasher_callback,
app);
submenu_set_selected_item( submenu_set_selected_item(
submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneFlasher)); submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneFlasher));

14
applications/external/wifi_marauder_companion/wifi_marauder_flasher.c vendored
View File

@@ -87,7 +87,10 @@ static void _flash_all_files(WifiMarauderApp* app) {
#define NUM_FLASH_ITEMS 6 #define NUM_FLASH_ITEMS 6
FlashItem items[NUM_FLASH_ITEMS] = { FlashItem items[NUM_FLASH_ITEMS] = {
{ SelectedFlashBoot, "bootloader", app->bin_file_path_boot, app->selected_flash_options[SelectedFlashS3Mode] ? ESP_ADDR_BOOT_S3 : ESP_ADDR_BOOT }, {SelectedFlashBoot,
"bootloader",
app->bin_file_path_boot,
app->selected_flash_options[SelectedFlashS3Mode] ? ESP_ADDR_BOOT_S3 : ESP_ADDR_BOOT},
{SelectedFlashPart, "partition table", app->bin_file_path_part, ESP_ADDR_PART}, {SelectedFlashPart, "partition table", app->bin_file_path_part, ESP_ADDR_PART},
{SelectedFlashNvs, "NVS", app->bin_file_path_nvs, ESP_ADDR_NVS}, {SelectedFlashNvs, "NVS", app->bin_file_path_nvs, ESP_ADDR_NVS},
{SelectedFlashBootApp0, "boot_app0", app->bin_file_path_boot_app0, ESP_ADDR_BOOT_APP0}, {SelectedFlashBootApp0, "boot_app0", app->bin_file_path_boot_app0, ESP_ADDR_BOOT_APP0},
@@ -101,7 +104,14 @@ static void _flash_all_files(WifiMarauderApp* app) {
int current_step = 1; int current_step = 1;
for(FlashItem* item = &items[0]; item < &items[NUM_FLASH_ITEMS]; ++item) { for(FlashItem* item = &items[0]; item < &items[NUM_FLASH_ITEMS]; ++item) {
if(app->selected_flash_options[item->selected]) { if(app->selected_flash_options[item->selected]) {
snprintf(user_msg, sizeof(user_msg), "Flashing %s (%d/%d) to address 0x%lx\n", item->description, current_step++, num_steps, item->addr); snprintf(
user_msg,
sizeof(user_msg),
"Flashing %s (%d/%d) to address 0x%lx\n",
item->description,
current_step++,
num_steps,
item->addr);
loader_port_debug_print(user_msg); loader_port_debug_print(user_msg);
err = _flash_file(app, item->path, item->addr); err = _flash_file(app, item->path, item->addr);
if(err) { if(err) {