From 2da78ea228d2a05c21d85faf6c6935ead00307fa Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Wed, 20 Dec 2023 00:39:28 +0300 Subject: [PATCH] upd wifi marauder --- .../wifi_marauder_companion/application.fam | 2 +- .../wifi_marauder_companion/docs/changelog.md | 31 ++++++++++++++----- .../scenes/wifi_marauder_scene_user_input.c | 18 ++++++++--- .../wifi_marauder_app.h | 2 +- .../wifi_marauder_custom_event.h | 3 +- 5 files changed, 41 insertions(+), 15 deletions(-) diff --git a/base_pack/wifi_marauder_companion/application.fam b/base_pack/wifi_marauder_companion/application.fam index 8fdd93f62bd..d89427f8b5f 100644 --- a/base_pack/wifi_marauder_companion/application.fam +++ b/base_pack/wifi_marauder_companion/application.fam @@ -1,7 +1,7 @@ App( appid="esp32_wifi_marauder", name="[ESP32] WiFi Marauder", - fap_version=(6,5), + fap_version=(6,6), apptype=FlipperAppType.EXTERNAL, entry_point="wifi_marauder_app", requires=["gui"], diff --git a/base_pack/wifi_marauder_companion/docs/changelog.md b/base_pack/wifi_marauder_companion/docs/changelog.md index 3eab8619fcc..9971873fc32 100644 --- a/base_pack/wifi_marauder_companion/docs/changelog.md +++ b/base_pack/wifi_marauder_companion/docs/changelog.md @@ -1,10 +1,29 @@ -## v0.6.3 +## v0.6.6 -BT wardriving and Sour Apple! Requires a board with BT support. Thanks to @justcallmekoko for adding the new commands! +Bug fixes and new BLE spam commands! Thanks to @justcallmekoko for adding the new commands! I also fixed the script user input bug where it would hang after selecting "save". + +The BLE spam command format has changed and requires at least **FW v0.13.6**. Make sure you flash the latest release of Marauder FW to your wifi board: https://github.com/justcallmekoko/ESP32Marauder/releases/latest + +Note: if you're flashing directly from your flipper using the [ESP Flasher app](https://github.com/0xchocolate/flipperzero-esp-flasher), grab the bin that corresponds to your hardware and only reflash the Firmware partition. (If you have dual boot set up, then choose the slot where you want to install it. Otherwise, reflash FirmwareA only.) + +By the way, want to support app development by buying me a coffee? You finally have that option! https://ko-fi.com/cococode + +<3 @0xchocolate (cococode) + + +## v0.6.5 + +New option to load Evil Portal HTML files from the flipper sd card! -Make sure you flash the latest release of Marauder FW to your wifi board: https://github.com/justcallmekoko/ESP32Marauder/releases/tag/v0.13.0 -Note: if you're flashing directly from your flipper using the ESP Flasher app, grab the bin that corresponds to your hardware and only reflash the Firmware partition. (If you have dual boot set up, then choose the slot where you want to install it. Otherwise, reflash FirmwareA only.) +## v0.6.4 + +swiftpair spam and ESP32 sd card commands: sethtml, ls. Requires a board with BT and sd card support. Thanks to @justcallmekoko for adding the new commands! + + +## v0.6.3 + +BT wardriving and Sour Apple! Requires a board with BT support. Thanks to @justcallmekoko for adding the new commands! ## v0.6.2 @@ -13,10 +32,6 @@ Happy wardriving! Thanks to @justcallmekoko for adding the gps and wardrive comm Instructions to install a GPS module: https://github.com/justcallmekoko/ESP32Marauder/wiki/gps-modification -Make sure you flash the latest release of Marauder FW to your wifi board: https://github.com/justcallmekoko/ESP32Marauder/releases/tag/v0.11.1 - -Note: if you're flashing directly from your flipper using the ESP Flasher app, grab the bin that corresponds to your hardware and only reflash the Firmware partition. (If you have dual boot set up, then choose the slot where you want to install it. Otherwise, reflash FirmwareA only.) - ## v0.6.1 diff --git a/base_pack/wifi_marauder_companion/scenes/wifi_marauder_scene_user_input.c b/base_pack/wifi_marauder_companion/scenes/wifi_marauder_scene_user_input.c index 3d5697caf5f..1e4459f129f 100644 --- a/base_pack/wifi_marauder_companion/scenes/wifi_marauder_scene_user_input.c +++ b/base_pack/wifi_marauder_companion/scenes/wifi_marauder_scene_user_input.c @@ -91,7 +91,7 @@ void wifi_marauder_scene_user_input_ok_callback(void* context) { break; } - scene_manager_previous_scene(app->scene_manager); + view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventPrevScene); } void wifi_marauder_scene_user_input_on_enter(void* context) { @@ -143,9 +143,19 @@ void wifi_marauder_scene_user_input_on_enter(void* context) { } bool wifi_marauder_scene_user_input_on_event(void* context, SceneManagerEvent event) { - UNUSED(context); - UNUSED(event); - return false; + WifiMarauderApp* app = context; + + bool consumed = false; + + if(event.type == SceneManagerEventTypeCustom) { + if(event.event == WifiMarauderEventPrevScene) { + scene_manager_previous_scene(app->scene_manager); + consumed = true; + } + } + + return consumed; + } void wifi_marauder_scene_user_input_on_exit(void* context) { diff --git a/base_pack/wifi_marauder_companion/wifi_marauder_app.h b/base_pack/wifi_marauder_companion/wifi_marauder_app.h index 43eb7f15b3f..86ee3ef0cc9 100644 --- a/base_pack/wifi_marauder_companion/wifi_marauder_app.h +++ b/base_pack/wifi_marauder_companion/wifi_marauder_app.h @@ -4,7 +4,7 @@ extern "C" { #endif -#define WIFI_MARAUDER_APP_VERSION "v0.6.5" +#define WIFI_MARAUDER_APP_VERSION "v0.6.6" typedef struct WifiMarauderApp WifiMarauderApp; diff --git a/base_pack/wifi_marauder_companion/wifi_marauder_custom_event.h b/base_pack/wifi_marauder_companion/wifi_marauder_custom_event.h index b6d9f8274ef..9d2a89c6fae 100644 --- a/base_pack/wifi_marauder_companion/wifi_marauder_custom_event.h +++ b/base_pack/wifi_marauder_companion/wifi_marauder_custom_event.h @@ -9,5 +9,6 @@ typedef enum { WifiMarauderEventStartSettingsInit, WifiMarauderEventStartLogViewer, WifiMarauderEventStartScriptSelect, - WifiMarauderEventStartSniffPmkidOptions + WifiMarauderEventStartSniffPmkidOptions, + WifiMarauderEventPrevScene } WifiMarauderCustomEvent;