upd gravity

non_catalog_apps/esp32_gravity/README.md

@@ -108,20 +108,21 @@ which esp32-Gravity is compatible with which Flipper-Gravity.
 * Probe: Any, target-ssids, APs
 * Sniff: On, Off
 * target-ssids: add, remove, list
-* scan: on, off
+* scan: <ssid> WiFi BT BLE OFF
 * hop: on, off, sequential, random, default, set
-* view: sta, ap, sta+ap
-* select: sta, ap
-* selected: sta, ap, sta+ap
-* clear: sta, ap
-* get/set: <variables>
+* view: sta, ap, bt, sta+ap+bt, sta+ap
+* select: sta, ap, bt
+* selected: sta, ap, bt, sta+ap+bt
+* clear: sta, ap, bt
+* purge: WiFi, BT, BLE
+* get/set: <variables> BLE_PURGE_STRAT _MIN_AGE _MAX_RSSI
 * deauth: off, frame STA, device STA, spoof STA, frame APs, device APs, spoof APs, frame broadcast, device broadcast, spoof broadcast
 * mana: on, off, clear
 * mana verbose: on, off
 * mana loud: on, off
 * DOS AP: on, off
 * DOS Clone: status, off, Open, WEP, WPA, Open+WEP, Open+WPA, WEP+WPA, Open+WEP+WPA
-* Homing: 802.11, any (more options coming soon)
+* Homing: 802.11, Bluetooth, any (more options coming soon)
 * help: commands help info
 
 

non_catalog_apps/esp32_gravity/application.fam

@@ -11,6 +11,7 @@ App(
     fap_icon_assets="assets",
     fap_icon_assets_symbol="uart_terminal",
     fap_author="https://github.com/chris-bc",
-    fap_version="0.2.1",
+    fap_weburl="https://github.com/chris-bc/Flipper-Gravity",
+    fap_version="0.5.0",
     fap_description="App to control ESP32 Gravity wireless exploration platform.",
 )

non_catalog_apps/esp32_gravity/scenes/uart_terminal_scene_start.c

