Merge wifi_marauder_companion from https://github.com/xMasterX/all-the-plugins

wifi_marauder_companion/.gitsubtree

@@ -1,2 +1,2 @@
-https://github.com/xMasterX/all-the-plugins dev base_pack/wifi_marauder_companion 2b434fbfbdbd99396bf7de8b49f64b35dee92c7e
+https://github.com/xMasterX/all-the-plugins dev base_pack/wifi_marauder_companion 89b0ac1cf3636cb42e00ed2125e525707eb9ebee
 https://github.com/0xchocolate/flipperzero-wifi-marauder feature_wifi_marauder_app /

wifi_marauder_companion/application.fam

@@ -1,7 +1,7 @@
 App(
     appid="esp32_wifi_marauder",
     name="[ESP32] WiFi Marauder",
-    fap_version=(7, 2),
+    fap_version=(7, 3),
     apptype=FlipperAppType.EXTERNAL,
     entry_point="wifi_marauder_app",
     requires=["gui"],

wifi_marauder_companion/docs/changelog.md

@@ -1,3 +1,10 @@
+## v0.7.3
+
+Thanks to @justcallmekoko for adding app support for the new features in Marauder firmware v1.6.0! See the additions and grab the firmware for your wifi board here: https://github.com/justcallmekoko/ESP32Marauder/releases/tag/v1.6.0
+
+<3 @0xchocolate (cococode)
+
+
 ## v0.7.2
 
 Thanks to @justcallmekoko for adding app support for the new features in Marauder firmware v1.1.0! See the additions and grab the firmware for your wifi board here: https://github.com/justcallmekoko/ESP32Marauder/releases/tag/v1.1.0

wifi_marauder_companion/scenes/wifi_marauder_scene_start.c

@@ -20,7 +20,7 @@ typedef enum {
 #define SHOW_STOPSCAN_TIP (true)
 #define NO_TIP            (false)
 
-#define MAX_OPTIONS (10)
+#define MAX_OPTIONS (13)
 typedef struct {
     const char* item_string;
     const char* options_menu[MAX_OPTIONS];
@@ -35,9 +35,9 @@ typedef struct {
 const WifiMarauderItem items[NUM_MENU_ITEMS] = {
     {"View Log from", {"start", "end"}, 2, {"", ""}, NO_ARGS, FOCUS_CONSOLE_TOGGLE, NO_TIP},
     {"Scan",
-     {"ap", "station"},
-     2,
-     {"scanap", "scansta"},
+     {"all", "ap", "station"},
+     3,
+     {"scanall", "scanap", "scansta"},
      NO_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
@@ -55,6 +55,13 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      NO_ARGS,
      FOCUS_CONSOLE_START,
      NO_TIP},
+    {"AP Info",
+     {""},
+     1,
+     {"info -a"},
+     INPUT_ARGS,
+     FOCUS_CONSOLE_END,
+     NO_TIP},
     {"Select",
      {"ap", "ssid", "station"},
      3,
@@ -129,8 +136,8 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
     {"Sniff",
-     {"beacon", "deauth", "pmkid", "probe", "pwn", "raw", "bt", "skim", "airtag", "flipper"},
-     10,
+     {"beacon", "deauth", "pmkid", "probe", "pwn", "raw", "bt", "skim", "airtag", "flipper", "packetcount", "pineapple", "multissid"},
+     13,
      {"sniffbeacon",
       "sniffdeauth",
       "sniffpmkid",
@@ -140,7 +147,10 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
       "sniffbt",
       "sniffskim",
       "sniffbt -t airtag",
-      "sniffbt -t flipper"},
+      "sniffbt -t flipper",
+      "packetcount",
+      "sniffpinescan",
+      "sniffmultissid"},
      NO_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
@@ -183,6 +193,7 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
     {"Update", {"sd"}, 1, {"update -s"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Reboot", {""}, 1, {"reboot"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Help", {""}, 1, {"help"}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
+    {"Info", {""}, 1, {"info"}, NO_ARGS, FOCUS_CONSOLE_START, NO_TIP},
     {"Scripts", {""}, 1, {""}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
     {"Save to flipper sdcard", // keep as last entry or change logic in callback below
      {""},

wifi_marauder_companion/wifi_marauder_app.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#define WIFI_MARAUDER_APP_VERSION "v0.7.2"
+#define WIFI_MARAUDER_APP_VERSION "v0.7.3"
 
 typedef struct WifiMarauderApp WifiMarauderApp;
 

wifi_marauder_companion/wifi_marauder_app_i.h

@@ -27,7 +27,7 @@
 #include <lib/toolbox/path.h>
 #include <dialogs/dialogs.h>
 
-#define NUM_MENU_ITEMS (25)
+#define NUM_MENU_ITEMS (27)
 
 #define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE   (4096)
 #define WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE (512)