update companions to newer fz sdk

Signed-off-by: Antonio Murdaca <antoniomurdaca@gmail.com>

application.fam

@@ -1,14 +1,14 @@
 App(
     appid="mayhem_marauder",
-    name="[MAYHEM] Marauder v0.6.6",
-    fap_version=(6,6),
+    name="[MAYHEM] Marauder",
+    fap_version=(6, 6),
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
     requires=["gui"],
     stack_size=4 * 1024,
     order=2,
     fap_icon="wifi_10px.png",
-    fap_category="GPIO",
+    fap_category="GPIO/MAYHEM",
     fap_icon_assets="assets",
     fap_description="ESP32-CAM version of Marauder. Includes all functionality from the original plus some options to trigger the camera and flashlight. [Unplug the USB cable to test with Mayhem]",
 )

scenes/wifi_marauder_scene_console_output.c

@@ -122,15 +122,11 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
                 app->log_file_path,
                 sequential_file_resolve_path(
                     app->storage, MARAUDER_APP_FOLDER_LOGS, prefix, "log"));
-            if(app->log_file_path != NULL) {
-                if(storage_file_open(
-                       app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
-                    app->is_writing_log = true;
-                } else {
-                    dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
-                }
+            if(storage_file_open(
+                   app->log_file, app->log_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
+                app->is_writing_log = true;
             } else {
-                dialog_message_show_storage_error(app->dialogs, "Cannot resolve log path");
+                dialog_message_show_storage_error(app->dialogs, "Cannot open log file");
             }
         }
 
@@ -157,11 +153,11 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
         // Send command with newline '\n'
         if(app->selected_tx_string) {
             wifi_marauder_uart_tx(
-                (uint8_t*)(app->selected_tx_string), strlen(app->selected_tx_string));
-            wifi_marauder_uart_tx((uint8_t*)("\n"), 1);
+                app->uart, (uint8_t*)(app->selected_tx_string), strlen(app->selected_tx_string));
+            wifi_marauder_uart_tx(app->uart, (uint8_t*)("\n"), 1);
             if(send_html && the_html) {
-                wifi_marauder_uart_tx(the_html, html_size);
-                wifi_marauder_uart_tx((uint8_t*)("\n"), 1);
+                wifi_marauder_uart_tx(app->uart, the_html, html_size);
+                wifi_marauder_uart_tx(app->uart, (uint8_t*)("\n"), 1);
                 free(the_html);
                 send_html = false;
             }
@@ -169,7 +165,7 @@ void wifi_marauder_scene_console_output_on_enter(void* context) {
 
         // Run the script if the file with the script has been opened
         if(app->script != NULL) {
-            app->script_worker = wifi_marauder_script_worker_alloc();
+            app->script_worker = wifi_marauder_script_worker_alloc(app->uart);
             wifi_marauder_script_worker_start(app->script_worker, app->script);
         }
     }
@@ -195,7 +191,7 @@ void wifi_marauder_scene_console_output_on_exit(void* context) {
 
     // Automatically stop the scan when exiting view
     if(app->is_command) {
-        wifi_marauder_uart_tx((uint8_t*)("stopscan\n"), strlen("stopscan\n"));
+        wifi_marauder_uart_tx(app->uart, (uint8_t*)("stopscan\n"), strlen("stopscan\n"));
         furi_delay_ms(50);
     }
 

scenes/wifi_marauder_scene_script_confirm_delete.c

@@ -63,8 +63,8 @@ bool wifi_marauder_scene_script_confirm_delete_on_event(void* context, SceneMana
                 app->script = NULL;
 
                 DialogMessage* message = dialog_message_alloc();
-                dialog_message_set_text(message, "Deleted!", 88, 32, AlignCenter, AlignCenter);
-                dialog_message_set_icon(message, &I_DolphinCommon_56x48, 5, 6);
+                dialog_message_set_text(message, "Deleted!", 83, 19, AlignLeft, AlignBottom);
+                dialog_message_set_icon(message, &I_DolphinMafia_119x62, 0, 2);
                 dialog_message_set_buttons(message, NULL, "Ok", NULL);
                 dialog_message_show(app->dialogs, message);
                 dialog_message_free(message);

scenes/wifi_marauder_scene_script_options.c

@@ -19,8 +19,8 @@ void wifi_marauder_scene_script_options_save_script(WifiMarauderApp* app) {
     wifi_marauder_script_save_json(app->storage, script_path, app->script);
 
     DialogMessage* message = dialog_message_alloc();
-    dialog_message_set_text(message, "Saved!", 88, 32, AlignCenter, AlignCenter);
-    dialog_message_set_icon(message, &I_DolphinCommon_56x48, 5, 6);
+    dialog_message_set_text(message, "Saved!", 5, 7, AlignLeft, AlignTop);
+    dialog_message_set_icon(message, &I_DolphinDone_80x58, 36, 5);
     dialog_message_set_buttons(message, NULL, "Ok", NULL);
     dialog_message_show(app->dialogs, message);
     dialog_message_free(message);

scenes/wifi_marauder_scene_text_input.c

@@ -44,24 +44,24 @@ void wifi_marauder_scene_text_input_on_enter(void* context) {
     }
 
     // Setup view
-    WIFI_TextInput* text_input = app->text_input;
+    TextInput* text_input = app->text_input;
     // Add help message to header
     if(app->special_case_input_step == 1) {
-        wifi_text_input_set_header_text(text_input, "Enter source MAC");
+        text_input_set_header_text(text_input, "Enter source MAC");
     } else if(0 == strncmp("ssid -a -g", app->selected_tx_string, strlen("ssid -a -g"))) {
-        wifi_text_input_set_header_text(text_input, "Enter # SSIDs to generate");
+        text_input_set_header_text(text_input, "Enter # SSIDs to generate");
     } else if(0 == strncmp("ssid -a -n", app->selected_tx_string, strlen("ssid -a -n"))) {
-        wifi_text_input_set_header_text(text_input, "Enter SSID name to add");
+        text_input_set_header_text(text_input, "Enter SSID name to add");
     } else if(0 == strncmp("ssid -r", app->selected_tx_string, strlen("ssid -r"))) {
-        wifi_text_input_set_header_text(text_input, "Remove target from SSID list");
+        text_input_set_header_text(text_input, "Remove target from SSID list");
     } else if(0 == strncmp("select -a", app->selected_tx_string, strlen("select -a"))) {
-        wifi_text_input_set_header_text(text_input, "Add target from AP list");
+        text_input_set_header_text(text_input, "Add target from AP list");
     } else if(0 == strncmp("select -s", app->selected_tx_string, strlen("select -s"))) {
-        wifi_text_input_set_header_text(text_input, "Add target from SSID list");
+        text_input_set_header_text(text_input, "Add target from SSID list");
     } else {
-        wifi_text_input_set_header_text(text_input, "Add command arguments");
+        text_input_set_header_text(text_input, "Add command arguments");
     }
-    wifi_text_input_set_result_callback(
+    text_input_set_result_callback(
         text_input,
         wifi_marauder_scene_text_input_callback,
         app,
@@ -84,7 +84,7 @@ bool wifi_marauder_scene_text_input_on_event(void* context, SceneManagerEvent ev
             consumed = true;
         } else if(event.event == WifiMarauderEventSaveSourceMac) {
             if(12 != strlen(app->text_input_store)) {
-                wifi_text_input_set_header_text(app->text_input, "MAC must be 12 hex chars!");
+                text_input_set_header_text(app->text_input, "MAC must be 12 hex chars!");
             } else {
                 snprintf(
                     app->special_case_input_src_addr,
@@ -106,12 +106,12 @@ bool wifi_marauder_scene_text_input_on_event(void* context, SceneManagerEvent ev
                 // Advance scene to input destination MAC, clear text input
                 app->special_case_input_step = 2;
                 bzero(app->text_input_store, WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE);
-                wifi_text_input_set_header_text(app->text_input, "Enter destination MAC");
+                text_input_set_header_text(app->text_input, "Enter destination MAC");
             }
             consumed = true;
         } else if(event.event == WifiMarauderEventSaveDestinationMac) {
             if(12 != strlen(app->text_input_store)) {
-                wifi_text_input_set_header_text(app->text_input, "MAC must be 12 hex chars!");
+                text_input_set_header_text(app->text_input, "MAC must be 12 hex chars!");
             } else {
                 snprintf(
                     app->special_case_input_dst_addr,
@@ -150,5 +150,5 @@ bool wifi_marauder_scene_text_input_on_event(void* context, SceneManagerEvent ev
 void wifi_marauder_scene_text_input_on_exit(void* context) {
     WifiMarauderApp* app = context;
 
-    wifi_text_input_reset(app->text_input);
+    text_input_reset(app->text_input);
 }

scenes/wifi_marauder_scene_user_input.c

@@ -100,19 +100,20 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
     switch(app->user_input_type) {
     // Loads the string value of the reference
     case WifiMarauderUserInputTypeString:
-        wifi_text_input_set_header_text(app->text_input, "Enter value:");
-        wifi_text_input_set_validator(app->text_input, NULL, app);
+        text_input_set_header_text(app->text_input, "Enter value:");
+        text_input_set_validator(app->text_input, NULL, app);
         if(app->user_input_string_reference != NULL) {
             strncpy(
                 app->text_input_store,
                 *app->user_input_string_reference,
                 strlen(*app->user_input_string_reference) + 1);
         }
+        text_input_add_illegal_symbols(app->text_input);
         break;
     // Loads the numerical value of the reference
     case WifiMarauderUserInputTypeNumber:
-        wifi_text_input_set_header_text(app->text_input, "Enter a valid number:");
-        wifi_text_input_set_validator(
+        text_input_set_header_text(app->text_input, "Enter a valid number:");
+        text_input_set_validator(
             app->text_input, wifi_marauder_scene_user_input_validator_number_callback, app);
         if(app->user_input_number_reference != NULL) {
             char number_str[32];
@@ -122,8 +123,8 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
         break;
     // File name
     case WifiMarauderUserInputTypeFileName:
-        wifi_text_input_set_header_text(app->text_input, "Enter file name:");
-        wifi_text_input_set_validator(
+        text_input_set_header_text(app->text_input, "Enter file name:");
+        text_input_set_validator(
             app->text_input, wifi_marauder_scene_user_input_validator_file_callback, app);
         break;
     default:
@@ -131,7 +132,7 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
         return;
     }
 
-    wifi_text_input_set_result_callback(
+    text_input_set_result_callback(
         app->text_input,
         wifi_marauder_scene_user_input_ok_callback,
         app,
@@ -155,11 +156,10 @@ bool wifi_marauder_scene_user_input_on_event(void* context, SceneManagerEvent ev
     }
 
     return consumed;
-
 }
 
 void wifi_marauder_scene_user_input_on_exit(void* context) {
     WifiMarauderApp* app = context;
     memset(app->text_input_store, 0, sizeof(app->text_input_store));
-    wifi_text_input_reset(app->text_input);
+    text_input_reset(app->text_input);
 }

script/wifi_marauder_script_executor.c

@@ -5,20 +5,20 @@ void _wifi_marauder_script_delay(WifiMarauderScriptWorker* worker, uint32_t dela
     for(uint32_t i = 0; i < delay_secs && worker->is_running; i++) furi_delay_ms(1000);
 }
 
-void _send_stop() {
+void _send_stop(WifiMarauderScriptWorker* worker) {
     const char stop_command[] = "stopscan\n";
-    wifi_marauder_uart_tx((uint8_t*)(stop_command), strlen(stop_command));
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)(stop_command), strlen(stop_command));
 }
 
-void _send_line_break() {
-    wifi_marauder_uart_tx((uint8_t*)("\n"), 1);
+void _send_line_break(WifiMarauderScriptWorker* worker) {
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)("\n"), 1);
 }
 
-void _send_channel_select(int channel) {
+void _send_channel_select(WifiMarauderScriptWorker* worker, int channel) {
     char command[30];
-    _send_line_break();
+    _send_line_break(worker);
     snprintf(command, sizeof(command), "channel -s %d\n", channel);
-    wifi_marauder_uart_tx((uint8_t*)(command), strlen(command));
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)(command), strlen(command));
 }
 
 void _wifi_marauder_script_execute_scan(
@@ -27,7 +27,7 @@ void _wifi_marauder_script_execute_scan(
     char command[15];
     // Set channel
     if(stage->channel > 0) {
-        _send_channel_select(stage->channel);
+        _send_channel_select(worker, stage->channel);
     }
     // Start scan
     if(stage->type == WifiMarauderScriptScanTypeAp) {
@@ -35,12 +35,14 @@ void _wifi_marauder_script_execute_scan(
     } else {
         snprintf(command, sizeof(command), "scansta\n");
     }
-    wifi_marauder_uart_tx((uint8_t*)(command), strlen(command));
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)(command), strlen(command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
-void _wifi_marauder_script_execute_select(WifiMarauderScriptStageSelect* stage) {
+void _wifi_marauder_script_execute_select(
+    WifiMarauderScriptStageSelect* stage,
+    WifiMarauderScriptWorker* worker) {
     const char* select_type = NULL;
     switch(stage->type) {
     case WifiMarauderScriptSelectTypeAp:
@@ -79,61 +81,61 @@ void _wifi_marauder_script_execute_select(WifiMarauderScriptStageSelect* stage)
             command, sizeof(command), "select %s -f \"%s\"\n", select_type, stage->filter);
     }
 
-    wifi_marauder_uart_tx((uint8_t*)command, command_length);
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)command, command_length);
 }
 
 void _wifi_marauder_script_execute_deauth(
     WifiMarauderScriptStageDeauth* stage,
     WifiMarauderScriptWorker* worker) {
     const char attack_command[] = "attack -t deauth\n";
-    wifi_marauder_uart_tx((uint8_t*)(attack_command), strlen(attack_command));
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)(attack_command), strlen(attack_command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
 void _wifi_marauder_script_execute_probe(
     WifiMarauderScriptStageProbe* stage,
     WifiMarauderScriptWorker* worker) {
     const char attack_command[] = "attack -t probe\n";
-    wifi_marauder_uart_tx((uint8_t*)(attack_command), strlen(attack_command));
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)(attack_command), strlen(attack_command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
 void _wifi_marauder_script_execute_sniff_raw(
     WifiMarauderScriptStageSniffRaw* stage,
     WifiMarauderScriptWorker* worker) {
-    const char sniff_command[] = "sniffraw\n";
-    wifi_marauder_uart_tx((uint8_t*)sniff_command, strlen(sniff_command));
+    const char sniff_command[] = "sniffraw -serial\n";
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)sniff_command, strlen(sniff_command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
 void _wifi_marauder_script_execute_sniff_beacon(
     WifiMarauderScriptStageSniffBeacon* stage,
     WifiMarauderScriptWorker* worker) {
-    const char sniff_command[] = "sniffbeacon\n";
-    wifi_marauder_uart_tx((uint8_t*)sniff_command, strlen(sniff_command));
+    const char sniff_command[] = "sniffbeacon -serial\n";
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)sniff_command, strlen(sniff_command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
 void _wifi_marauder_script_execute_sniff_deauth(
     WifiMarauderScriptStageSniffDeauth* stage,
     WifiMarauderScriptWorker* worker) {
-    const char sniff_command[] = "sniffdeauth\n";
-    wifi_marauder_uart_tx((uint8_t*)sniff_command, strlen(sniff_command));
+    const char sniff_command[] = "sniffdeauth -serial\n";
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)sniff_command, strlen(sniff_command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
 void _wifi_marauder_script_execute_sniff_esp(
     WifiMarauderScriptStageSniffEsp* stage,
     WifiMarauderScriptWorker* worker) {
-    const char sniff_command[] = "sniffesp\n";
-    wifi_marauder_uart_tx((uint8_t*)sniff_command, strlen(sniff_command));
+    const char sniff_command[] = "sniffesp -serial\n";
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)sniff_command, strlen(sniff_command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
 void _wifi_marauder_script_execute_sniff_pmkid(
@@ -150,10 +152,10 @@ void _wifi_marauder_script_execute_sniff_pmkid(
                 len += snprintf(attack_command + len, sizeof(attack_command) - len, " -d");
             }
 
-            len += snprintf(attack_command + len, sizeof(attack_command) - len, "\n");
-            wifi_marauder_uart_tx((uint8_t*)attack_command, len);
+            len += snprintf(attack_command + len, sizeof(attack_command) - len, " -serial\n");
+            wifi_marauder_uart_tx(worker->uart, (uint8_t*)attack_command, len);
             _wifi_marauder_script_delay(worker, stage->timeout);
-            _send_stop();
+            _send_stop(worker);
         }
     } else {
         char attack_command[50] = "sniffpmkid";
@@ -167,27 +169,27 @@ void _wifi_marauder_script_execute_sniff_pmkid(
         if(stage->force_deauth) {
             len += snprintf(attack_command + len, sizeof(attack_command) - len, " -d");
         }
-        len += snprintf(attack_command + len, sizeof(attack_command) - len, "\n");
-        wifi_marauder_uart_tx((uint8_t*)attack_command, len);
+        len += snprintf(attack_command + len, sizeof(attack_command) - len, " -serial\n");
+        wifi_marauder_uart_tx(worker->uart, (uint8_t*)attack_command, len);
         _wifi_marauder_script_delay(worker, stage->timeout);
-        _send_stop();
+        _send_stop(worker);
     }
 }
 
 void _wifi_marauder_script_execute_sniff_pwn(
     WifiMarauderScriptStageSniffPwn* stage,
     WifiMarauderScriptWorker* worker) {
-    const char sniff_command[] = "sniffpwn\n";
-    wifi_marauder_uart_tx((uint8_t*)sniff_command, strlen(sniff_command));
+    const char sniff_command[] = "sniffpwn -serial\n";
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)sniff_command, strlen(sniff_command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
 void _wifi_marauder_script_execute_beacon_list(
     WifiMarauderScriptStageBeaconList* stage,
     WifiMarauderScriptWorker* worker) {
     const char clearlist_command[] = "clearlist -s\n";
-    wifi_marauder_uart_tx((uint8_t*)(clearlist_command), strlen(clearlist_command));
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)(clearlist_command), strlen(clearlist_command));
 
     char command[100];
     char* ssid;
@@ -195,8 +197,8 @@ void _wifi_marauder_script_execute_beacon_list(
     for(int i = 0; i < stage->ssid_count; i++) {
         ssid = stage->ssids[i];
         snprintf(command, sizeof(command), "ssid -a -n \"%s\"", ssid);
-        wifi_marauder_uart_tx((uint8_t*)(command), strlen(command));
-        _send_line_break();
+        wifi_marauder_uart_tx(worker->uart, (uint8_t*)(command), strlen(command));
+        _send_line_break(worker);
     }
     if(stage->random_ssids > 0) {
         char add_random_command[50];
@@ -205,27 +207,30 @@ void _wifi_marauder_script_execute_beacon_list(
             sizeof(add_random_command),
             "ssid -a -r -g %d\n",
             stage->random_ssids);
-        wifi_marauder_uart_tx((uint8_t*)add_random_command, strlen(add_random_command));
+        wifi_marauder_uart_tx(
+            worker->uart, (uint8_t*)add_random_command, strlen(add_random_command));
     }
     const char attack_command[] = "attack -t beacon -l\n";
-    wifi_marauder_uart_tx((uint8_t*)(attack_command), strlen(attack_command));
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)(attack_command), strlen(attack_command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
 void _wifi_marauder_script_execute_beacon_ap(
     WifiMarauderScriptStageBeaconAp* stage,
     WifiMarauderScriptWorker* worker) {
     const char command[] = "attack -t beacon -a\n";
-    wifi_marauder_uart_tx((uint8_t*)command, strlen(command));
+    wifi_marauder_uart_tx(worker->uart, (uint8_t*)command, strlen(command));
     _wifi_marauder_script_delay(worker, stage->timeout);
-    _send_stop();
+    _send_stop(worker);
 }
 
-void _wifi_marauder_script_execute_exec(WifiMarauderScriptStageExec* stage) {
+void _wifi_marauder_script_execute_exec(
+    WifiMarauderScriptStageExec* stage,
+    WifiMarauderScriptWorker* worker) {
     if(stage->command != NULL) {
-        wifi_marauder_uart_tx((uint8_t*)stage->command, strlen(stage->command));
-        _send_line_break();
+        wifi_marauder_uart_tx(worker->uart, (uint8_t*)stage->command, strlen(stage->command));
+        _send_line_break(worker);
     }
 }
 
@@ -248,8 +253,8 @@ void wifi_marauder_script_execute_start(void* context) {
             sizeof(command),
             "settings -s EnableLED %s",
             script->enable_led ? "enable" : "disable");
-        wifi_marauder_uart_tx((uint8_t*)command, strlen(command));
-        _send_line_break();
+        wifi_marauder_uart_tx(worker->uart, (uint8_t*)command, strlen(command));
+        _send_line_break(worker);
     }
 
     // Enables or disables PCAP saving according to script settings
@@ -259,8 +264,8 @@ void wifi_marauder_script_execute_start(void* context) {
             sizeof(command),
             "settings -s SavePCAP %s",
             script->save_pcap ? "enable" : "disable");
-        wifi_marauder_uart_tx((uint8_t*)command, strlen(command));
-        _send_line_break();
+        wifi_marauder_uart_tx(worker->uart, (uint8_t*)command, strlen(command));
+        _send_line_break(worker);
     }
 }
 
@@ -274,7 +279,7 @@ void wifi_marauder_script_execute_stage(WifiMarauderScriptStage* stage, void* co
         _wifi_marauder_script_execute_scan((WifiMarauderScriptStageScan*)stage_data, worker);
         break;
     case WifiMarauderScriptStageTypeSelect:
-        _wifi_marauder_script_execute_select((WifiMarauderScriptStageSelect*)stage_data);
+        _wifi_marauder_script_execute_select((WifiMarauderScriptStageSelect*)stage_data, worker);
         break;
     case WifiMarauderScriptStageTypeDeauth:
         _wifi_marauder_script_execute_deauth((WifiMarauderScriptStageDeauth*)stage_data, worker);
@@ -315,7 +320,7 @@ void wifi_marauder_script_execute_stage(WifiMarauderScriptStage* stage, void* co
             (WifiMarauderScriptStageBeaconAp*)stage_data, worker);
         break;
     case WifiMarauderScriptStageTypeExec:
-        _wifi_marauder_script_execute_exec((WifiMarauderScriptStageExec*)stage_data);
+        _wifi_marauder_script_execute_exec((WifiMarauderScriptStageExec*)stage_data, worker);
         break;
     case WifiMarauderScriptStageTypeDelay:
         _wifi_marauder_script_execute_delay((WifiMarauderScriptStageDelay*)stage_data, worker);

script/wifi_marauder_script_worker.c

@@ -1,7 +1,7 @@
 #include "../wifi_marauder_app_i.h"
 #include "wifi_marauder_script_worker.h"
 
-WifiMarauderScriptWorker* wifi_marauder_script_worker_alloc() {
+WifiMarauderScriptWorker* wifi_marauder_script_worker_alloc(WifiMarauderUart* uart) {
     WifiMarauderScriptWorker* worker = malloc(sizeof(WifiMarauderScriptWorker));
     if(worker == NULL) {
         return NULL;
@@ -9,6 +9,7 @@ WifiMarauderScriptWorker* wifi_marauder_script_worker_alloc() {
     worker->callback_start = NULL;
     worker->callback_stage = NULL;
     worker->worker_thread = NULL;
+    worker->uart = uart;
     worker->is_running = false;
     return worker;
 }

script/wifi_marauder_script_worker.h

@@ -11,6 +11,7 @@ typedef enum {
 typedef struct WifiMarauderScriptWorker {
     WifiMarauderScript* script;
     FuriThread* worker_thread;
+    WifiMarauderUart* uart;
     void (*callback_start)(void*);
     void (*callback_stage)(WifiMarauderScriptStage*, void*);
     void* context;

wifi_marauder_app.c

@@ -2,6 +2,7 @@
 
 #include <furi.h>
 #include <furi_hal.h>
+#include <expansion/expansion.h>
 
 static bool wifi_marauder_app_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
@@ -64,11 +65,9 @@ WifiMarauderApp* wifi_marauder_app_alloc() {
     app->text_box_store = furi_string_alloc();
     furi_string_reserve(app->text_box_store, WIFI_MARAUDER_TEXT_BOX_STORE_SIZE);
 
-    app->text_input = wifi_text_input_alloc();
+    app->text_input = text_input_alloc();
     view_dispatcher_add_view(
-        app->view_dispatcher,
-        WifiMarauderAppViewTextInput,
-        wifi_text_input_get_view(app->text_input));
+        app->view_dispatcher, WifiMarauderAppViewTextInput, text_input_get_view(app->text_input));
 
     app->widget = widget_alloc();
     view_dispatcher_add_view(
@@ -148,7 +147,7 @@ void wifi_marauder_app_free(WifiMarauderApp* app) {
     widget_free(app->widget);
     text_box_free(app->text_box);
     furi_string_free(app->text_box_store);
-    wifi_text_input_free(app->text_input);
+    text_input_free(app->text_input);
     submenu_free(app->submenu);
     variable_item_list_free(app->var_item_list);
     storage_file_free(app->capture_file);
@@ -173,17 +172,17 @@ void wifi_marauder_app_free(WifiMarauderApp* app) {
 
 int32_t wifi_marauder_app(void* p) {
     UNUSED(p);
-    furi_hal_power_disable_external_3_3v();
-    furi_hal_power_disable_otg();
-    furi_delay_ms(200);
-    furi_hal_power_enable_external_3_3v();
-    furi_hal_power_enable_otg();
-    for(int i=0;i<2;i++)
-    {
-        furi_delay_ms(500); 
-        furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t[1]){'w'}, 1);
+
+    // Disable expansion protocol to avoid interference with UART Handle
+    Expansion* expansion = furi_record_open(RECORD_EXPANSION);
+    expansion_disable(expansion);
+
+    uint8_t attempts = 0;
+    while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
+        furi_hal_power_enable_otg();
+        furi_delay_ms(10);
     }
-    furi_delay_ms(1);
+    furi_delay_ms(200);
 
     WifiMarauderApp* wifi_marauder_app = wifi_marauder_app_alloc();
 
@@ -192,6 +191,11 @@ int32_t wifi_marauder_app(void* p) {
 
     wifi_marauder_app->uart = wifi_marauder_usart_init(wifi_marauder_app);
     wifi_marauder_app->lp_uart = wifi_marauder_lp_uart_init(wifi_marauder_app);
+    for(int i = 0; i < 2; i++) {
+        furi_delay_ms(500);
+        wifi_marauder_uart_tx(wifi_marauder_app->uart, (uint8_t[1]){'w'}, 1);
+    }
+    furi_delay_ms(1);
 
     view_dispatcher_run(wifi_marauder_app->view_dispatcher);
 
@@ -201,5 +205,9 @@ int32_t wifi_marauder_app(void* p) {
         furi_hal_power_disable_otg();
     }
 
+    // Return previous state of expansion
+    expansion_enable(expansion);
+    furi_record_close(RECORD_EXPANSION);
+
     return 0;
 }

wifi_marauder_app_i.h

@@ -20,13 +20,15 @@
 #include <gui/modules/submenu.h>
 #include <gui/modules/variable_item_list.h>
 #include <gui/modules/widget.h>
-#include "wifi_marauder_text_input.h"
+#include <gui/modules/text_input.h>
 
 #include <mayhem_marauder_icons.h>
 #include <storage/storage.h>
 #include <lib/toolbox/path.h>
 #include <dialogs/dialogs.h>
 
+#include <assets_icons.h>
+
 #define NUM_MENU_ITEMS (22)
 
 #define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
@@ -59,7 +61,7 @@ struct WifiMarauderApp {
     FuriString* text_box_store;
     size_t text_box_store_strlen;
     TextBox* text_box;
-    WIFI_TextInput* text_input;
+    TextInput* text_input;
     Storage* storage;
     File* capture_file;
     File* log_file;

wifi_marauder_text_input.c

@@ -1,749 +0,0 @@
-#include "wifi_marauder_text_input.h"
-#include <gui/elements.h>
-#include "wifi_marauder_app_i.h"
-#include <furi.h>
-
-struct WIFI_TextInput {
-    View* view;
-    FuriTimer* timer;
-};
-
-typedef struct {
-    const char text;
-    const uint8_t x;
-    const uint8_t y;
-} WIFI_TextInputKey;
-
-typedef struct {
-    const WIFI_TextInputKey* rows[3];
-    const uint8_t keyboard_index;
-} Keyboard;
-
-typedef struct {
-    const char* header;
-    char* text_buffer;
-    size_t text_buffer_size;
-    size_t minimum_length;
-    bool clear_default_text;
-
-    bool cursor_select;
-    size_t cursor_pos;
-
-    WIFI_TextInputCallback callback;
-    void* callback_context;
-
-    uint8_t selected_row;
-    uint8_t selected_column;
-    uint8_t selected_keyboard;
-
-    WIFI_TextInputValidatorCallback validator_callback;
-    void* validator_callback_context;
-    FuriString* validator_text;
-    bool validator_message_visible;
-} WIFI_TextInputModel;
-
-static const uint8_t keyboard_origin_x = 1;
-static const uint8_t keyboard_origin_y = 29;
-static const uint8_t keyboard_row_count = 3;
-static const uint8_t keyboard_count = 2;
-
-#define ENTER_KEY '\r'
-#define BACKSPACE_KEY '\b'
-#define SWITCH_KEYBOARD_KEY 0xfe
-
-static const WIFI_TextInputKey keyboard_keys_row_1[] = {
-    {'q', 1, 8},
-    {'w', 10, 8},
-    {'e', 19, 8},
-    {'r', 28, 8},
-    {'t', 37, 8},
-    {'y', 46, 8},
-    {'u', 55, 8},
-    {'i', 64, 8},
-    {'o', 73, 8},
-    {'p', 82, 8},
-    {'0', 91, 8},
-    {'1', 100, 8},
-    {'2', 110, 8},
-    {'3', 120, 8},
-};
-
-static const WIFI_TextInputKey keyboard_keys_row_2[] = {
-    {'a', 1, 20},
-    {'s', 10, 20},
-    {'d', 19, 20},
-    {'f', 28, 20},
-    {'g', 37, 20},
-    {'h', 46, 20},
-    {'j', 55, 20},
-    {'k', 64, 20},
-    {'l', 73, 20},
-    {BACKSPACE_KEY, 82, 12},
-    {'4', 100, 20},
-    {'5', 110, 20},
-    {'6', 120, 20},
-};
-
-static const WIFI_TextInputKey keyboard_keys_row_3[] = {
-    {SWITCH_KEYBOARD_KEY, 1, 23},
-    {'z', 13, 32},
-    {'x', 21, 32},
-    {'c', 28, 32},
-    {'v', 36, 32},
-    {'b', 44, 32},
-    {'n', 52, 32},
-    {'m', 59, 32},
-    {'_', 67, 32},
-    {ENTER_KEY, 74, 23},
-    {'7', 100, 32},
-    {'8', 110, 32},
-    {'9', 120, 32},
-};
-
-static const WIFI_TextInputKey symbol_keyboard_keys_row_1[] = {
-    {'!', 2, 8},
-    {'@', 12, 8},
-    {'#', 22, 8},
-    {'$', 32, 8},
-    {'%', 42, 8},
-    {'^', 52, 8},
-    {'&', 62, 8},
-    {'(', 71, 8},
-    {')', 81, 8},
-    {'0', 91, 8},
-    {'1', 100, 8},
-    {'2', 110, 8},
-    {'3', 120, 8},
-};
-
-static const WIFI_TextInputKey symbol_keyboard_keys_row_2[] = {
-    {'~', 2, 20},
-    {'+', 12, 20},
-    {'-', 22, 20},
-    {'=', 32, 20},
-    {'[', 42, 20},
-    {']', 52, 20},
-    {'{', 62, 20},
-    {'}', 72, 20},
-    {BACKSPACE_KEY, 82, 12},
-    {'4', 100, 20},
-    {'5', 110, 20},
-    {'6', 120, 20},
-};
-
-static const WIFI_TextInputKey symbol_keyboard_keys_row_3[] = {
-    {SWITCH_KEYBOARD_KEY, 1, 23},
-    {'.', 15, 32},
-    {',', 29, 32},
-    {';', 41, 32},
-    {'`', 53, 32},
-    {'\'', 65, 32},
-    {ENTER_KEY, 74, 23},
-    {'7', 100, 32},
-    {'8', 110, 32},
-    {'9', 120, 32},
-};
-
-static const Keyboard keyboard = {
-    .rows =
-        {
-            keyboard_keys_row_1,
-            keyboard_keys_row_2,
-            keyboard_keys_row_3,
-        },
-    .keyboard_index = 0,
-};
-
-static const Keyboard symbol_keyboard = {
-    .rows =
-        {
-            symbol_keyboard_keys_row_1,
-            symbol_keyboard_keys_row_2,
-            symbol_keyboard_keys_row_3,
-        },
-    .keyboard_index = 1,
-};
-
-static const Keyboard* keyboards[] = {
-    &keyboard,
-    &symbol_keyboard,
-};
-
-static void switch_keyboard(WIFI_TextInputModel* model) {
-    model->selected_keyboard = (model->selected_keyboard + 1) % keyboard_count;
-}
-
-static uint8_t get_row_size(const Keyboard* keyboard, uint8_t row_index) {
-    uint8_t row_size = 0;
-    if(keyboard == &symbol_keyboard) {
-        switch(row_index + 1) {
-        case 1:
-            row_size = COUNT_OF(symbol_keyboard_keys_row_1);
-            break;
-        case 2:
-            row_size = COUNT_OF(symbol_keyboard_keys_row_2);
-            break;
-        case 3:
-            row_size = COUNT_OF(symbol_keyboard_keys_row_3);
-            break;
-        default:
-            furi_crash(NULL);
-        }
-    } else {
-        switch(row_index + 1) {
-        case 1:
-            row_size = COUNT_OF(keyboard_keys_row_1);
-            break;
-        case 2:
-            row_size = COUNT_OF(keyboard_keys_row_2);
-            break;
-        case 3:
-            row_size = COUNT_OF(keyboard_keys_row_3);
-            break;
-        default:
-            furi_crash(NULL);
-        }
-    }
-
-    return row_size;
-}
-
-static const WIFI_TextInputKey* get_row(const Keyboard* keyboard, uint8_t row_index) {
-    const WIFI_TextInputKey* row = NULL;
-    if(row_index < 3) {
-        row = keyboard->rows[row_index];
-    } else {
-        furi_crash(NULL);
-    }
-
-    return row;
-}
-
-static char get_selected_char(WIFI_TextInputModel* model) {
-    return get_row(
-               keyboards[model->selected_keyboard], model->selected_row)[model->selected_column]
-        .text;
-}
-
-static bool char_is_lowercase(char letter) {
-    return (letter >= 0x61 && letter <= 0x7A);
-}
-
-static char char_to_uppercase(const char letter) {
-    if(letter == '_') {
-        return 0x20;
-    } else if(char_is_lowercase(letter)) {
-        return (letter - 0x20);
-    } else {
-        return letter;
-    }
-}
-
-static void wifi_text_input_backspace_cb(WIFI_TextInputModel* model) {
-    if(model->clear_default_text) {
-        model->text_buffer[0] = 0;
-        model->cursor_pos = 0;
-    } else if(model->cursor_pos > 0) {
-        char* move = model->text_buffer + model->cursor_pos;
-        memmove(move - 1, move, strlen(move) + 1);
-        model->cursor_pos--;
-    }
-}
-
-static void wifi_text_input_view_draw_callback(Canvas* canvas, void* _model) {
-    WIFI_TextInputModel* model = _model;
-    uint8_t text_length = model->text_buffer ? strlen(model->text_buffer) : 0;
-    uint8_t needed_string_width = canvas_width(canvas) - 8;
-    uint8_t start_pos = 4;
-
-    model->cursor_pos = model->cursor_pos > text_length ? text_length : model->cursor_pos;
-    size_t cursor_pos = model->cursor_pos;
-
-    canvas_clear(canvas);
-    canvas_set_color(canvas, ColorBlack);
-
-    canvas_draw_str(canvas, 2, 8, model->header);
-    elements_slightly_rounded_frame(canvas, 1, 12, 126, 15);
-
-    char buf[model->text_buffer_size + 1];
-    if(model->text_buffer) {
-        strlcpy(buf, model->text_buffer, sizeof(buf));
-    }
-    char* str = buf;
-
-    if(model->clear_default_text) {
-        elements_slightly_rounded_box(
-            canvas, start_pos - 1, 14, canvas_string_width(canvas, str) + 2, 10);
-        canvas_set_color(canvas, ColorWhite);
-    } else {
-        char* move = str + cursor_pos;
-        memmove(move + 1, move, strlen(move) + 1);
-        str[cursor_pos] = '|';
-    }
-
-    if(cursor_pos > 0 && canvas_string_width(canvas, str) > needed_string_width) {
-        canvas_draw_str(canvas, start_pos, 22, "...");
-        start_pos += 6;
-        needed_string_width -= 8;
-        for(uint32_t off = 0;
-            strlen(str) && canvas_string_width(canvas, str) > needed_string_width &&
-            off < cursor_pos;
-            off++) {
-            str++;
-        }
-    }
-
-    if(canvas_string_width(canvas, str) > needed_string_width) {
-        needed_string_width -= 4;
-        size_t len = strlen(str);
-        while(len && canvas_string_width(canvas, str) > needed_string_width) {
-            str[len--] = '\0';
-        }
-        //strcat(str, "..."); // TODO - find replacement
-    }
-
-    canvas_draw_str(canvas, start_pos, 22, str);
-
-    canvas_set_font(canvas, FontKeyboard);
-
-    for(uint8_t row = 0; row < keyboard_row_count; row++) {
-        const uint8_t column_count = get_row_size(keyboards[model->selected_keyboard], row);
-        const WIFI_TextInputKey* keys = get_row(keyboards[model->selected_keyboard], row);
-
-        for(size_t column = 0; column < column_count; column++) {
-            bool selected = !model->cursor_select && model->selected_row == row &&
-                            model->selected_column == column;
-            const Icon* icon = NULL;
-            if(keys[column].text == ENTER_KEY) {
-                icon = selected ? &I_KeySaveSelected_24x11 : &I_KeySave_24x11;
-            } else if(keys[column].text == SWITCH_KEYBOARD_KEY) {
-                icon = selected ? &I_KeyKeyboardSelected_10x11 : &I_KeyKeyboard_10x11;
-            } else if(keys[column].text == BACKSPACE_KEY) {
-                icon = selected ? &I_KeyBackspaceSelected_16x9 : &I_KeyBackspace_16x9;
-            }
-            canvas_set_color(canvas, ColorBlack);
-            if(icon != NULL) {
-                canvas_draw_icon(
-                    canvas,
-                    keyboard_origin_x + keys[column].x,
-                    keyboard_origin_y + keys[column].y,
-                    icon);
-            } else {
-                if(selected) {
-                    canvas_draw_box(
-                        canvas,
-                        keyboard_origin_x + keys[column].x - 1,
-                        keyboard_origin_y + keys[column].y - 8,
-                        7,
-                        10);
-                    canvas_set_color(canvas, ColorWhite);
-                }
-
-                if(model->clear_default_text || text_length == 0) {
-                    canvas_draw_glyph(
-                        canvas,
-                        keyboard_origin_x + keys[column].x,
-                        keyboard_origin_y + keys[column].y,
-                        char_to_uppercase(keys[column].text));
-                } else {
-                    canvas_draw_glyph(
-                        canvas,
-                        keyboard_origin_x + keys[column].x,
-                        keyboard_origin_y + keys[column].y,
-                        keys[column].text);
-                }
-            }
-        }
-    }
-    if(model->validator_message_visible) {
-        canvas_set_font(canvas, FontSecondary);
-        canvas_set_color(canvas, ColorWhite);
-        canvas_draw_box(canvas, 8, 10, 110, 48);
-        canvas_set_color(canvas, ColorBlack);
-        canvas_draw_icon(canvas, 10, 14, &I_WarningDolphin_45x42);
-        canvas_draw_rframe(canvas, 8, 8, 112, 50, 3);
-        canvas_draw_rframe(canvas, 9, 9, 110, 48, 2);
-        elements_multiline_text(canvas, 62, 20, furi_string_get_cstr(model->validator_text));
-        canvas_set_font(canvas, FontKeyboard);
-    }
-}
-
-static void
-    wifi_text_input_handle_up(WIFI_TextInput* wifi_text_input, WIFI_TextInputModel* model) {
-    UNUSED(wifi_text_input);
-    if(model->selected_row > 0) {
-        model->selected_row--;
-        if(model->selected_row == 0 &&
-           model->selected_column >
-               get_row_size(keyboards[model->selected_keyboard], model->selected_row) - 6) {
-            model->selected_column = model->selected_column + 1;
-        }
-        if(model->selected_row == 1 &&
-           model->selected_keyboard == symbol_keyboard.keyboard_index) {
-            if(model->selected_column > 5)
-                model->selected_column += 2;
-            else if(model->selected_column > 1)
-                model->selected_column += 1;
-        }
-    } else {
-        model->cursor_select = true;
-        model->clear_default_text = false;
-    }
-}
-
-static void
-    wifi_text_input_handle_down(WIFI_TextInput* wifi_text_input, WIFI_TextInputModel* model) {
-    UNUSED(wifi_text_input);
-    if(model->cursor_select) {
-        model->cursor_select = false;
-    } else if(model->selected_row < keyboard_row_count - 1) {
-        model->selected_row++;
-        if(model->selected_row == 1 &&
-           model->selected_column >
-               get_row_size(keyboards[model->selected_keyboard], model->selected_row) - 4) {
-            model->selected_column = model->selected_column - 1;
-        }
-        if(model->selected_row == 2 &&
-           model->selected_keyboard == symbol_keyboard.keyboard_index) {
-            if(model->selected_column > 7)
-                model->selected_column -= 2;
-            else if(model->selected_column > 1)
-                model->selected_column -= 1;
-        }
-    }
-}
-
-static void
-    wifi_text_input_handle_left(WIFI_TextInput* wifi_text_input, WIFI_TextInputModel* model) {
-    UNUSED(wifi_text_input);
-    if(model->cursor_select) {
-        if(model->cursor_pos > 0) {
-            model->cursor_pos = CLAMP(model->cursor_pos - 1, strlen(model->text_buffer), 0u);
-        }
-    } else if(model->selected_column > 0) {
-        model->selected_column--;
-    } else {
-        model->selected_column =
-            get_row_size(keyboards[model->selected_keyboard], model->selected_row) - 1;
-    }
-}
-
-static void
-    wifi_text_input_handle_right(WIFI_TextInput* wifi_text_input, WIFI_TextInputModel* model) {
-    UNUSED(wifi_text_input);
-    if(model->cursor_select) {
-        model->cursor_pos = CLAMP(model->cursor_pos + 1, strlen(model->text_buffer), 0u);
-    } else if(
-        model->selected_column <
-        get_row_size(keyboards[model->selected_keyboard], model->selected_row) - 1) {
-        model->selected_column++;
-    } else {
-        model->selected_column = 0;
-    }
-}
-
-static void wifi_text_input_handle_ok(
-    WIFI_TextInput* wifi_text_input,
-    WIFI_TextInputModel* model,
-    InputType type) {
-    if(model->cursor_select) return;
-    bool shift = type == InputTypeLong;
-    bool repeat = type == InputTypeRepeat;
-    char selected = get_selected_char(model);
-    size_t text_length = strlen(model->text_buffer);
-
-    if(selected == ENTER_KEY) {
-        if(model->validator_callback &&
-           (!model->validator_callback(
-               model->text_buffer, model->validator_text, model->validator_callback_context))) {
-            model->validator_message_visible = true;
-            furi_timer_start(wifi_text_input->timer, furi_kernel_get_tick_frequency() * 4);
-        } else if(model->callback != 0 && text_length >= model->minimum_length) {
-            model->callback(model->callback_context);
-        }
-    } else if(selected == SWITCH_KEYBOARD_KEY) {
-        switch_keyboard(model);
-    } else {
-        if(selected == BACKSPACE_KEY) {
-            wifi_text_input_backspace_cb(model);
-        } else if(!repeat) {
-            if(model->clear_default_text) {
-                text_length = 0;
-            }
-            if(text_length < (model->text_buffer_size - 1)) {
-                if(shift != (text_length == 0)) {
-                    selected = char_to_uppercase(selected);
-                }
-                if(model->clear_default_text) {
-                    model->text_buffer[0] = selected;
-                    model->text_buffer[1] = '\0';
-                    model->cursor_pos = 1;
-                } else {
-                    char* move = model->text_buffer + model->cursor_pos;
-                    memmove(move + 1, move, strlen(move) + 1);
-                    model->text_buffer[model->cursor_pos] = selected;
-                    model->cursor_pos++;
-                }
-            }
-        }
-        model->clear_default_text = false;
-    }
-}
-
-static bool wifi_text_input_view_input_callback(InputEvent* event, void* context) {
-    WIFI_TextInput* wifi_text_input = context;
-    furi_assert(wifi_text_input);
-
-    bool consumed = false;
-
-    // Acquire model
-    WIFI_TextInputModel* model = view_get_model(wifi_text_input->view);
-
-    if((!(event->type == InputTypePress) && !(event->type == InputTypeRelease)) &&
-       model->validator_message_visible) {
-        model->validator_message_visible = false;
-        consumed = true;
-    } else if(event->type == InputTypeShort) {
-        consumed = true;
-        switch(event->key) {
-        case InputKeyUp:
-            wifi_text_input_handle_up(wifi_text_input, model);
-            break;
-        case InputKeyDown:
-            wifi_text_input_handle_down(wifi_text_input, model);
-            break;
-        case InputKeyLeft:
-            wifi_text_input_handle_left(wifi_text_input, model);
-            break;
-        case InputKeyRight:
-            wifi_text_input_handle_right(wifi_text_input, model);
-            break;
-        case InputKeyOk:
-            wifi_text_input_handle_ok(wifi_text_input, model, event->type);
-            break;
-        default:
-            consumed = false;
-            break;
-        }
-    } else if(event->type == InputTypeLong) {
-        consumed = true;
-        switch(event->key) {
-        case InputKeyUp:
-            wifi_text_input_handle_up(wifi_text_input, model);
-            break;
-        case InputKeyDown:
-            wifi_text_input_handle_down(wifi_text_input, model);
-            break;
-        case InputKeyLeft:
-            wifi_text_input_handle_left(wifi_text_input, model);
-            break;
-        case InputKeyRight:
-            wifi_text_input_handle_right(wifi_text_input, model);
-            break;
-        case InputKeyOk:
-            wifi_text_input_handle_ok(wifi_text_input, model, event->type);
-            break;
-        case InputKeyBack:
-            wifi_text_input_backspace_cb(model);
-            break;
-        default:
-            consumed = false;
-            break;
-        }
-    } else if(event->type == InputTypeRepeat) {
-        consumed = true;
-        switch(event->key) {
-        case InputKeyUp:
-            wifi_text_input_handle_up(wifi_text_input, model);
-            break;
-        case InputKeyDown:
-            wifi_text_input_handle_down(wifi_text_input, model);
-            break;
-        case InputKeyLeft:
-            wifi_text_input_handle_left(wifi_text_input, model);
-            break;
-        case InputKeyRight:
-            wifi_text_input_handle_right(wifi_text_input, model);
-            break;
-        case InputKeyOk:
-            wifi_text_input_handle_ok(wifi_text_input, model, event->type);
-            break;
-        case InputKeyBack:
-            wifi_text_input_backspace_cb(model);
-            break;
-        default:
-            consumed = false;
-            break;
-        }
-    }
-
-    // Commit model
-    view_commit_model(wifi_text_input->view, consumed);
-
-    return consumed;
-}
-
-void wifi_text_input_timer_callback(void* context) {
-    furi_assert(context);
-    WIFI_TextInput* wifi_text_input = context;
-
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        { model->validator_message_visible = false; },
-        true);
-}
-
-WIFI_TextInput* wifi_text_input_alloc() {
-    WIFI_TextInput* wifi_text_input = malloc(sizeof(WIFI_TextInput));
-    wifi_text_input->view = view_alloc();
-    view_set_context(wifi_text_input->view, wifi_text_input);
-    view_allocate_model(wifi_text_input->view, ViewModelTypeLocking, sizeof(WIFI_TextInputModel));
-    view_set_draw_callback(wifi_text_input->view, wifi_text_input_view_draw_callback);
-    view_set_input_callback(wifi_text_input->view, wifi_text_input_view_input_callback);
-
-    wifi_text_input->timer =
-        furi_timer_alloc(wifi_text_input_timer_callback, FuriTimerTypeOnce, wifi_text_input);
-
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        {
-            model->validator_text = furi_string_alloc();
-            model->minimum_length = 1;
-            model->cursor_pos = 0;
-            model->cursor_select = false;
-        },
-        false);
-
-    wifi_text_input_reset(wifi_text_input);
-
-    return wifi_text_input;
-}
-
-void wifi_text_input_free(WIFI_TextInput* wifi_text_input) {
-    furi_assert(wifi_text_input);
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        { furi_string_free(model->validator_text); },
-        false);
-
-    // Send stop command
-    furi_timer_stop(wifi_text_input->timer);
-    // Release allocated memory
-    furi_timer_free(wifi_text_input->timer);
-
-    view_free(wifi_text_input->view);
-
-    free(wifi_text_input);
-}
-
-void wifi_text_input_reset(WIFI_TextInput* wifi_text_input) {
-    furi_assert(wifi_text_input);
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        {
-            model->header = "";
-            model->selected_row = 0;
-            model->selected_column = 0;
-            model->selected_keyboard = 0;
-            model->minimum_length = 1;
-            model->clear_default_text = false;
-            model->cursor_pos = 0;
-            model->cursor_select = false;
-            model->text_buffer = NULL;
-            model->text_buffer_size = 0;
-            model->callback = NULL;
-            model->callback_context = NULL;
-            model->validator_callback = NULL;
-            model->validator_callback_context = NULL;
-            furi_string_reset(model->validator_text);
-            model->validator_message_visible = false;
-        },
-        true);
-}
-
-View* wifi_text_input_get_view(WIFI_TextInput* wifi_text_input) {
-    furi_assert(wifi_text_input);
-    return wifi_text_input->view;
-}
-
-void wifi_text_input_set_result_callback(
-    WIFI_TextInput* wifi_text_input,
-    WIFI_TextInputCallback callback,
-    void* callback_context,
-    char* text_buffer,
-    size_t text_buffer_size,
-    bool clear_default_text) {
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        {
-            model->callback = callback;
-            model->callback_context = callback_context;
-            model->text_buffer = text_buffer;
-            model->text_buffer_size = text_buffer_size;
-            model->clear_default_text = clear_default_text;
-            model->cursor_select = false;
-            if(text_buffer && text_buffer[0] != '\0') {
-                model->cursor_pos = strlen(text_buffer);
-                // Set focus on Save
-                model->selected_row = 2;
-                model->selected_column = 9;
-                model->selected_keyboard = 0;
-            } else {
-                model->cursor_pos = 0;
-            }
-        },
-        true);
-}
-
-void wifi_text_input_set_minimum_length(WIFI_TextInput* wifi_text_input, size_t minimum_length) {
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        { model->minimum_length = minimum_length; },
-        true);
-}
-
-void wifi_text_input_set_validator(
-    WIFI_TextInput* wifi_text_input,
-    WIFI_TextInputValidatorCallback callback,
-    void* callback_context) {
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        {
-            model->validator_callback = callback;
-            model->validator_callback_context = callback_context;
-        },
-        true);
-}
-
-WIFI_TextInputValidatorCallback
-    wifi_text_input_get_validator_callback(WIFI_TextInput* wifi_text_input) {
-    WIFI_TextInputValidatorCallback validator_callback = NULL;
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        { validator_callback = model->validator_callback; },
-        false);
-    return validator_callback;
-}
-
-void* wifi_text_input_get_validator_callback_context(WIFI_TextInput* wifi_text_input) {
-    void* validator_callback_context = NULL;
-    with_view_model(
-        wifi_text_input->view,
-        WIFI_TextInputModel * model,
-        { validator_callback_context = model->validator_callback_context; },
-        false);
-    return validator_callback_context;
-}
-
-void wifi_text_input_set_header_text(WIFI_TextInput* wifi_text_input, const char* text) {
-    with_view_model(
-        wifi_text_input->view, WIFI_TextInputModel * model, { model->header = text; }, true);
-}

wifi_marauder_text_input.h

@@ -1,83 +0,0 @@
-#pragma once
-
-#include <gui/view.h>
-#include "wifi_marauder_validators.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Text input anonymous structure */
-typedef struct WIFI_TextInput WIFI_TextInput;
-typedef void (*WIFI_TextInputCallback)(void* context);
-typedef bool (*WIFI_TextInputValidatorCallback)(const char* text, FuriString* error, void* context);
-
-/** Allocate and initialize text input 
- * 
- * This text input is used to enter string
- *
- * @return     WIFI_TextInput instance
- */
-WIFI_TextInput* wifi_text_input_alloc();
-
-/** Deinitialize and free text input
- *
- * @param      text_input  WIFI_TextInput instance
- */
-void wifi_text_input_free(WIFI_TextInput* text_input);
-
-/** Clean text input view Note: this function does not free memory
- *
- * @param      text_input  Text input instance
- */
-void wifi_text_input_reset(WIFI_TextInput* text_input);
-
-/** Get text input view
- *
- * @param      text_input  WIFI_TextInput instance
- *
- * @return     View instance that can be used for embedding
- */
-View* wifi_text_input_get_view(WIFI_TextInput* text_input);
-
-/** Set text input result callback
- *
- * @param      text_input          WIFI_TextInput instance
- * @param      callback            callback fn
- * @param      callback_context    callback context
- * @param      text_buffer         pointer to YOUR text buffer, that we going
- *                                 to modify
- * @param      text_buffer_size    YOUR text buffer size in bytes. Max string
- *                                 length will be text_buffer_size-1.
- * @param      clear_default_text  clear text from text_buffer on first OK
- *                                 event
- */
-void wifi_text_input_set_result_callback(
-    WIFI_TextInput* text_input,
-    WIFI_TextInputCallback callback,
-    void* callback_context,
-    char* text_buffer,
-    size_t text_buffer_size,
-    bool clear_default_text);
-
-void wifi_text_input_set_validator(
-    WIFI_TextInput* text_input,
-    WIFI_TextInputValidatorCallback callback,
-    void* callback_context);
-
-void wifi_text_input_set_minimum_length(WIFI_TextInput* text_input, size_t minimum_length);
-
-WIFI_TextInputValidatorCallback wifi_text_input_get_validator_callback(WIFI_TextInput* text_input);
-
-void* wifi_text_input_get_validator_callback_context(WIFI_TextInput* text_input);
-
-/** Set text input header text
- *
- * @param      text_input  WIFI_TextInput instance
- * @param      text        text to be shown
- */
-void wifi_text_input_set_header_text(WIFI_TextInput* text_input, const char* text);
-
-#ifdef __cplusplus
-}
-#endif

wifi_marauder_uart.c

@@ -1,15 +1,15 @@
 #include "wifi_marauder_app_i.h"
 #include "wifi_marauder_uart.h"
 
-#define UART_CH (FuriHalUartIdUSART1)
-#define LP_UART_CH (FuriHalUartIdLPUART1)
+#define UART_CH (FuriHalSerialIdUsart)
+#define LP_UART_CH (FuriHalSerialIdLpuart)
 #define BAUDRATE (230400)
 
 struct WifiMarauderUart {
     WifiMarauderApp* app;
-    FuriHalUartId channel;
     FuriThread* rx_thread;
     FuriStreamBuffer* rx_stream;
+    FuriHalSerialHandle* serial_handle;
     uint8_t rx_buf[RX_BUF_SIZE + 1];
     void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context);
 };
@@ -28,15 +28,26 @@ void wifi_marauder_uart_set_handle_rx_data_cb(
 
 #define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
 
-void wifi_marauder_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context) {
+void wifi_marauder_uart_on_irq_cb(
+    FuriHalSerialHandle* handle,
+    FuriHalSerialRxEvent event,
+    void* context) {
     WifiMarauderUart* uart = (WifiMarauderUart*)context;
 
-    if(ev == UartIrqEventRXNE) {
+    if(event == FuriHalSerialRxEventData) {
+        uint8_t data = furi_hal_serial_async_rx(handle);
         furi_stream_buffer_send(uart->rx_stream, &data, 1, 0);
         furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtRxDone);
     }
 }
 
+void workaround_on_irq_cb(FuriHalSerialHandle* handle, FuriHalSerialRxEvent event, void* context) {
+    // For some reason furi_hal_serial enforces different callbacks for usart/lpuart
+    // The callbacks receive context and handle pointers, user callbacks can handle it
+    // API really should not be doing this, if it gets fixed then revert this commit
+    wifi_marauder_uart_on_irq_cb(handle, event, context);
+}
+
 static int32_t uart_worker(void* context) {
     WifiMarauderUart* uart = (void*)context;
 
@@ -58,20 +69,17 @@ static int32_t uart_worker(void* context) {
     return 0;
 }
 
-void wifi_marauder_uart_tx(uint8_t* data, size_t len) {
-    furi_hal_uart_tx(UART_CH, data, len);
-}
-
-void wifi_marauder_lp_uart_tx(uint8_t* data, size_t len) {
-    furi_hal_uart_tx(LP_UART_CH, data, len);
+void wifi_marauder_uart_tx(WifiMarauderUart* uart, uint8_t* data, size_t len) {
+    furi_hal_serial_tx(uart->serial_handle, data, len);
 }
 
-WifiMarauderUart*
-    wifi_marauder_uart_init(WifiMarauderApp* app, FuriHalUartId channel, const char* thread_name) {
+WifiMarauderUart* wifi_marauder_uart_init(
+    WifiMarauderApp* app,
+    FuriHalSerialId channel,
+    const char* thread_name) {
     WifiMarauderUart* uart = malloc(sizeof(WifiMarauderUart));
 
     uart->app = app;
-    uart->channel = channel;
     uart->rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
     uart->rx_thread = furi_thread_alloc();
     furi_thread_set_name(uart->rx_thread, thread_name);
@@ -79,13 +87,17 @@ WifiMarauderUart*
     furi_thread_set_context(uart->rx_thread, uart);
     furi_thread_set_callback(uart->rx_thread, uart_worker);
     furi_thread_start(uart->rx_thread);
-    if(channel == FuriHalUartIdUSART1) {
-        furi_hal_console_disable();
-    } else if(channel == FuriHalUartIdLPUART1) {
-        furi_hal_uart_init(channel, BAUDRATE);
+    uart->serial_handle = furi_hal_serial_control_acquire(channel);
+    if(!uart->serial_handle) {
+        furi_delay_ms(5000);
     }
-    furi_hal_uart_set_br(channel, BAUDRATE);
-    furi_hal_uart_set_irq_cb(channel, wifi_marauder_uart_on_irq_cb, uart);
+    furi_check(uart->serial_handle);
+    furi_hal_serial_init(uart->serial_handle, BAUDRATE);
+    furi_hal_serial_async_rx_start(
+        uart->serial_handle,
+        channel == FuriHalSerialIdUsart ? workaround_on_irq_cb : wifi_marauder_uart_on_irq_cb,
+        uart,
+        false);
 
     return uart;
 }
@@ -101,15 +113,13 @@ WifiMarauderUart* wifi_marauder_lp_uart_init(WifiMarauderApp* app) {
 void wifi_marauder_uart_free(WifiMarauderUart* uart) {
     furi_assert(uart);
 
+    furi_hal_serial_async_rx_stop(uart->serial_handle);
+    furi_hal_serial_deinit(uart->serial_handle);
+    furi_hal_serial_control_release(uart->serial_handle);
+
     furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtStop);
     furi_thread_join(uart->rx_thread);
     furi_thread_free(uart->rx_thread);
 
-    furi_hal_uart_set_irq_cb(uart->channel, NULL, NULL);
-    if(uart->channel == FuriHalUartIdLPUART1) {
-        furi_hal_uart_deinit(uart->channel);
-    }
-    furi_hal_console_enable();
-
     free(uart);
 }

wifi_marauder_uart.h

@@ -9,8 +9,7 @@ typedef struct WifiMarauderUart WifiMarauderUart;
 void wifi_marauder_uart_set_handle_rx_data_cb(
     WifiMarauderUart* uart,
     void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context));
-void wifi_marauder_uart_tx(uint8_t* data, size_t len);
-void wifi_marauder_lp_uart_tx(uint8_t* data, size_t len);
+void wifi_marauder_uart_tx(WifiMarauderUart* uart, uint8_t* data, size_t len);
 WifiMarauderUart* wifi_marauder_usart_init(WifiMarauderApp* app);
 WifiMarauderUart* wifi_marauder_lp_uart_init(WifiMarauderApp* app);
 void wifi_marauder_uart_free(WifiMarauderUart* uart);