@@ -28,13 +28,6 @@ typedef struct {
 */
 const UART_TerminalItem items[NUM_MENU_ITEMS] = {
     {"Console", {"View", "Clear"}, 2, {"", "cls"}, NO_ARGS, FOCUS_CONSOLE_END, NO_TIP},
-    {"Bluetooth",
-    {"On", "Off"},
-    2,
-    {"bluetooth on", "bluetooth off"},
-    NO_ARGS,
-    FOCUS_CONSOLE_END,
-    NO_TIP},
     {"Beacon",
     {"Status", "target-ssids", "APs", "RickRoll", "Random", "Infinite", "Off"},
     7,
@@ -71,9 +64,9 @@ const UART_TerminalItem items[NUM_MENU_ITEMS] = {
     FOCUS_CONSOLE_END,
     NO_TIP},
     {"Scan",
-    {"Status", "On", "Off", "<ssid>"},
-    4,
-    {"scan", "scan on", "scan off", "scan "},
+    {"Status", "<SSID>", "WiFi", "BT", "BLE", "Off"},
+    6,
+    {"scan", "scan ", "scan wifi", "scan bt", "scan ble", "scan off"},
     TOGGLE_ARGS,
     FOCUS_CONSOLE_END,
     NO_TIP},
@@ -85,44 +78,51 @@ const UART_TerminalItem items[NUM_MENU_ITEMS] = {
     FOCUS_CONSOLE_END,
     NO_TIP},
     {"View",
-    {"STA", "AP", "STA+AP"},
-    3,
-    {"view sta", "view ap", "view sta ap"},
+    {"STA", "AP", "BT", "BT+AP+STA", "STA+AP"},
+    5,
+    {"view sta", "view ap", "view bt", "view ap sta bt", "view sta ap"},
     NO_ARGS,
     FOCUS_CONSOLE_START,
     NO_TIP},
     {"Select",
-    {"STA", "AP"},
-    2,
-    {"select sta ", "select ap "},
+    {"STA", "AP", "BT"},
+    3,
+    {"select sta ", "select ap ", "select bt "},
     INPUT_ARGS,
     FOCUS_CONSOLE_END,
     NO_TIP},
     {"Selected",
-    {"STA", "AP", "STA+AP"},
-    3,
-    {"selected sta", "selected ap", "selected"},
+    {"STA", "AP", "BT", "AP+STA+BT"},
+    4,
+    {"selected sta", "selected ap", "selected bt", "selected"},
     NO_ARGS,
     FOCUS_CONSOLE_START,
     NO_TIP},
     {"Clear",
-    {"STA", "AP", "ALL"},
-    3,
-    {"clear sta", "clear ap", "clear all"},
+    {"STA", "AP", "BT", "ALL"},
+    4,
+    {"clear sta", "clear ap", "clear bt", "clear all"},
+    NO_ARGS,
+    FOCUS_CONSOLE_END,
+    NO_TIP},
+    {"Purge",
+    {"BLE"},
+    1,
+    {"purge ble"},
     NO_ARGS,
     FOCUS_CONSOLE_END,
     NO_TIP},
     {"Get",
-    {"pkt expiry", "SSID rnd chars", "Attack millis", "SSID min len", "SSID max len", "default SSID count", "Channel", "MAC", "MAC Randomisation"},
-    9,
-    {"get expiry", "get scramble_words", "get attack_millis", "get ssid_len_min", "get ssid_len_max", "get default_ssid_count", "get channel", "get mac", "get mac_rand"},
+    {"pkt expiry", "SSID rnd chars", "Attack millis", "SSID min len", "SSID max len", "default SSID count", "Channel", "MAC", "MAC Randomisation", "Purge Strategy", "Purge Min Age", "Purge Max RSSI"},
+    12,
+    {"get expiry", "get scramble_words", "get attack_millis", "get ssid_len_min", "get ssid_len_max", "get default_ssid_count", "get channel", "get mac", "get mac_rand", "get ble_purge_strat", "get ble_purge_min_age", "get ble_purge_max_rssi"},
     NO_ARGS,
     FOCUS_CONSOLE_END,
     NO_TIP},
     {"Set",
-    {"pkt expiry", "SSID rnd chars", "Attack millis", "SSID min len", "SSID max len", "default SSID count", "Channel", "MAC", "MAC Randomisation"},
-    9,
-    {"set expiry ", "set scramble_words ", "set attack_millis ", "set ssid_len_min ", "set ssid_len_max ", "set default_ssid_count ", "set channel ", "set mac ", "set mac_rand "},
+    {"pkt expiry", "SSID rnd chars", "Attack millis", "SSID min len", "SSID max len", "default SSID count", "Channel", "MAC", "MAC Randomisation", "Purge Strategy", "Purge Min Age", "Purge Max RSSI"},
+    12,
+    {"set expiry ", "set scramble_words ", "set attack_millis ", "set ssid_len_min ", "set ssid_len_max ", "set default_ssid_count ", "set channel ", "set mac ", "set mac_rand ", "set BLE_PURGE_STRAT ", "set BLE_PURGE_MIN_AGE ", "set BLE_PURGE_MAX_RSSI "},
     INPUT_ARGS,
     FOCUS_CONSOLE_END,
     NO_TIP},
@@ -169,9 +169,9 @@ const UART_TerminalItem items[NUM_MENU_ITEMS] = {
     FOCUS_CONSOLE_END,
     NO_TIP},
     {"Homing",
-    {"802.11", "ANY"},
+    {"On", "Off"},
     2,
-    {"stalk on", "stalk on"},
+    {"stalk on", "stalk off"},
     NO_ARGS,
     FOCUS_CONSOLE_END,
     NO_TIP},

non_catalog_apps/esp32_gravity/uart_terminal_app_i.h

@@ -12,7 +12,7 @@
 #include <gui/modules/variable_item_list.h>
 #include "uart_text_input.h"
 
-#define GRAVITY_VERSION "0.3.4"
+#define GRAVITY_VERSION "0.5.0"
 
 #define NUM_MENU_ITEMS (23)