From c4aa88061cb6606c44ade2f213ec8bd5739db138 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Wed, 6 Sep 2023 12:45:54 +0200
Subject: [PATCH] Move more signals around

---
 .../external/apple_ble_spam/apple_ble_spam.c  | 228 +++++++++---------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/applications/external/apple_ble_spam/apple_ble_spam.c b/applications/external/apple_ble_spam/apple_ble_spam.c
index b3105db52..7a246103b 100644
--- a/applications/external/apple_ble_spam/apple_ble_spam.c
+++ b/applications/external/apple_ble_spam/apple_ble_spam.c
@@ -53,14 +53,6 @@ static Payload payloads[] = {
                      .data = {.tethering_source = {}},
                  }},
 #endif
-    {.title = "Random Pair",
-     .text = "Spam shuffle Proximity Pairs",
-     .random = true,
-     .msg =
-         {
-             .type = ContinuityTypeProximityPair,
-             .data = {.proximity_pair = {.prefix = 0x00, .model = 0x0000}},
-         }},
     {.title = "Random Action",
      .text = "Spam shuffle Nearby Actions",
      .random = true,
@@ -69,6 +61,94 @@ static Payload payloads[] = {
              .type = ContinuityTypeNearbyAction,
              .data = {.nearby_action = {.flags = 0xC0, .type = 0x00}},
          }},
+    {.title = "Dismiss Active Actions",
+     .text = "Close current Nearby Actions",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0x00, .type = 0x00}},
+         }},
+    {.title = "AppleTV AutoFill",
+     .text = "Banner, unlocked, long range",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x13}},
+         }},
+    {.title = "AppleTV Connecting...",
+     .text = "Modal, unlocked, long range",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x27}},
+         }},
+    {.title = "Join This AppleTV?",
+     .text = "Modal, unlocked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x20}},
+         }},
+    {.title = "AppleTV Audio Sync",
+     .text = "Banner, locked, long range",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x19}},
+         }},
+    {.title = "AppleTV Color Balance",
+     .text = "Banner, locked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x1E}},
+         }},
+    {.title = "Setup New iPhone",
+     .text = "Modal, locked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x09}},
+         }},
+    {.title = "Setup New Random",
+     .text = "Modal, locked, glitched",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0x40, .type = 0x09}},
+         }},
+    {.title = "Transfer Phone Number",
+     .text = "Modal, locked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x02}},
+         }},
+    {.title = "HomePod Setup",
+     .text = "Modal, unlocked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x0B}},
+         }},
+    {.title = "Random Pair",
+     .text = "Spam shuffle Proximity Pairs",
+     .random = true,
+     .msg =
+         {
+             .type = ContinuityTypeProximityPair,
+             .data = {.proximity_pair = {.prefix = 0x00, .model = 0x0000}},
+         }},
     {.title = "AirPods Pro",
      .text = "Modal, spammy (auto close)",
      .random = false,
@@ -117,77 +197,37 @@ static Payload payloads[] = {
              .type = ContinuityTypeProximityPair,
              .data = {.proximity_pair = {.prefix = 0x05, .model = 0x0030}},
          }},
-    {.title = "Dismiss Active Actions",
-     .text = "Close current Nearby Actions",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0x00, .type = 0x00}},
-         }},
-    {.title = "Setup New iPhone",
-     .text = "Modal, locked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x09}},
-         }},
-    {.title = "Setup New Random",
-     .text = "Modal, locked, glitched",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0x40, .type = 0x09}},
-         }},
-    {.title = "AppleTV AutoFill",
-     .text = "Banner, unlocked, long range",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x13}},
-         }},
-    {.title = "AppleTV Connecting...",
-     .text = "Modal, unlocked, long range",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x27}},
-         }},
-    {.title = "AppleTV Audio Sync",
-     .text = "Banner, locked, long range",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x19}},
-         }},
-    {.title = "AppleTV Color Balance",
-     .text = "Banner, locked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x1E}},
-         }},
-    {.title = "Transfer Phone Number",
-     .text = "Modal, locked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x02}},
-         }},
-    {.title = "HomePod Setup",
+    {.title = "Setup New AppleTV",
      .text = "Modal, unlocked",
      .random = false,
      .msg =
          {
              .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x0B}},
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x01}},
+         }},
+    {.title = "Pair AppleTV",
+     .text = "Modal, unlocked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x06}},
+         }},
+    {.title = "HomeKit AppleTV Setup",
+     .text = "Modal, unlocked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x0D}},
+         }},
+    {.title = "AppleID for AppleTV?",
+     .text = "Modal, unlocked",
+     .random = false,
+     .msg =
+         {
+             .type = ContinuityTypeNearbyAction,
+             .data = {.nearby_action = {.flags = 0xC0, .type = 0x2B}},
          }},
     {.title = "AirPods",
      .text = "Modal, spammy (auto close)",
@@ -293,46 +333,6 @@ static Payload payloads[] = {
              .type = ContinuityTypeProximityPair,
              .data = {.proximity_pair = {.prefix = 0x01, .model = 0x1620}},
          }},
-    {.title = "Setup New AppleTV",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x01}},
-         }},
-    {.title = "Pair AppleTV",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x06}},
-         }},
-    {.title = "HomeKit AppleTV Setup",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x0D}},
-         }},
-    {.title = "Join This AppleTV?",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x20}},
-         }},
-    {.title = "AppleID for AppleTV?",
-     .text = "Modal, unlocked",
-     .random = false,
-     .msg =
-         {
-             .type = ContinuityTypeNearbyAction,
-             .data = {.nearby_action = {.flags = 0xC0, .type = 0x2B}},
-         }},
 };
 
 struct {