This is not needed anymore

wifi_marauder_companion/scenes/wifi_marauder_scene_settings_init.c

@@ -63,10 +63,6 @@ bool wifi_marauder_scene_settings_init_on_event(void* context, SceneManagerEvent
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
-        if(app->which_prompt == PROMPT_PCAPS) {
-            wifi_marauder_uart_free(app->uart);
-        }
-
         // get which button press: "Yes" or "No"
         if(event.event == GuiButtonTypeRight) {
             // Yes
@@ -86,12 +82,6 @@ bool wifi_marauder_scene_settings_init_on_event(void* context, SceneManagerEvent
 
         // save setting to file, load next widget or scene
         if(app->which_prompt == PROMPT_PCAPS) {
-            if(app->ok_to_save_pcaps) {
-                app->uart = wifi_marauder_usart_init(app);
-            } else {
-                app->uart = wifi_marauder_xtreme_uart_init(app);
-            }
-
             if(storage_file_open(
                    app->save_pcap_setting_file,
                    SAVE_PCAP_SETTING_FILEPATH,

wifi_marauder_companion/wifi_marauder_app.c

@@ -184,11 +184,7 @@ int32_t wifi_marauder_app(void* p) {
     wifi_marauder_make_app_folder(wifi_marauder_app);
     wifi_marauder_load_settings(wifi_marauder_app);
 
-    if(wifi_marauder_app->ok_to_save_pcaps) {
-        wifi_marauder_app->uart = wifi_marauder_usart_init(wifi_marauder_app);
-    } else {
-        wifi_marauder_app->uart = wifi_marauder_xtreme_uart_init(wifi_marauder_app);
-    }
+    wifi_marauder_app->uart = wifi_marauder_usart_init(wifi_marauder_app);
 
     view_dispatcher_run(wifi_marauder_app->view_dispatcher);
 

wifi_marauder_companion/wifi_marauder_uart.c

@@ -2,11 +2,9 @@
 #include "wifi_marauder_uart.h"
 
 #include <xtreme/xtreme.h>
-#define XTREME_UART_CH \
-    (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
-bool xtreme_uart = false;
 
-#define UART_CH (FuriHalUartIdUSART1)
+#define UART_CH \
+    (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
 #define BAUDRATE (115200)
 
 struct WifiMarauderUart {
@@ -133,13 +131,8 @@ static int32_t uart_worker(void* context) {
     return 0;
 }
 
-// Will switch appropriately based on whether usart_init or xtreme_uart_init was called
 void wifi_marauder_uart_tx(uint8_t* data, size_t len) {
-    if(xtreme_uart) {
-        furi_hal_uart_tx(XTREME_UART_CH, data, len);
-    } else {
-        furi_hal_uart_tx(UART_CH, data, len);
-    }
+    furi_hal_uart_tx(UART_CH, data, len);
 }
 
 WifiMarauderUart*
@@ -167,13 +160,7 @@ WifiMarauderUart*
     return uart;
 }
 
-WifiMarauderUart* wifi_marauder_xtreme_uart_init(WifiMarauderApp* app) {
-    xtreme_uart = true;
-    return wifi_marauder_uart_init(app, XTREME_UART_CH, "WifiMarauderUartRxThread");
-}
-
 WifiMarauderUart* wifi_marauder_usart_init(WifiMarauderApp* app) {
-    xtreme_uart = false;
     return wifi_marauder_uart_init(app, UART_CH, "WifiMarauderUartRxThread");
 }
 

wifi_marauder_companion/wifi_marauder_uart.h

@@ -13,6 +13,5 @@ void wifi_marauder_uart_set_handle_rx_pcap_cb(
     WifiMarauderUart* uart,
     void (*handle_rx_pcap_cb)(uint8_t* buf, size_t len, void* context));
 void wifi_marauder_uart_tx(uint8_t* data, size_t len);
-WifiMarauderUart* wifi_marauder_xtreme_uart_init(WifiMarauderApp* app);
 WifiMarauderUart* wifi_marauder_usart_init(WifiMarauderApp* app);
 void wifi_marauder_uart_free(WifiMarauderUart* uart);