Add WiFi Wardriver, remove WiFi Sniffer --nobuild

Wardriver is an updated version of sniffer. The name is just better lol

applications/external/wardriver/application.fam

@@ -1,15 +1,15 @@
 App(
-    appid="wifisniffer",
-    name="[ESP32GPS] Wifi Sniff",
+    appid="wardriver",
+    name="[ESP32GPS] Wardriver",
     apptype=FlipperAppType.EXTERNAL,
-    entry_point="wifisniffer_app",
-    stack_size=2 * 1024,
-    fap_icon="sniff.png",
+    entry_point="wardriver_app",
+    stack_size=2048,
+    fap_icon="lookingglass.png",
     fap_category="WiFi",
     fap_author="@Sil333033",
-    fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/wifisniffer",
+    fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/wardriver",
     fap_version="1.0",
     fap_description="Sniff WiFi access points with GPS location coordinates",
     fap_icon_assets="icons",
-    fap_icon_assets_symbol="wifisniffer",
+    fap_icon_assets_symbol="wardriver",
 )

applications/external/wardriver/wardriver.c

@@ -0,0 +1,350 @@
+#include "wardriver.h"
+#include "wardriver_uart.h"
+
+void save_file(Context* ctx) {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    FuriHalRtcDateTime datetime;
+    furi_hal_rtc_get_datetime(&datetime);
+
+    FuriString* filename = furi_string_alloc();
+    furi_string_printf(
+        filename,
+        "%s/%s_%d_%d_%d_%d_%d_%d.txt",
+        FILE_PATH,
+        "wigle",
+        datetime.year,
+        datetime.month,
+        datetime.day,
+        datetime.hour,
+        datetime.minute,
+        datetime.second);
+
+    File* file = storage_file_alloc(storage);
+
+    if(!storage_common_exists(storage, FILE_PATH)) {
+        storage_common_mkdir(storage, FILE_PATH);
+    }
+
+    if(!storage_file_open(file, furi_string_get_cstr(filename), FSAM_WRITE, FSOM_OPEN_ALWAYS)) {
+        FURI_LOG_I(appname, "Failed to open file");
+        storage_file_close(file);
+        storage_file_free(file);
+        furi_string_free(filename);
+        furi_record_close(RECORD_STORAGE);
+
+        furi_hal_light_blink_start(LightRed, 100, 100, 5000);
+
+        return;
+    }
+
+    furi_string_reset(ctx->buffer);
+
+    // WIGLE HEADERS DONT CHANGE THIS ITS IMPORTANT!
+    furi_string_printf(
+        ctx->buffer,
+        "%s,%s,%s,%s,%s,%s,%s,%s\r\n",
+        "WigleWifi-1.4",
+        "appRelease=v2.0",
+        "model=S33",
+        "release=XtremeFW",
+        "Flipper Zero",
+        "",
+        "Wardriver",
+        "S33");
+
+    furi_string_cat_printf(
+        ctx->buffer,
+        "%s,%s,%s,%s,%s,%s,%s\r\n",
+        "MAC",
+        "SSID",
+        "FirstSeen",
+        "Channel",
+        "RSSI",
+        "CurrentLatitude",
+        "CurrentLongitude");
+    if(!storage_file_write(
+           file, furi_string_get_cstr(ctx->buffer), strlen(furi_string_get_cstr(ctx->buffer)))) {
+        FURI_LOG_I(appname, "Failed to write header to file");
+    }
+
+    for(int i = 0; i < ctx->access_points_count; i++) {
+        AccessPoint ap = ctx->access_points[i];
+        furi_string_printf(
+            ctx->buffer,
+            "%s,%s,%04d-%02d-%02d %02d:%02d:%02d,%d,%d,%f,%f\r\n",
+            ap.bssid,
+            ap.ssid,
+            ap.datetime.year,
+            ap.datetime.month,
+            ap.datetime.day,
+            ap.datetime.hour,
+            ap.datetime.minute,
+            ap.datetime.second,
+            ap.rssi,
+            ap.channel,
+            (double)ap.latitude,
+            (double)ap.longitude);
+
+        if(!storage_file_write(
+               file,
+               furi_string_get_cstr(ctx->buffer),
+               strlen(furi_string_get_cstr(ctx->buffer)))) {
+            FURI_LOG_I(appname, "Failed to write AP to file");
+        }
+
+        free(ap.ssid);
+        free(ap.bssid);
+    }
+
+    storage_file_close(file);
+    storage_file_free(file);
+    furi_string_free(filename);
+    furi_record_close(RECORD_STORAGE);
+
+    return;
+}
+
+static void tick_callback(void* ctx_q) {
+    furi_assert(ctx_q);
+    FuriMessageQueue* queue = ctx_q;
+    Event event = {.type = EventTypeTick};
+    furi_message_queue_put(queue, &event, 0);
+}
+
+static void input_callback(InputEvent* input_event, FuriMessageQueue* queue) {
+    furi_assert(queue);
+    Event event = {.type = EventTypeKey, .input = *input_event};
+    furi_message_queue_put(queue, &event, FuriWaitForever);
+}
+
+static void draw_access_point(Canvas* canvas, Context* context) {
+    Context* ctx = context;
+
+    AccessPoint ap = ctx->active_access_point;
+
+    canvas_draw_str_aligned(canvas, 62, 25, AlignCenter, AlignBottom, ap.ssid);
+
+    canvas_set_font(canvas, FontSecondary);
+
+    canvas_draw_str_aligned(canvas, 38, 12, AlignLeft, AlignBottom, ap.bssid);
+
+    furi_string_printf(ctx->buffer, "Signal strength: %ddBm", ap.rssi);
+    canvas_draw_str_aligned(
+        canvas, 3, 35, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
+
+    furi_string_printf(ctx->buffer, "CH: %d", ap.channel);
+    canvas_draw_str_aligned(
+        canvas, 3, 47, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
+
+    furi_string_printf(ctx->buffer, "%d", ap.packetRxCount);
+    canvas_draw_icon(canvas, 35, 39, &I_down);
+    canvas_draw_str_aligned(
+        canvas, 45, 47, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
+
+    furi_string_printf(ctx->buffer, "%d", ap.packetTxCount);
+    canvas_draw_icon(canvas, 85, 38, &I_up);
+    canvas_draw_str_aligned(
+        canvas, 95, 47, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
+
+    furi_string_printf(
+        ctx->buffer,
+        "Seen: %02d:%02d:%02d (%lds ago)",
+        ap.datetime.hour,
+        ap.datetime.minute,
+        ap.datetime.second,
+        furi_hal_rtc_get_timestamp() - furi_hal_rtc_datetime_to_timestamp(&ap.datetime));
+    canvas_draw_str_aligned(
+        canvas, 3, 59, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
+}
+
+static void render_callback(Canvas* canvas, void* context) {
+    Context* ctx = context;
+
+    canvas_set_font(canvas, FontPrimary);
+
+    if(ctx->access_points_count >= MAX_ACCESS_POINTS) {
+        canvas_draw_str(canvas, 118, 10, "!");
+    }
+
+    switch(ctx->view_state) {
+    case SHOW_NMEA:
+
+        if(UART_CH_ESP == UART_CH_GPS) {
+            canvas_draw_str(canvas, 0, 10, "GPS channel invalid!");
+            canvas_draw_str(canvas, 0, 20, "Change UART");
+            canvas_draw_str(canvas, 0, 30, "channel");
+            canvas_draw_str(canvas, 0, 40, "in the Xtreme");
+            canvas_draw_str(canvas, 0, 50, "app");
+        } else {
+            furi_string_printf(
+                ctx->buffer,
+                "%f",
+                isnan(ctx->gps_data.latitude) ? 0 : (double)ctx->gps_data.latitude);
+            canvas_draw_str(canvas, 0, 10, furi_string_get_cstr(ctx->buffer));
+
+            furi_string_printf(
+                ctx->buffer,
+                "%f",
+                isnan(ctx->gps_data.longitude) ? 0 : (double)ctx->gps_data.longitude);
+            canvas_draw_str(canvas, 0, 20, furi_string_get_cstr(ctx->buffer));
+
+            furi_string_printf(ctx->buffer, "%d sats", ctx->gps_data.satelites);
+            canvas_draw_str(canvas, 0, 30, furi_string_get_cstr(ctx->buffer));
+
+            furi_string_printf(
+                ctx->buffer,
+                "%02d:%02d:%02dZ",
+                ctx->gps_data.hour,
+                ctx->gps_data.minute,
+                ctx->gps_data.second);
+            canvas_draw_str(canvas, 0, 40, furi_string_get_cstr(ctx->buffer));
+            canvas_draw_str(canvas, 70, 10, "GPS DATA");
+        }
+
+        elements_button_left(canvas, "Back");
+
+        canvas_draw_icon(canvas, 71, 15, &I_DolphinCommon_56x48);
+        break;
+    case NO_APS:
+        canvas_draw_str(canvas, 80, 30, "No AP's");
+        canvas_draw_str(canvas, 80, 40, "Found!");
+        canvas_draw_icon(canvas, 1, 4, &I_DolphinWait_61x59);
+        break;
+    case NORMAL:
+    default:
+        canvas_draw_frame(canvas, 0, 0, 128, 64);
+
+        furi_string_printf(
+            ctx->buffer, "%d/%d", ctx->access_points_index + 1, ctx->access_points_count);
+
+        canvas_draw_str(canvas, 3, 12, furi_string_get_cstr(ctx->buffer));
+
+        draw_access_point(canvas, ctx);
+        break;
+    }
+    furi_mutex_release(ctx->mutex);
+}
+
+int32_t wardriver_app() {
+    // turn off 5v, so it gets reset on startup
+    if(furi_hal_power_is_otg_enabled()) {
+        furi_hal_power_disable_otg();
+    }
+
+    // Enable 5v on startup
+    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(200);
+
+    Context* ctx = malloc(sizeof(Context));
+    ctx->queue = furi_message_queue_alloc(8, sizeof(Event));
+    ctx->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+    ctx->buffer = furi_string_alloc();
+
+    ctx->access_points_count = 0;
+    ctx->access_points_index = 0;
+    ctx->pressedButton = false;
+    ctx->view_state = NO_APS;
+
+    wardriver_uart_init(ctx);
+
+    ViewPort* view_port = view_port_alloc();
+    view_port_draw_callback_set(view_port, render_callback, ctx);
+    view_port_input_callback_set(view_port, input_callback, ctx->queue);
+
+    Gui* gui = furi_record_open(RECORD_GUI);
+    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
+
+    FuriTimer* timer = furi_timer_alloc(tick_callback, FuriTimerTypePeriodic, ctx->queue);
+    furi_timer_start(timer, 100);
+
+    // application loop
+    Event event;
+    bool processing = true;
+    do {
+        if(furi_message_queue_get(ctx->queue, &event, FuriWaitForever) == FuriStatusOk) {
+            furi_mutex_acquire(ctx->mutex, FuriWaitForever);
+            switch(event.type) {
+            case EventTypeKey:
+                if(event.input.type == InputTypeShort && event.input.key == InputKeyBack) {
+                    if(ctx->view_state == SHOW_NMEA) {
+                        ctx->view_state = NORMAL;
+                    } else {
+                        processing = false;
+                    }
+                } else if(event.input.type == InputTypeLong && event.input.key == InputKeyBack) {
+                    if(ctx->view_state == SHOW_NMEA) {
+                        ctx->view_state = NORMAL;
+                    } else {
+                        processing = false;
+                    }
+                } else if(event.input.type == InputTypeLong && event.input.key == InputKeyOk) {
+                } else if(event.input.type == InputTypePress && event.input.key == InputKeyDown) {
+                    ctx->access_points_index--;
+                    if(ctx->access_points_index < 0) {
+                        ctx->access_points_index = ctx->access_points_count - 1;
+                    }
+                    ctx->active_access_point = ctx->access_points[ctx->access_points_index];
+                    ctx->pressedButton = true;
+                } else if(event.input.type == InputTypePress && event.input.key == InputKeyUp) {
+                    ctx->access_points_index++;
+                    if(ctx->access_points_index >= ctx->access_points_count) {
+                        ctx->access_points_index = 0;
+                    }
+                    ctx->active_access_point = ctx->access_points[ctx->access_points_index];
+                    ctx->pressedButton = true;
+                } else if(event.input.type == InputTypePress && event.input.key == InputKeyLeft) {
+                    if(ctx->view_state == NORMAL) {
+                        ctx->view_state = SHOW_NMEA;
+                    } else if(ctx->view_state == SHOW_NMEA) {
+                        ctx->view_state = NORMAL;
+                    }
+                } else if(event.input.type == InputTypePress && event.input.key == InputKeyRight) {
+                }
+                break;
+            case EventTypeTick:
+                // fix for the empty active access point when there was no interaction
+                if(!ctx->pressedButton) {
+                    ctx->access_points_index = 0;
+                    ctx->active_access_point = ctx->access_points[ctx->access_points_index];
+                }
+
+                break;
+            default:
+                break;
+            }
+
+            view_port_update(view_port);
+        } else {
+            processing = false;
+        }
+    } while(processing);
+
+    furi_timer_free(timer);
+    view_port_enabled_set(view_port, false);
+    gui_remove_view_port(gui, view_port);
+    view_port_free(view_port);
+    furi_record_close(RECORD_GUI);
+
+    furi_message_queue_free(ctx->queue);
+    furi_mutex_free(ctx->mutex);
+    furi_string_free(ctx->buffer);
+
+    wardriver_uart_deinit(ctx);
+
+    save_file(ctx);
+
+    free(ctx);
+
+    furi_hal_light_set(LightBlue, 0);
+    furi_hal_light_set(LightGreen, 0);
+
+    if(furi_hal_power_is_otg_enabled()) {
+        furi_hal_power_disable_otg();
+    }
+
+    return 0;
+}

applications/external/wardriver/wardriver.h

@@ -0,0 +1,84 @@
+#pragma once
+#include <furi.h>
+#include <furi_hal.h>
+#include <gui/gui.h>
+#include <gui/elements.h>
+#include <notification/notification_messages.h>
+#include <assets_icons.h>
+#include <toolbox/stream/file_stream.h>
+#include <xtreme.h>
+
+#include "helpers/minmea.h"
+#include "wardriver_icons.h"
+
+#define appname "ll-wardriver"
+
+#define RX_BUF_SIZE 2048
+#define MAX_ACCESS_POINTS 2048
+
+#define MAX_SSID_LENGTH 32
+#define MAX_BSSID_LENGTH 18
+
+#define FILE_PATH EXT_PATH("apps_data/ll-wardriver")
+
+typedef enum {
+    EventTypeKey,
+    EventTypeTick,
+} EventType;
+
+typedef struct {
+    EventType type;
+    InputEvent input;
+} Event;
+
+typedef enum { SHOW_NMEA, NORMAL, NO_APS } ViewState;
+
+typedef struct {
+    char* recievedMac;
+    char* sentMac;
+} Packet;
+
+typedef struct {
+    char* ssid;
+    char* bssid;
+    int8_t rssi;
+    uint8_t channel;
+    FuriHalRtcDateTime datetime;
+    uint16_t packetRxCount;
+    uint16_t packetTxCount;
+    float latitude;
+    float longitude;
+} AccessPoint;
+
+typedef struct {
+    float latitude;
+    float longitude;
+    uint8_t hour;
+    uint8_t minute;
+    uint8_t second;
+    uint8_t satelites;
+} GpsData;
+
+typedef struct {
+    FuriMessageQueue* queue;
+    FuriMutex* mutex;
+    FuriString* buffer;
+
+    FuriThread* thread_esp;
+    FuriStreamBuffer* rx_stream_esp;
+    uint8_t rx_buf_esp[2048];
+
+    FuriThread* thread_gps;
+    FuriStreamBuffer* rx_stream_gps;
+    uint8_t rx_buf_gps[2048];
+
+    uint16_t access_points_count;
+    AccessPoint access_points[MAX_ACCESS_POINTS];
+    int16_t access_points_index;
+    AccessPoint active_access_point;
+    bool extra_info;
+    bool pressedButton;
+
+    ViewState view_state;
+    GpsData gps_data;
+} Context;

applications/external/wardriver/wardriver_uart.c

@@ -1,176 +1,23 @@
-#include <furi.h>
-#include <furi_hal.h>
-#include <gui/gui.h>
-#include <notification/notification_messages.h>
-#include <assets_icons.h>
-#include <toolbox/stream/file_stream.h>
-#include <xtreme.h>
+#include "wardriver_uart.h"
 
-#include "helpers/minmea.h"
-#include "wifisniffer_icons.h"
-
-#define appname "ll-wifisniffer"
-
-#define RX_BUF_SIZE 2048
-#define MAX_ACCESS_POINTS 2048 // imagine getting this many access points
-
-#define MAX_SSID_LENGTH 32
-#define MAX_BSSID_LENGTH 18
-
-#define UART_CH_ESP \
-    (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
-
-#define UART_CH_GPS \
-    (xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
-
-#define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
-
-typedef enum {
-    WorkerEvtStop = (1 << 0),
-    WorkerEvtRxDone = (1 << 1),
-} WorkerEvtFlags;
-
-typedef enum {
-    EventTypeKey,
-    EventTypeTick,
-} EventType;
-
-typedef struct {
-    EventType type;
-    InputEvent input;
-} Event;
-
-typedef struct {
-    char* recievedMac;
-    char* sentMac;
-} Packet;
-
-typedef struct {
-    char* ssid;
-    char* bssid;
-    int8_t rssi;
-    uint8_t channel;
-    FuriHalRtcDateTime datetime;
-    uint16_t packetRxCount;
-    uint16_t packetTxCount;
-    float latitude;
-    float longitude;
-} AccessPoint;
-
-typedef struct {
-    FuriMessageQueue* queue;
-    FuriMutex* mutex;
-    FuriString* buffer;
-    FuriString* buffer2;
-    NotificationApp* notifications;
-    FuriThread* thread_esp;
-    FuriStreamBuffer* rx_stream_esp;
-    uint8_t rx_buf_esp[2048];
-    FuriThread* thread_gps;
-    FuriStreamBuffer* rx_stream_gps;
-    uint8_t rx_buf_gps[2048];
-    File* file;
-    char* dataString;
-    uint16_t access_points_count;
-    AccessPoint access_points[MAX_ACCESS_POINTS];
-    int16_t access_points_index;
-    AccessPoint active_access_point;
-    bool extra_info;
-    bool pressedButton;
-    float last_latitude;
-    float last_longitude;
-} Context;
-
-static void tick_callback(void* ctx_q) {
-    furi_assert(ctx_q);
-    FuriMessageQueue* queue = ctx_q;
-    Event event = {.type = EventTypeTick};
-    furi_message_queue_put(queue, &event, 0);
-}
-
-static void input_callback(InputEvent* input_event, FuriMessageQueue* queue) {
-    furi_assert(queue);
-    Event event = {.type = EventTypeKey, .input = *input_event};
-    furi_message_queue_put(queue, &event, FuriWaitForever);
-}
-
-static void show_access_point(Canvas* canvas, Context* context) {
-    Context* ctx = context;
-
-    AccessPoint ap = ctx->active_access_point;
-
-    canvas_draw_str_aligned(canvas, 62, 25, AlignCenter, AlignBottom, ap.ssid);
-
-    canvas_set_font(canvas, FontSecondary);
-
-    canvas_draw_str_aligned(
-        canvas, 38 + (ctx->access_points_count > 99 ? 5 : 0), 12, AlignLeft, AlignBottom, ap.bssid);
-
-    furi_string_printf(ctx->buffer, "Signal strength: %ddBm", ap.rssi);
-    canvas_draw_str_aligned(
-        canvas, 3, 35, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
-
-    furi_string_printf(ctx->buffer, "CH: %d", ap.channel);
-    canvas_draw_str_aligned(
-        canvas, 3, 47, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
-
-    if(ap.latitude == 0 && ap.longitude == 0) {
-        canvas_draw_str_aligned(canvas, 29, 47, AlignLeft, AlignBottom, "X");
-    } else {
-        canvas_draw_str_aligned(canvas, 29, 47, AlignLeft, AlignBottom, "O");
+static void removeSpaces(char* str) {
+    int i = 0;
+    while(isspace((unsigned char)str[i])) {
+        i++;
     }
 
-    furi_string_printf(ctx->buffer, "%d", ap.packetRxCount);
-    canvas_draw_icon(canvas, 35, 39, &I_down);
-    canvas_draw_str_aligned(
-        canvas, 45, 47, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
+    int j = 0;
+    while(str[i] != '\0') {
+        str[j++] = str[i++];
+    }
+    str[j] = '\0';
 
-    furi_string_printf(ctx->buffer, "%d", ap.packetTxCount);
-    canvas_draw_icon(canvas, 85, 38, &I_up);
-    canvas_draw_str_aligned(
-        canvas, 95, 47, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
-
-    furi_string_printf(
-        ctx->buffer,
-        "Seen: %d:%d:%d (%lds ago)",
-        ap.datetime.hour,
-        ap.datetime.minute,
-        ap.datetime.second,
-        furi_hal_rtc_get_timestamp() - furi_hal_rtc_datetime_to_timestamp(&ap.datetime));
-    canvas_draw_str_aligned(
-        canvas, 3, 59, AlignLeft, AlignBottom, furi_string_get_cstr(ctx->buffer));
+    int len = strlen(str);
+    while(len > 0 && isspace((unsigned char)str[len - 1])) {
+        str[--len] = '\0';
+    }
 }
 
-static void render_callback(Canvas* canvas, void* context) {
-    Context* ctx = context;
-
-    canvas_draw_frame(canvas, 0, 0, 128, 64);
-
-    canvas_set_font(canvas, FontPrimary);
-
-    if(ctx->access_points_count >= MAX_ACCESS_POINTS) {
-        canvas_draw_str(canvas, 118, 10, "!");
-    }
-
-    if(ctx->access_points_count == 0) {
-        canvas_draw_str(canvas, 80, 30, "No AP's");
-        canvas_draw_str(canvas, 80, 40, "Found!");
-        canvas_draw_icon(canvas, 1, 4, &I_DolphinWait_61x59);
-    } else {
-        canvas_draw_frame(canvas, 0, 0, 35 + (ctx->access_points_count > 99 ? 5 : 0), 15);
-
-        furi_string_printf(
-            ctx->buffer, "%d/%d", ctx->access_points_index + 1, ctx->access_points_count);
-
-        canvas_draw_str(canvas, 3, 12, furi_string_get_cstr(ctx->buffer));
-
-        show_access_point(canvas, ctx);
-    }
-    // canvas_clear(canvas);
-    furi_mutex_release(ctx->mutex);
-}
-
-// order ctx->access_points by ssid alphabetically
 static void sort_access_points(Context* ctx) {
     for(int i = 0; i < ctx->access_points_count; i++) {
         for(int j = i + 1; j < ctx->access_points_count; j++) {
@@ -183,7 +30,6 @@ static void sort_access_points(Context* ctx) {
     }
 }
 
-// set the index from the active access point
 static void set_index_from_access_points(Context* ctx) {
     for(int i = 0; i < ctx->access_points_count; i++) {
         if(ctx->access_points[i].bssid == ctx->active_access_point.bssid) {
@@ -193,28 +39,7 @@ static void set_index_from_access_points(Context* ctx) {
     }
 }
 
-static void removeSpaces(char* str) {
-    // Remove spaces from the beginning of the string
-    int i = 0;
-    while(isspace((unsigned char)str[i])) {
-        i++;
-    }
-
-    // Move the remaining characters to the beginning of the string
-    int j = 0;
-    while(str[i] != '\0') {
-        str[j++] = str[i++];
-    }
-    str[j] = '\0';
-
-    // Remove spaces from the end of the string
-    int len = strlen(str);
-    while(len > 0 && isspace((unsigned char)str[len - 1])) {
-        str[--len] = '\0';
-    }
-}
-
-static void parseLine(void* context, char* line) {
+static void uart_parse_esp(void* context, char* line) {
     Context* ctx = context;
 
     AccessPoint ap = {.ssid = malloc(MAX_SSID_LENGTH + 1), .bssid = malloc(MAX_BSSID_LENGTH + 1)};
@@ -224,8 +49,7 @@ static void parseLine(void* context, char* line) {
     char* token = strtok(line, ",");
     int i = 0;
     bool isAp = false;
-    bool isValid = true;
-    UNUSED(isValid);
+    bool isValid = false;
     while(token != NULL) {
         switch(i) {
         case 0:
@@ -233,7 +57,6 @@ static void parseLine(void* context, char* line) {
                 isAp = true;
                 isValid = true;
             } else if(strcmp(token, "PK") == 0) {
-                isAp = false;
                 isValid = true;
             }
             break;
@@ -275,6 +98,10 @@ static void parseLine(void* context, char* line) {
         free(pkt.recievedMac);
         free(pkt.sentMac);
 
+        if(ctx->view_state == NO_APS) {
+            ctx->view_state = NORMAL;
+        }
+
         // check if values are valid
         // bssid needs an ":"
         // rssi needs to be negative
@@ -293,12 +120,12 @@ static void parseLine(void* context, char* line) {
 
         furi_hal_rtc_get_datetime(&ap.datetime);
 
-        if(isnan(ctx->last_latitude) || isnan(ctx->last_longitude)) {
-            ctx->last_latitude = 0;
-            ctx->last_longitude = 0;
+        if(isnan(ctx->gps_data.latitude) || isnan(ctx->gps_data.longitude)) {
+            ap.latitude = 0;
+            ap.longitude = 0;
         } else {
-            ap.latitude = ctx->last_latitude;
-            ap.longitude = ctx->last_longitude;
+            ap.latitude = ctx->gps_data.latitude;
+            ap.longitude = ctx->gps_data.longitude;
         }
 
         // check if ap is already in the list otherwise add it but update the rssi
@@ -426,7 +253,7 @@ static int32_t uart_worker_esp(void* context) {
                             // put a null terminator in place of the newline, to delimit the line string
                             *newline = '\0';
 
-                            parseLine(ctx, line_current);
+                            uart_parse_esp(ctx, line_current);
 
                             // move the cursor to the character after the newline
                             line_current = newline + 1;
@@ -451,36 +278,41 @@ static int32_t uart_worker_esp(void* context) {
         }
     }
 
-    furi_hal_uart_set_irq_cb(UART_CH_ESP, NULL, NULL);
-
-    furi_stream_buffer_free(ctx->rx_stream_esp);
-
     return 0;
 }
 
-static void gps_uart_parse_nmea(Context* ctx, char* line) {
+static void uart_parse_gps(Context* ctx, char* line) {
     switch(minmea_sentence_id(line, false)) {
     case MINMEA_SENTENCE_RMC: {
         struct minmea_sentence_rmc frame;
         if(minmea_parse_rmc(&frame, line)) {
-            ctx->last_latitude = minmea_tocoord(&frame.latitude);
-            ctx->last_longitude = minmea_tocoord(&frame.longitude);
+            ctx->gps_data.latitude = minmea_tocoord(&frame.latitude);
+            ctx->gps_data.longitude = minmea_tocoord(&frame.longitude);
+            ctx->gps_data.hour = frame.time.hours;
+            ctx->gps_data.minute = frame.time.minutes;
+            ctx->gps_data.second = frame.time.seconds;
         }
     } break;
-
     case MINMEA_SENTENCE_GGA: {
         struct minmea_sentence_gga frame;
         if(minmea_parse_gga(&frame, line)) {
-            ctx->last_latitude = minmea_tocoord(&frame.latitude);
-            ctx->last_longitude = minmea_tocoord(&frame.longitude);
+            ctx->gps_data.latitude = minmea_tocoord(&frame.latitude);
+            ctx->gps_data.longitude = minmea_tocoord(&frame.longitude);
+            ctx->gps_data.hour = frame.time.hours;
+            ctx->gps_data.minute = frame.time.minutes;
+            ctx->gps_data.second = frame.time.seconds;
+            ctx->gps_data.satelites = frame.satellites_tracked;
         }
     } break;
 
     case MINMEA_SENTENCE_GLL: {
         struct minmea_sentence_gll frame;
         if(minmea_parse_gll(&frame, line)) {
-            ctx->last_latitude = minmea_tocoord(&frame.latitude);
-            ctx->last_longitude = minmea_tocoord(&frame.longitude);
+            ctx->gps_data.latitude = minmea_tocoord(&frame.latitude);
+            ctx->gps_data.longitude = minmea_tocoord(&frame.longitude);
+            ctx->gps_data.hour = frame.time.hours;
+            ctx->gps_data.minute = frame.time.minutes;
+            ctx->gps_data.second = frame.time.seconds;
         }
     } break;
 
@@ -544,9 +376,7 @@ static int32_t uart_worker_gps(void* context) {
                             // put a null terminator in place of the newline, to delimit the line string
                             *newline = '\0';
 
-                            // FURI_LOG_I(appname, "Received line: %s", line_current);
-
-                            gps_uart_parse_nmea(ctx, line_current);
+                            uart_parse_gps(ctx, line_current);
 
                             // move the cursor to the character after the newline
                             line_current = newline + 1;
@@ -571,52 +401,14 @@ static int32_t uart_worker_gps(void* context) {
         }
     }
 
-    furi_hal_uart_set_irq_cb(UART_CH_GPS, NULL, NULL);
-
-    furi_stream_buffer_free(ctx->rx_stream_gps);
-
     return 0;
 }
 
-int32_t wifisniffer_app(void* p) {
-    UNUSED(p);
-
-    // if(UART_CH_ESP == UART_CH_GPS) {
-    //     FURI_LOG_I(appname, "ESP and GPS uart can't be the same");
-    //     return -1;
-    // }
-
-    // turn off 5v, so it gets reset on startup
-    if(furi_hal_power_is_otg_enabled()) {
-        furi_hal_power_disable_otg();
-    }
-
-    // Enable 5v on startup
-    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(200);
-
-    // alloc everything
-    Context* ctx = malloc(sizeof(Context));
-    ctx->queue = furi_message_queue_alloc(8, sizeof(Event));
-    ctx->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
-    ctx->buffer = furi_string_alloc();
-    ctx->buffer2 = furi_string_alloc();
-    ctx->notifications = furi_record_open(RECORD_NOTIFICATION);
-
-    ctx->access_points_count = 0;
-    ctx->access_points_index = 0;
-
-    ctx->pressedButton = false;
-
-    //esp uart
-    ctx->rx_stream_esp = furi_stream_buffer_alloc(RX_BUF_SIZE * 5, 1);
+void wardriver_uart_init(Context* ctx) {
+    ctx->rx_stream_esp = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
 
     ctx->thread_esp = furi_thread_alloc();
-    furi_thread_set_name(ctx->thread_esp, "LLwifiSnifferUartWorkerESP");
+    furi_thread_set_name(ctx->thread_esp, "LLwardriverUartWorkerESP");
     furi_thread_set_stack_size(ctx->thread_esp, 2048);
     furi_thread_set_context(ctx->thread_esp, ctx);
     furi_thread_set_callback(ctx->thread_esp, uart_worker_esp);
@@ -631,15 +423,11 @@ int32_t wifisniffer_app(void* p) {
     furi_hal_uart_set_br(UART_CH_ESP, 115200);
     furi_hal_uart_set_irq_cb(UART_CH_ESP, uart_cb_esp, ctx);
 
-    furi_hal_uart_tx(UART_CH_ESP, (uint8_t*)"XFW#WIFISNIFF=1\r\n", strlen("XFW#WIFISNIFF=1\r\n"));
-    //end esp uart
-
-    //gps uart
     if(UART_CH_ESP != UART_CH_GPS) {
-        ctx->rx_stream_gps = furi_stream_buffer_alloc(RX_BUF_SIZE * 5, 1);
+        ctx->rx_stream_gps = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
 
         ctx->thread_gps = furi_thread_alloc();
-        furi_thread_set_name(ctx->thread_gps, "LLwifiSnifferUartWorkerGPS");
+        furi_thread_set_name(ctx->thread_gps, "LLwardriverUartWorkerGPS");
         furi_thread_set_stack_size(ctx->thread_gps, 2048);
         furi_thread_set_context(ctx->thread_gps, ctx);
         furi_thread_set_callback(ctx->thread_gps, uart_worker_gps);
@@ -654,165 +442,25 @@ int32_t wifisniffer_app(void* p) {
         furi_hal_uart_set_br(UART_CH_GPS, 9600);
         furi_hal_uart_set_irq_cb(UART_CH_GPS, uart_cb_gps, ctx);
     }
-    //end gps uart
 
-    ViewPort* view_port = view_port_alloc();
-    view_port_draw_callback_set(view_port, render_callback, ctx);
-    view_port_input_callback_set(view_port, input_callback, ctx->queue);
-
-    Gui* gui = furi_record_open(RECORD_GUI);
-    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
-
-    FuriTimer* timer = furi_timer_alloc(tick_callback, FuriTimerTypePeriodic, ctx->queue);
-    furi_timer_start(timer, 100);
-
-    // application loop
-    Event event;
-    bool processing = true;
-    do {
-        if(furi_message_queue_get(ctx->queue, &event, FuriWaitForever) == FuriStatusOk) {
-            furi_mutex_acquire(ctx->mutex, FuriWaitForever);
-            switch(event.type) {
-            case EventTypeKey:
-                // applicatie verlaten
-                if(event.input.type == InputTypeShort && event.input.key == InputKeyBack) {
-                    processing = false;
-                } else if(event.input.type == InputTypeLong && event.input.key == InputKeyBack) {
-                    processing = false;
-                } else if(event.input.type == InputTypeLong && event.input.key == InputKeyOk) {
-                    // remove accespoint
-                    if(ctx->access_points_count > 0) {
-                        for(int i = ctx->access_points_index; i < ctx->access_points_count - 1;
-                            i++) {
-                            ctx->access_points[i] = ctx->access_points[i + 1];
-                        }
-                        ctx->access_points_count--;
-                        if(ctx->access_points_index >= ctx->access_points_count) {
-                            ctx->access_points_index = ctx->access_points_count - 1;
-                        }
-                    }
-                } else if(event.input.type == InputTypePress && event.input.key == InputKeyDown) {
-                    ctx->access_points_index--;
-                    if(ctx->access_points_index < 0) {
-                        ctx->access_points_index = ctx->access_points_count - 1;
-                    }
-                    ctx->active_access_point = ctx->access_points[ctx->access_points_index];
-                } else if(event.input.type == InputTypePress && event.input.key == InputKeyUp) {
-                    ctx->access_points_index++;
-                    if(ctx->access_points_index >= ctx->access_points_count) {
-                        ctx->access_points_index = 0;
-                    }
-                    ctx->active_access_point = ctx->access_points[ctx->access_points_index];
-                } else if(event.input.type == InputTypePress && event.input.key == InputKeyLeft) {
-                } else if(event.input.type == InputTypePress && event.input.key == InputKeyRight) {
-                }
-                ctx->pressedButton = true;
-                break;
-            case EventTypeTick:
-
-                // fix for the empty active access point when there was no interaction
-                if(!ctx->pressedButton) {
-                    ctx->access_points_index = 0;
-                    ctx->active_access_point = ctx->access_points[ctx->access_points_index];
-                }
-
-                break;
-
-            default:
-                break;
-            }
-
-            view_port_update(view_port);
-        } else {
-            processing = false;
-        }
-    } while(processing);
-
-    // save the data to the file
-    Storage* storage = furi_record_open(RECORD_STORAGE);
-    FuriHalRtcDateTime datetime;
-    furi_hal_rtc_get_datetime(&datetime);
-
-    FuriString* filename = furi_string_alloc();
-    furi_string_printf(
-        filename,
-        "%d_%d_%d_%d_%d_%d.txt",
-        datetime.year,
-        datetime.month,
-        datetime.day,
-        datetime.hour,
-        datetime.minute,
-        datetime.second);
-
-    FuriString* path = furi_string_alloc();
-    furi_string_printf(path, "/ext/apps_data/llsniffer/%s", furi_string_get_cstr(filename));
-
-    // open file
-    ctx->file = storage_file_alloc(storage);
-
-    if(!storage_common_exists(storage, EXT_PATH("apps_data/llsniffer"))) {
-        storage_common_mkdir(storage, EXT_PATH("apps_data/llsniffer"));
-    }
-
-    if(!storage_file_open(ctx->file, furi_string_get_cstr(path), FSAM_WRITE, FSOM_OPEN_ALWAYS)) {
-        FURI_LOG_E(appname, "Failed to open file");
-    }
-
-    for(int i = 0; i < ctx->access_points_count; i++) {
-        AccessPoint ap = ctx->access_points[i];
-        furi_string_printf(
-            ctx->buffer2,
-            "%s,%s,%s,%d,%d,%d,%d,%d,%d,%d,%d,%f,%f\r\n",
-            "Accesspoint",
-            ap.ssid,
-            ap.bssid,
-            ap.rssi,
-            ap.channel,
-            ap.datetime.year,
-            ap.datetime.month,
-            ap.datetime.day,
-            ap.datetime.hour,
-            ap.datetime.minute,
-            ap.datetime.second,
-            (double)ap.latitude,
-            (double)ap.longitude);
-
-        if(!storage_file_write(
-               ctx->file,
-               furi_string_get_cstr(ctx->buffer2),
-               strlen(furi_string_get_cstr(ctx->buffer2)))) {
-            FURI_LOG_E(appname, "Failed to write AP to file");
-        }
-    }
-
-    // free everything
-    furi_record_close(RECORD_NOTIFICATION);
-    furi_timer_free(timer);
-    view_port_enabled_set(view_port, false);
-    gui_remove_view_port(gui, view_port);
-    view_port_free(view_port);
-    furi_record_close(RECORD_GUI);
-    furi_message_queue_free(ctx->queue);
-    furi_mutex_free(ctx->mutex);
+    return;
+}
 
+void wardriver_uart_deinit(Context* ctx) {
     furi_thread_flags_set(furi_thread_get_id(ctx->thread_esp), WorkerEvtStop);
     furi_thread_join(ctx->thread_esp);
     furi_thread_free(ctx->thread_esp);
+    furi_hal_uart_set_irq_cb(UART_CH_ESP, NULL, NULL);
+    furi_stream_buffer_free(ctx->rx_stream_esp);
 
     if(UART_CH_ESP != UART_CH_GPS) {
         furi_thread_flags_set(furi_thread_get_id(ctx->thread_gps), WorkerEvtStop);
         furi_thread_join(ctx->thread_gps);
         furi_thread_free(ctx->thread_gps);
+        furi_hal_uart_set_irq_cb(UART_CH_GPS, NULL, NULL);
+        furi_stream_buffer_free(ctx->rx_stream_gps);
     }
 
-    storage_file_close(ctx->file);
-    storage_file_free(ctx->file);
-    furi_record_close(RECORD_STORAGE);
-    free(ctx);
-
-    furi_hal_light_set(LightBlue, 0);
-    furi_hal_light_set(LightGreen, 0);
-
     if(UART_CH_ESP == FuriHalUartIdLPUART1) {
         furi_hal_uart_deinit(UART_CH_ESP);
     } else if(UART_CH_ESP == FuriHalUartIdUSART1) {
@@ -825,9 +473,5 @@ int32_t wifisniffer_app(void* p) {
         furi_hal_console_enable();
     }
 
-    if(furi_hal_power_is_otg_enabled()) {
-        furi_hal_power_disable_otg();
-    }
-
-    return 0;
-}
+    return;
+}

applications/external/wardriver/wardriver_uart.h

@@ -0,0 +1,17 @@
+#include "wardriver.h"
+
+#define UART_CH_ESP \
+    (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
+
+#define UART_CH_GPS \
+    (xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
+
+#define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
+
+typedef enum {
+    WorkerEvtStop = (1 << 0),
+    WorkerEvtRxDone = (1 << 1),
+} WorkerEvtFlags;
+
+void wardriver_uart_init(Context* ctx);
+void wardriver_uart_deinit(Context* ctx);