Latest Release RM0314-1523-0.99.2-18e367c on PATREON - UPD BLE SPAM

RogueMaster · Mar 15, 2024 · c0f3b50 · c0f3b50
2 parents 8cf9765 + 4f42d7a
commit c0f3b50
Show file tree

Hide file tree

Showing 18 changed files with 147 additions and 29 deletions.
diff --git a/ReadMe.md b/ReadMe.md
@@ -49,6 +49,7 @@ This software is for experimental purposes only and is not meant for any illegal
 - Updated: [Authenticator/TOTP v5.13.0 (By akopachov)](https://github.com/akopachov/flipper-zero_authenticator)
 - JS Script: [BadUSB_Win_Exfil-GSHD.js Updated (By Gas Station Hot Dog & b0r0xZ & mistura.)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/48db90e2dd54162c3667f4a9ae74cf2921a3c159)
 - Added: [Evil Portal Asset: `RickrollWithRespond.html` (By feder133)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/12121e1c0fcf7c5377c6b84f24784270020232d3)
+- Updated: [BLE Spam v6.1 (By Willy-JL & ECTO-1A & Spooks4576 with research from xMasterX; OFW API thanks to noproto)](https://github.com/Next-Flip/Momentum-Apps/tree/dev/ble_spam)
 
 <a name="release">
 
@@ -344,7 +345,7 @@ $ ./fbt dolphin_ext
 - [Battery Checker (By Programistich)](https://github.com/Programistich/battery_checker)
 - [BG Loader (By twisted-pear)](https://github.com/twisted-pear/bgloader)
 - [BlackJack Counter v1.0 (By grugnoymeme)](https://github.com/grugnoymeme/flipperzero-blackjack_counter-fap)
-- [BLE Spam v6.0 (By Willy-JL & ECTO-1A & Spooks4576 with research from xMasterX; OFW API thanks to noproto)](https://github.com/noproto/apple_ble_spam_ofw)
+- [BLE Spam v6.1 (By Willy-JL & ECTO-1A & Spooks4576 with research from xMasterX; OFW API thanks to noproto)](https://github.com/Next-Flip/Momentum-Apps/tree/dev/ble_spam)
 - [Bluetooth/USB Remote v1.7 (By Cutch)-OFW](https://github.com/flipperdevices/flipperzero-firmware/pull/1330) [Accelerated Mouse Pointer (By LeeroysHub)](https://github.com/LeeroysHub/flipperzero-firmware-wPlugins/commit/f67680d5b004a72419550a8268802030a8421643)
 - [BMI Air Mouse v1.1 (By ginkage)](https://github.com/ginkage/FlippAirMouse/) `Req: BMI160`
 - [BPM Tapper v1.1 (By panki27)](https://github.com/panki27/bpm-tapper)
@@ -540,7 +541,7 @@ $ ./fbt dolphin_ext
 - [USB Midi (By DrZlo13)](https://github.com/DrZlo13/flipper-zero-usb-midi) [Instructions by ESurge](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/blob/420/applications/plugins/usb_midi/ReadMe.md)
 - [VGM Air Mouse v1.2 (By nminaylov)](https://github.com/flipperdevices/flipperzero-good-faps/tree/nm/motion_mouse_app) `Req: ICM42688, or Video Game Module By Flipper Devices`
 - [Video Player v0.3 (By LTVA1)](https://github.com/LTVA1/flipper-zero-video-player)
-- [Wardriver GPS v1.0 (By Sil333033)](https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/d4f7c1406dfdfa2768983e8723f5f2f6639aeefe)
+- [Wardriver GPS v1.0 (By Sil333033)](https://github.com/Next-Flip/Momentum-Apps/tree/dev/wardriver)
 - [WAV Player v1.1 (By DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player) Updated by Atmanos & RogueMaster To Work.  [Updated by xMasterX](https://github.com/DarkFlippers/unleashed-firmware/commit/76d3f84a5eb069b749e3ad20df6fdbbc785eb253)
 - [WAV Recorder (By scrolltex)](https://github.com/scrolltex/flipper-wav-recorder)
 - [WHC SWIO Flasher v1.0 (By sukvojte)](https://github.com/sukvojte/wch_swio_flasher)

diff --git a/applications/external/ble_spam/application.fam b/applications/external/ble_spam/application.fam
@@ -8,8 +8,9 @@ App(
     fap_category="Bluetooth",
     fap_icon_assets="icons",
     fap_icon_assets_symbol="ble_spam",
+    fap_file_assets="resources",
     fap_author="Willy-JL & ECTO-1A & Spooks4576",
-    fap_weburl="https://github.com/noproto/apple_ble_spam_ofw",
-    fap_version="6.0",
+    fap_weburl="https://github.com/Next-Flip/Momentum-Apps/tree/dev/ble_spam",
+    fap_version="6.1",
     fap_description="Flood BLE advertisements to cause spammy and annoying popups/notifications",
 )
diff --git a/applications/external/ble_spam/protocols/nameflood.c b/applications/external/ble_spam/protocols/nameflood.c
@@ -1,31 +1,64 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "nameflood.h"
 #include "_protocols.h"
+#include <storage/storage.h>
 
 // Hacked together by @Willy-JL
 
-static const char* names[] = {
-    "Assquach💦",
-    "Flipper 🐬",
-    "iOS 17 🍎",
-    "Kink💦",
-    "👉👌",
-    "🔵🦷",
-};
-static const uint8_t names_count = COUNT_OF(names);
-
 static const char* get_name(const Payload* payload) {
     UNUSED(payload);
     return "NameFlood";
 }
 
+static const char* make_name(const Payload* payload) {
+    UNUSED(payload);
+    static const char* names[256];
+    static uint8_t names_count = 0;
+
+    if(names_count == 0) {
+        Storage* storage = furi_record_open(RECORD_STORAGE);
+        if(storage) {
+            File* file = storage_file_alloc(storage);
+            if(storage_file_open(
+                   file,
+                   "/ext/apps_assets/ble_spam/floodlist.txt",
+                   FSAM_READ,
+                   FSOM_OPEN_EXISTING)) {
+                char line[256];
+                uint64_t bytes_read = storage_file_read(file, line, sizeof(line));
+                if(bytes_read > 0) {
+                    line[bytes_read] = '\0';
+
+                    char* name = strtok(line, ",");
+                    while(name && names_count < 255) {
+                        names[names_count++] = strdup(name);
+                        name = strtok(NULL, ",");
+                    }
+                }
+                storage_file_close(file);
+            }
+            storage_file_free(file);
+            furi_record_close(RECORD_STORAGE);
+        }
+    }
+
+    if(names_count == 0) {
+        return "NameFlood";
+    } else {
+        return names[rand() % names_count];
+    }
+}
+
 static void make_packet(uint8_t* _size, uint8_t** _packet, Payload* payload) {
     NamefloodCfg* cfg = payload ? &payload->cfg.nameflood : NULL;
 
     const char* name;
     switch(cfg ? payload->mode : PayloadModeRandom) {
     case PayloadModeRandom:
     default:
-        name = names[rand() % names_count];
+        name = make_name(payload);
         break;
     case PayloadModeValue:
         name = cfg->name;

diff --git a/applications/external/ble_spam/protocols/swiftpair.c b/applications/external/ble_spam/protocols/swiftpair.c
@@ -1,18 +1,48 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "swiftpair.h"
 #include "_protocols.h"
+#include <storage/storage.h>
 
 // Hacked together by @Willy-JL and @Spooks4576
 // Documentation at https://learn.microsoft.com/en-us/windows-hardware/design/component-guidelines/bluetooth-swift-pair
 
-static const char* names[] = {
-    "Assquach💦",
-    "Flipper 🐬",
-    "iOS 17 🍎",
-    "Kink💦",
-    "👉👌",
-    "🔵🦷",
-};
-static const uint8_t names_count = COUNT_OF(names);
+static const char* make_name(const Payload* payload) {
+    UNUSED(payload);
+    static const char* names[256];
+    static uint8_t names_count = 0;
+
+    if(names_count == 0) {
+        Storage* storage = furi_record_open(RECORD_STORAGE);
+        if(storage) {
+            File* file = storage_file_alloc(storage);
+            if(storage_file_open(
+                   file, "/ext/apps_assets/ble_spam/winlist.txt", FSAM_READ, FSOM_OPEN_EXISTING)) {
+                char line[256];
+                uint64_t bytes_read = storage_file_read(file, line, sizeof(line));
+                if(bytes_read > 0) {
+                    line[bytes_read] = '\0';
+
+                    char* name = strtok(line, ",");
+                    while(name && names_count < 255) {
+                        names[names_count++] = strdup(name);
+                        name = strtok(NULL, ",");
+                    }
+                }
+                storage_file_close(file);
+            }
+            storage_file_free(file);
+            furi_record_close(RECORD_STORAGE);
+        }
+    }
+
+    if(names_count == 0) {
+        return "NameFlood";
+    } else {
+        return names[rand() % names_count];
+    }
+}
 
 static const char* get_name(const Payload* payload) {
     UNUSED(payload);
@@ -26,7 +56,7 @@ static void make_packet(uint8_t* _size, uint8_t** _packet, Payload* payload) {
     switch(cfg ? payload->mode : PayloadModeRandom) {
     case PayloadModeRandom:
     default:
-        name = names[rand() % names_count];
+        name = make_name(payload);
         break;
     case PayloadModeValue:
         name = cfg->name;

diff --git a/applications/external/ble_spam/resources/floodlist.txt b/applications/external/ble_spam/resources/floodlist.txt
@@ -0,0 +1 @@
+🛞RM-FW🛞,Assquach💦,iOS 17 🍎,Flipper 🐬,👋,👉👌
diff --git a/applications/external/ble_spam/resources/winlist.txt b/applications/external/ble_spam/resources/winlist.txt
@@ -0,0 +1 @@
+🛞RM-FW🛞,Assquach💦,iOS 17 🍎,Flipper 🐬,👋,👉👌
diff --git a/applications/external/programmer_calc/calculation_logic.c b/applications/external/programmer_calc/calculation_logic.c
@@ -332,7 +332,7 @@ void calculate(Calculator* calculator_state) {
             snprintf(
                 calculator_state->hexToBinResult,
                 sizeof(calculator_state->hexToBinResult),
-                "Error    ---------");
+                "Error    ---------Input:   64-bit");
         }
         break;
 
@@ -347,7 +347,7 @@ void calculate(Calculator* calculator_state) {
             snprintf(
                 calculator_state->hexToDecResult,
                 sizeof(calculator_state->hexToDecResult),
-                "Error    ---------");
+                "Error    ---------Input:   2^64 - 1");
         }
         break;
 
@@ -374,7 +374,7 @@ void calculate(Calculator* calculator_state) {
             snprintf(
                 calculator_state->binToHexResult,
                 sizeof(calculator_state->binToHexResult),
-                "Error    ---------");
+                "Error    ---------Input:   64-bit");
         }
         break;
 

diff --git a/applications/external/programmer_calc/docs/README_catalog.md b/applications/external/programmer_calc/docs/README_catalog.md
@@ -0,0 +1,38 @@
+# Programmer Calculator
+
+## Introduction
+A Calculator for Programmers!
+
+
+## Basic Controls
+
+- "**<**" (Backspace) : Press the < button to delete the last digit from the input field. This can be used to correct mistakes or modify your input before conversion.
+- "**=**" (Convert): Press the = button to convert the input digits according to the selected mode. Ensure your input is within the mode's threshold for a successful conversion.
+- "**CLR**" (Clear): Use the CLR button to clear both the input and output fields, resetting them for a new conversion.
+
+## Selecting Modes
+
+Press "**M**" to cycle through and select the conversion mode you need. 
+- Each mode has its specific use and threshold limits:
+
+
+| Conversion Mode       | Description              | Threshold             |
+|-----------------------|--------------------------|-----------------------|
+| **dec >> bin**        | Decimal to Binary        | up to \(2^35 - 1\)    |
+| **dec >> hex**        | Decimal to Hexadecimal   | up to \(2^64 - 1\)    |
+| **dec >> char**       | Decimal to Character     | 0 – 255               |
+| **hex >> bin**        | Hexadecimal to Binary    | up to 64-bit inputs   |
+| **hex >> dec**        | Hexadecimal to Decimal   | up to \(2^64 - 1\)    |
+| **bin >> dec**        | Binary to Decimal        | up to \(2^64 - 1\)    |
+| **bin >> hex**        | Binary to Hexadecimal    | up to 64-bit inputs   |
+
+
+## Confirming Selections
+"**OK**": After choosing your desired mode with "**M**", press the OK button to confirm your selection and proceed with the conversion.
+
+## TODO
+- Refactor Code
+- Memory Management
+- Optimize Conversions
+- Add more Conversions
+- Documentation
diff --git a/applications/external/programmer_calc/docs/changelog.md b/applications/external/programmer_calc/docs/changelog.md
@@ -0,0 +1,13 @@
+# Changelog - Patch Notes
+
+## Version 0.9.2
+- Enhanced the Hexadecimal to Decimal conversion function for increased accuracy and efficiency.
+- Addressed and resolved various bugs to improve stability and functionality.
+- Add a secret!
+
+## Version 0.9.1
+- Improved output format for better readability and user experience.
+- Increased buffer size to enhance performance and accommodate larger data sets.
+
+## Version 0.9
+Initial release
diff --git a/applications/external/programmer_calc/img/1.png b/applications/external/programmer_calc/img/1.png
diff --git a/applications/external/programmer_calc/img/2.png b/applications/external/programmer_calc/img/2.png
diff --git a/applications/external/programmer_calc/img/3.png b/applications/external/programmer_calc/img/3.png
diff --git a/applications/external/programmer_calc/img/4.png b/applications/external/programmer_calc/img/4.png
diff --git a/applications/external/programmer_calc/img/5.png b/applications/external/programmer_calc/img/5.png
diff --git a/applications/external/programmer_calc/img/6.png b/applications/external/programmer_calc/img/6.png
diff --git a/applications/external/programmer_calc/img/7.png b/applications/external/programmer_calc/img/7.png
diff --git a/applications/external/programmer_calc/img/8.png b/applications/external/programmer_calc/img/8.png
diff --git a/applications/external/wardriver/application.fam b/applications/external/wardriver/application.fam
@@ -9,7 +9,7 @@ App(
     fap_icon_assets="icons",
     fap_icon_assets_symbol="wardriver",
     fap_author="Sil333033",
-    fap_weburl="https://github.com/RogueMaster/flipperzero-firmware-wPlugins/commit/d4f7c1406dfdfa2768983e8723f5f2f6639aeefe",
+    fap_weburl="https://github.com/Next-Flip/Momentum-Apps/tree/dev/wardriver",
     fap_version="1.0",
     fap_description="Sniff WiFi access points with GPS location coordinates",
 )