BLE Spam tweak some text and better help section

This commit is contained in:
Willy-JL
2023-10-21 05:02:19 +01:00
parent 9d3e347f35
commit 27a213869a
2 changed files with 28 additions and 11 deletions

View File

@@ -14,7 +14,7 @@
static Attack attacks[] = { static Attack attacks[] = {
{ {
.title = "+ Kitchen Sink", .title = "The Kitchen Sink",
.text = "Flood all attacks at once", .text = "Flood all attacks at once",
.protocol = NULL, .protocol = NULL,
.payload = .payload =
@@ -75,7 +75,7 @@ static Attack attacks[] = {
}, },
}, },
{ {
.title = "Android Device Pair", .title = "Android Device Connect",
.text = "Reboot cooldown, long range", .text = "Reboot cooldown, long range",
.protocol = &protocol_fastpair, .protocol = &protocol_fastpair,
.payload = .payload =
@@ -192,12 +192,13 @@ static void toggle_adv(State* state) {
} }
} }
#define PAGE_MIN (-3) #define PAGE_MIN (-4)
#define PAGE_MAX ATTACKS_COUNT #define PAGE_MAX ATTACKS_COUNT
enum { enum {
PageHelpApps = PAGE_MIN, PageHelpApps = PAGE_MIN,
PageHelpDelay, PageHelpDelay,
PageHelpDistance, PageHelpDistance,
PageHelpInfoConfig,
PageStart = 0, PageStart = 0,
PageEnd = ATTACKS_COUNT - 1, PageEnd = ATTACKS_COUNT - 1,
PageAboutCredits = PAGE_MAX, PageAboutCredits = PAGE_MAX,
@@ -279,9 +280,25 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
48, 48,
AlignLeft, AlignLeft,
AlignTop, AlignTop,
"\e#Distance\e# is limited, attacks\n" "\e#Distance\e# varies greatly:\n"
"work under 1 meter but a\n" "some are long range (>30 m)\n"
"few are marked 'long range'", "others are close range (<1 m)",
false);
break;
case PageHelpInfoConfig:
canvas_set_font(canvas, FontBatteryPercent);
canvas_draw_str_aligned(canvas, 124, 12, AlignRight, AlignBottom, "Help");
elements_text_box(
canvas,
4,
16,
120,
48,
AlignLeft,
AlignTop,
"See \e#more info\e# and change\n"
"\e#attack options\e# by holding\n"
"Ok on each attack page",
false); false);
break; break;
case PageAboutCredits: case PageAboutCredits:
@@ -318,11 +335,11 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
"%02i/%02i: %s", "%02i/%02i: %s",
state->index + 1, state->index + 1,
ATTACKS_COUNT, ATTACKS_COUNT,
protocol ? protocol->get_name(&payload->cfg) : "Everything"); protocol ? protocol->get_name(&payload->cfg) : "Everything AND");
canvas_draw_str(canvas, 4 - (state->index < 19 ? 1 : 0), 21, str); canvas_draw_str(canvas, 4 - (state->index < 19 ? 1 : 0), 21, str);
canvas_set_font(canvas, FontPrimary); canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 4, 32, attack->title); canvas_draw_str(canvas, 4, 33, attack->title);
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
canvas_draw_str(canvas, 4, 46, attack->text); canvas_draw_str(canvas, 4, 46, attack->text);

View File

@@ -63,13 +63,13 @@ const uint8_t na_actions_count = COUNT_OF(na_actions);
static const char* type_names[ContinuityTypeCOUNT] = { static const char* type_names[ContinuityTypeCOUNT] = {
[ContinuityTypeAirDrop] = "AirDrop", [ContinuityTypeAirDrop] = "AirDrop",
[ContinuityTypeProximityPair] = "Proximity Pair", [ContinuityTypeProximityPair] = "Continuity Pair",
[ContinuityTypeAirplayTarget] = "Airplay Target", [ContinuityTypeAirplayTarget] = "Airplay Target",
[ContinuityTypeHandoff] = "Handoff", [ContinuityTypeHandoff] = "Handoff",
[ContinuityTypeTetheringSource] = "Tethering Source", [ContinuityTypeTetheringSource] = "Tethering Source",
[ContinuityTypeNearbyAction] = "Nearby Action", [ContinuityTypeNearbyAction] = "Continuity Action",
[ContinuityTypeNearbyInfo] = "Nearby Info", [ContinuityTypeNearbyInfo] = "Nearby Info",
[ContinuityTypeCustomCrash] = "Custom Packet", [ContinuityTypeCustomCrash] = "Continuity Custom",
}; };
static const char* continuity_get_name(const ProtocolCfg* _cfg) { static const char* continuity_get_name(const ProtocolCfg* _cfg) {
const ContinuityCfg* cfg = &_cfg->continuity; const ContinuityCfg* cfg = &_cfg->continuity;