deauther and readme

ReadMe.md

@@ -25,8 +25,9 @@ Thank you to all the supporters!
 - Updated: [Intravelometer (By theageoflove)](https://github.com/theageoflove/flipperzero-zeitraffer)
 - Added: [IR Remote (By Hong5489)](https://github.com/Hong5489/ir_remote)
 - Removed: [POCSAG (By Shmuma)](https://github.com/Shmuma/flipper-zero-pocsag)
-- Updated: [Lightmeter (By oleksiikutuzov)](https://github.com/oleksiikutuzov/flipperzero-lightmeter) `Req: BH1750`
 - Added: [WS: fix protocol and add new #2116 (By Skorpionm)](https://github.com/flipperdevices/flipperzero-firmware/pull/2116)
+- Updated: [Lightmeter (By oleksiikutuzov)](https://github.com/oleksiikutuzov/flipperzero-lightmeter) `Req: BH1750`
+- Updated: [WiFi (Deauther) V2 (By Timmotools)](https://github.com/Timmotools/flipperzero_esp8266_deautherv2) `Req: ESP8266` 
 
 ## Install from Release
 FLASH STOCK FIRST BEFORE UPDATING TO CUSTOM FIRMWARE!

applications/plugins/wifi_deauther_v2/README.md

@@ -1,10 +1,13 @@
-# THIS IS OUTDATED
 # flipperzero_esp8266_deautherv2
 Flipper Zero esp8266 deauther app.
 
 
 Based off the WiFi Marauder App from 0xchocolate.
 
+Thanks to Roguemaster for fixing some issues I had with the code and didnt get a chance to get to. I have now uploaded these changes into the source. 
+
+I have also successfully built this with unleashed souce as well and included the FAP file here. unleashed version unlshd-020.
+
 https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion
 
 https://github.com/RogueMaster/flipperzero-firmware-wPlugins/tree/unleashed/applications/wifi_marauder_companion
@@ -33,10 +36,13 @@ TX--------U_RX
 
 
 
-Video in action.
+Video in action (old version).
 https://youtu.be/_RFzZyPkeR0
 
-If you want to disable the built in WiFi access and web interface (only use flipper to serial send commands) then select "set webinterface false", "save settings" and "reboot". When it starts back up you wont see the pwned AP any more.
+New video and install instructions.
+https://youtu.be/CKK7t0TaRVQ
+
+If you want to disable the built in WiFi access and web interface (only use flipper to send serial commands) then select "set webinterface false", "save settings" and "reboot". When it starts back up you wont see the pwned AP any more.
 
 I installed this into Roguemaster to test.
 

applications/plugins/wifi_deauther_v2/application.fam

@@ -1,6 +1,6 @@
 App(
     appid="ESP8266_Wifi_Deauther",
-    name="[ESP8266] WiFi (Deauther)",
+    name="[ESP8266] WiFi (Deauther) v2",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_deauther_app",
     cdefines=["APP_WIFI_deauther"],

applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_console_output.c

@@ -21,6 +21,13 @@ void wifi_deauther_console_output_handle_rx_data_cb(uint8_t* buf, size_t len, vo
 void wifi_deauther_scene_console_output_on_enter(void* context) {
     WifideautherApp* app = context;
 
+    // Register callback to receive data
+    wifi_deauther_uart_set_handle_rx_data_cb(
+        app->uart, wifi_deauther_console_output_handle_rx_data_cb); // setup callback for rx thread
+    
+    // Give a small delay to allow UART to settle.
+    furi_delay_ms(600);
+
     TextBox* text_box = app->text_box;
     text_box_reset(app->text_box);
     text_box_set_font(text_box, TextBoxFontText);
@@ -32,18 +39,7 @@ void wifi_deauther_scene_console_output_on_enter(void* context) {
     if(app->is_command) {
         furi_string_reset(app->text_box_store);
         app->text_box_store_strlen = 0;
-        if(0 == strncmp("help", app->selected_tx_string, strlen("help"))) {
-            const char* help_msg =
-                "For app support/feedback,\nreach out to me:\n@cococode#6011 (discord)\n0xchocolate (github)\n";
-            furi_string_cat_str(app->text_box_store, help_msg);
-            app->text_box_store_strlen += strlen(help_msg);
-        }
 
-        if(app->show_stopscan_tip) {
-            const char* help_msg = "Press BACK to send stopscan\n";
-            furi_string_cat_str(app->text_box_store, help_msg);
-            app->text_box_store_strlen += strlen(help_msg);
-        }
     } else { // "View Log" menu action
         text_box_set_text(app->text_box, furi_string_get_cstr(app->text_box_store));
     }
@@ -51,9 +47,7 @@ void wifi_deauther_scene_console_output_on_enter(void* context) {
     scene_manager_set_scene_state(app->scene_manager, WifideautherSceneConsoleOutput, 0);
     view_dispatcher_switch_to_view(app->view_dispatcher, WifideautherAppViewConsoleOutput);
 
-    // Register callback to receive data
-    wifi_deauther_uart_set_handle_rx_data_cb(
-        app->uart, wifi_deauther_console_output_handle_rx_data_cb); // setup callback for rx thread
+    
 
     // Send command with newline '\n'
     if(app->is_command && app->selected_tx_string) {

applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_start.c

@@ -33,6 +33,13 @@ const WifideautherItem MenuItems[NUM_MENU_ITEMS] = {
      NO_ARGS,
      FOCUS_CONSOLE_END,
      NO_TIP},
+    {"Show",
+     {"SSIDs", "Stations", "All", "Selected"},
+     4,
+     {"show ap", "show station", "show all", "show selected"},
+     NO_ARGS,
+     FOCUS_CONSOLE_END,
+     NO_TIP},
     {"Select",
      {"All", "SSIDs", "Stations"},
      3,
@@ -47,13 +54,6 @@ const WifideautherItem MenuItems[NUM_MENU_ITEMS] = {
      INPUT_ARGS,
      FOCUS_CONSOLE_END,
      NO_TIP},
-    {"Show",
-     {"SSIDs", "Stations", "All", "Selected"},
-     4,
-     {"show ap", "show station", "show all", "show selected"},
-     NO_ARGS,
-     FOCUS_CONSOLE_END,
-     NO_TIP},
     {"Attack",
      {"deauth", "deauthall", "beacon", "probe"},
      4,

applications/plugins/wifi_deauther_v2/scenes/wifi_deauther_scene_text_input.c

@@ -25,16 +25,24 @@ void wifi_deauther_scene_text_input_on_enter(void* context) {
     // Setup view
     TextInput* text_input = app->text_input;
     // Add help message to header
-    if(0 == strncmp("ssid -a -g", app->selected_tx_string, strlen("ssid -a -g"))) {
-        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"))) {
-        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"))) {
-        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"))) {
-        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"))) {
-        text_input_set_header_text(text_input, "Add target from SSID list");
+    if(0 == strncmp("select aps", app->selected_tx_string, strlen("select aps"))) {
+        text_input_set_header_text(text_input, "Enter SSID ID to attack");
+    } else if(0 == strncmp("select stations", app->selected_tx_string, strlen("select stations"))) {
+        text_input_set_header_text(text_input, "Enter Station ID to attack");
+    }if(0 == strncmp("deselect aps", app->selected_tx_string, strlen("deselect aps"))) {
+        text_input_set_header_text(text_input, "Enter SSID ID to remove");
+    } else if(0 == strncmp("deselect stations", app->selected_tx_string, strlen("deselect stations"))) {
+        text_input_set_header_text(text_input, "Enter Station ID to remove");
+    } else if(0 == strncmp("get settings", app->selected_tx_string, strlen("get settings"))) {
+        text_input_set_header_text(text_input, "Get setting. Enter for all");
+    } else if(0 == strncmp("set webinterface false", app->selected_tx_string, strlen("set webinterface false"))) {
+        text_input_set_header_text(text_input, "Disable PWNED management AP");
+    } else if(0 == strncmp("set ssid: pwned", app->selected_tx_string, strlen("set ssid: pwned"))) {
+        text_input_set_header_text(text_input, "Change management SSID");
+    } else if(0 == strncmp("set password: deauther", app->selected_tx_string, strlen("set password: deauther"))) {
+        text_input_set_header_text(text_input, "Change management PWD");
+    } else if(0 == strncmp("save settings", app->selected_tx_string, strlen("save settings"))) {
+        text_input_set_header_text(text_input, "Save Settings");
     } else {
         text_input_set_header_text(text_input, "Add command arguments");
     }
@@ -49,6 +57,7 @@ void wifi_deauther_scene_text_input_on_enter(void* context) {
     view_dispatcher_switch_to_view(app->view_dispatcher, WifideautherAppViewTextInput);
 }
 
+///*
 bool wifi_deauther_scene_text_input_on_event(void* context, SceneManagerEvent event) {
     WifideautherApp* app = context;
     bool consumed = false;
@@ -70,3 +79,4 @@ void wifi_deauther_scene_text_input_on_exit(void* context) {
 
     text_input_reset(app->text_input);
 }
+//*/