Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-19 00:48:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve detection and command timings

Browse Source
This commit is contained in:
Willy-JL
2023-11-20 22:09:21 +00:00
parent 67c4e26dc8
commit a66531b98f
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/external/evil_portal/scenes/evil_portal_scene_console_output.c
Vendored
+11 -10
View File
@@ -121,9 +121,11 @@ void evil_portal_scene_console_output_on_enter(void* context) {
furi_string_printf(data, "setap=%s\n", (char*)app->ap_name);
furi_string_reset(app->captured_line);
evil_portal_uart_tx((uint8_t*)(furi_string_get_cstr(data)), furi_string_size(data));
// For some reason evil portal messes up "ap set" with newlines and random letters, "p set" works
for(uint8_t t = 0; t < 20 && !captured(app, "p set"); t++) furi_delay_ms(100);
bool icanhazmarauder = !captured(app, "p set"); // Evil portal didn't respond
// TODO: move timeouts and commands elsewhere, can't block input cycle
for(uint8_t t = 0; t < 69 && !captured(app, "ap set") && !captured(app, "\n>"); t++)
furi_delay_ms(100);
bool icanhazmarauder = !captured(app, "ap set") && // Evil portal didn't respond
captured(app, "\n>"); // Marauder did respond
// Not evil portal, set up marauder
if(icanhazmarauder) {
furi_string_printf(data, "clearlist -s\nssid -a -n '%s'\n", app->ap_name);
@@ -131,7 +133,7 @@ void evil_portal_scene_console_output_on_enter(void* context) {
evil_portal_uart_tx(
(uint8_t*)(furi_string_get_cstr(data)), furi_string_size(data));
// Marauder echoes the command, maybe still init so wait a while for echo
for(uint8_t t = 0; t < 42 && !captured(app, (char*)app->ap_name); t++)
for(uint8_t t = 0; t < 10 && !captured(app, (char*)app->ap_name); t++)
furi_delay_ms(100);
}
free(app->ap_name);
@@ -142,18 +144,17 @@ void evil_portal_scene_console_output_on_enter(void* context) {
evil_portal_uart_tx(
(uint8_t*)("evilportal -c sethtmlstr\n"),
strlen("evilportal -c sethtmlstr\n"));
for(uint8_t t = 0; t < 5 && !captured(app, "Setting HTML from serial..."); t++)
for(uint8_t t = 0; t < 10 && !captured(app, "\n>") &&
!captured(app, "Setting HTML from serial...");
t++)
furi_delay_ms(100);
// Check for active attack
if(captured(app, ">") && !captured(app, "Setting HTML from serial...")) {
furi_string_reset(app->captured_line);
} else {
if(!(captured(app, "\n>") && !captured(app, "Setting HTML from serial..."))) {
furi_string_reset(app->captured_line);
evil_portal_uart_tx(app->index_html, strlen((char*)app->index_html));
evil_portal_uart_tx((uint8_t*)("\n"), 1);
for(uint8_t t = 0; t < 15 && !captured(app, "html set"); t++)
for(uint8_t t = 0; t < 20 && !captured(app, "html set"); t++)
furi_delay_ms(100);
furi_delay_ms(100);
evil_portal_uart_tx(
(uint8_t*)("evilportal -c start\n"), strlen("evilportal -c start\n"));
}