MX 2 anos atrás
pai
commit
4d28e770c6

+ 2 - 2
base_pack/ble_spam/ble_spam.c

@@ -196,8 +196,8 @@ static void draw_callback(Canvas* canvas, void* ctx) {
 
 
     const Attack* attack =
     const Attack* attack =
         (state->index >= 0 && state->index <= ATTACK_COUNT - 1) ? &attacks[state->index] : NULL;
         (state->index >= 0 && state->index <= ATTACK_COUNT - 1) ? &attacks[state->index] : NULL;
-    const BleSpamPayload* payload = &attack->payload;
-    const BleSpamProtocol* protocol = attack->protocol;
+    const BleSpamPayload* payload = attack ? &attack->payload : NULL;
+    const BleSpamProtocol* protocol = attack ? attack->protocol : NULL;
 
 
     canvas_set_font(canvas, FontSecondary);
     canvas_set_font(canvas, FontSecondary);
     canvas_draw_icon(canvas, 4, 3, protocol ? protocol->icon : &I_ble);
     canvas_draw_icon(canvas, 4, 3, protocol ? protocol->icon : &I_ble);

+ 1 - 0
base_pack/ble_spam/protocols/_base.h

@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
+#include <stdbool.h>
 #include "ble_spam_icons.h"
 #include "ble_spam_icons.h"
 #include <furi_hal_random.h>
 #include <furi_hal_random.h>
 #include <core/core_defines.h>
 #include <core/core_defines.h>

+ 0 - 1
base_pack/ble_spam/protocols/_registry.h

@@ -3,7 +3,6 @@
 #include "continuity.h"
 #include "continuity.h"
 #include "fastpair.h"
 #include "fastpair.h"
 #include "swiftpair.h"
 #include "swiftpair.h"
-#include <stdbool.h>
 
 
 union BleSpamProtocolCfg {
 union BleSpamProtocolCfg {
     ContinuityCfg continuity;
     ContinuityCfg continuity;

+ 7 - 2
base_pack/ble_spam/protocols/fastpair.c

@@ -24,14 +24,19 @@ void fastpair_make_packet(uint8_t* _size, uint8_t** _packet, const BleSpamProtoc
             0x718FA4, // JBL Live 300TWS
             0x718FA4, // JBL Live 300TWS
             0x821F66, // JBL Flip 6
             0x821F66, // JBL Flip 6
             0x92BBBD, // Pixel Buds
             0x92BBBD, // Pixel Buds
+            0xD446A7, // Sony XM5
 
 
             // Custom debug popups
             // Custom debug popups
-            0xAA1FE1, // ClownMaster
-            0xAA187F, // VBucks
+            0xD99CA1, // Flipper Zero
+            0x77FF67, // Free Robux
+            0xAA187F, // Free VBucks
+            0xDCE9EA, // Rickroll
+            0x87B25F, // Animated Rickroll
             0xF38C02, // Boykisser
             0xF38C02, // Boykisser
             0x1448C9, // BLM
             0x1448C9, // BLM
             0xD5AB33, // Xtreme
             0xD5AB33, // Xtreme
             0x13B39D, // Talking Sasquach
             0x13B39D, // Talking Sasquach
+            0xAA1FE1, // ClownMaster
         };
         };
         model_id = models[rand() % COUNT_OF(models)];
         model_id = models[rand() % COUNT_OF(models)];
     }
     }