Merge pull request #29 from eried/next

Update Marauder to v0.13.6 and companion to v0.6.6

Author: eried

docs/webinstaller/build/esp32cam_marauder.ino.bin

@@ -61,6 +61,10 @@ <h1>Mayhem for Flipper Zero -installer</h1>
 
 <div class="changelog-box">
 Changelog<br><br>
+v0.13.6 2023-12-20<br>
+* Updated Marauder to latest version<br>
+* Updated Marauder companion to v0.6.6<br>
+<br>
 v0.13.5 r1 2023-12-14<br>
 * Enabled bluetooth functionality for Marauder<br>
 <br>

docs/webinstaller/build/esp32cam_marauder.ino.elf

@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef __AXP192_H__
 #define __AXP192_H__
 

docs/webinstaller/build/esp32cam_marauder.ino.map

@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef BatteryInterface_h
 #define BatteryInterface_h
 

docs/webinstaller/index.html

@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef Buffer_h
 #define Buffer_h
 
@@ -28,7 +30,7 @@ class Buffer {
     void write(uint32_t n);
     void write(uint16_t n);
     void write(uint8_t* buf, uint32_t len);
-    
+
     uint8_t* bufA;
     uint8_t* bufB;
 

esp32cam_marauder/AXP192.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef CommandLine_h
 #define CommandLine_h
 
@@ -6,7 +8,7 @@
 #ifdef HAS_SCREEN
   #include "MenuFunctions.h"
   #include "Display.h"
-#endif 
+#endif
 
 #include "WiFiScan.h"
 //#include "Web.h"
@@ -50,6 +52,7 @@ const char PROGMEM LS_CMD[] = "ls";
 const char PROGMEM LED_CMD[] = "led";
 const char PROGMEM GPS_DATA_CMD[] = "gpsdata";
 const char PROGMEM GPS_CMD[] = "gps";
+const char PROGMEM NMEA_CMD[] = "nmea";
 
 // WiFi sniff/scan
 const char PROGMEM EVIL_PORTAL_CMD[] = "evilportal";
@@ -79,11 +82,12 @@ const char PROGMEM SEL_CMD[] = "select";
 const char PROGMEM SSID_CMD[] = "ssid";
 
 // Bluetooth sniff/scan
+const char PROGMEM BT_SPAM_CMD[] = "blespam";
 const char PROGMEM BT_SNIFF_CMD[] = "sniffbt";
-const char PROGMEM BT_SOUR_APPLE_CMD[] = "sourapple";
-const char PROGMEM BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
-const char PROGMEM BT_SAMSUNG_SPAM_CMD[] = "samsungblespam";
-const char PROGMEM BT_SPAM_ALL_CMD[] = "btspamall";
+//const char PROGMEM BT_SOUR_APPLE_CMD[] = "sourapple";
+//const char PROGMEM BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
+//const char PROGMEM BT_SAMSUNG_SPAM_CMD[] = "samsungblespam";
+//onst char PROGMEM BT_SPAM_ALL_CMD[] = "btspamall";
 const char PROGMEM BT_WARDRIVE_CMD[] = "btwardrive";
 const char PROGMEM BT_SKIM_CMD[] = "sniffskim";
 
@@ -99,7 +103,8 @@ const char PROGMEM HELP_SETTINGS_CMD[] = "settings [-s <setting> enable/disable>
 const char PROGMEM HELP_LS_CMD[] = "ls <directory>";
 const char PROGMEM HELP_LED_CMD[] = "led -s <hex color>/-p <rainbow>";
 const char PROGMEM HELP_GPS_DATA_CMD[] = "gpsdata";
-const char PROGMEM HELP_GPS_CMD[] = "gps [-g] <fix/sat/lon/lat/alt/date>";
+const char PROGMEM HELP_GPS_CMD[] = "gps [-g] <fix/sat/lon/lat/alt/date/accuracy/text/nmea>\r\n    [-n] <native/all/gps/glonass/galileo/navic/qzss/beidou>\r\n         [-b = use BD vs GB for beidou]";
+const char PROGMEM HELP_NMEA_CMD[] = "nmea";
 
 // WiFi sniff/scan
 const char PROGMEM HELP_EVIL_PORTAL_CMD[] = "evilportal [-c start [-w html.html]/sethtml <html.html>]";
@@ -129,10 +134,11 @@ const char PROGMEM HELP_SSID_CMD_B[] = "ssid -r <index>";
 
 // Bluetooth sniff/scan
 const char PROGMEM HELP_BT_SNIFF_CMD[] = "sniffbt";
-const char PROGMEM HELP_BT_SOUR_APPLE_CMD[] = "sourapple";
-const char PROGMEM HELP_BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
-const char PROGMEM HELP_BT_SAMSUNG_SPAM_CMD[] = "samsungblespam";
-const char PROGMEM HELP_BT_SPAM_ALL_CMD[] = "btspamall";
+const char PROGMEM HELP_BT_SPAM_CMD[] = "blespam -t <apple/google/samsung/windows/all>";
+//const char PROGMEM HELP_BT_SOUR_APPLE_CMD[] = "sourapple";
+//const char PROGMEM HELP_BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
+//const char PROGMEM HELP_BT_SAMSUNG_SPAM_CMD[] = "samsungblespam";
+//onst char PROGMEM HELP_BT_SPAM_ALL_CMD[] = "btspamall";
 const char PROGMEM HELP_BT_WARDRIVE_CMD[] = "btwardrive [-c]";
 const char PROGMEM HELP_BT_SKIM_CMD[] = "sniffskim";
 const char PROGMEM HELP_FOOT[] = "==================================";
@@ -178,7 +184,7 @@ class CommandLine {
     "                      @@@@@@                \r\n"
     "                        @@@@                \r\n"
     "\r\n";
-        
+
   public:
     CommandLine();