<:Nami2:939038794794020874>

This commit is contained in:
ClaraCrazy
2023-07-17 18:36:51 +02:00
parent 1b095c3f90
commit 5988521cc8
12 changed files with 555 additions and 600 deletions

View File

@@ -4,27 +4,26 @@
#include <furi.h> #include <furi.h>
#include <furi_hal.h> #include <furi_hal.h>
static bool evil_portal_app_custom_event_callback(void *context, static bool evil_portal_app_custom_event_callback(void* context, uint32_t event) {
uint32_t event) {
furi_assert(context); furi_assert(context);
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
return scene_manager_handle_custom_event(app->scene_manager, event); return scene_manager_handle_custom_event(app->scene_manager, event);
} }
static bool evil_portal_app_back_event_callback(void *context) { static bool evil_portal_app_back_event_callback(void* context) {
furi_assert(context); furi_assert(context);
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
return scene_manager_handle_back_event(app->scene_manager); return scene_manager_handle_back_event(app->scene_manager);
} }
static void evil_portal_app_tick_event_callback(void *context) { static void evil_portal_app_tick_event_callback(void* context) {
furi_assert(context); furi_assert(context);
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
scene_manager_handle_tick_event(app->scene_manager); scene_manager_handle_tick_event(app->scene_manager);
} }
Evil_PortalApp *evil_portal_app_alloc() { Evil_PortalApp* evil_portal_app_alloc() {
Evil_PortalApp *app = malloc(sizeof(Evil_PortalApp)); Evil_PortalApp* app = malloc(sizeof(Evil_PortalApp));
app->sent_html = false; app->sent_html = false;
app->sent_ap = false; app->sent_ap = false;
@@ -47,21 +46,21 @@ Evil_PortalApp *evil_portal_app_alloc() {
view_dispatcher_set_tick_event_callback( view_dispatcher_set_tick_event_callback(
app->view_dispatcher, evil_portal_app_tick_event_callback, 100); app->view_dispatcher, evil_portal_app_tick_event_callback, 100);
view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
ViewDispatcherTypeFullscreen);
app->var_item_list = variable_item_list_alloc(); app->var_item_list = variable_item_list_alloc();
view_dispatcher_add_view(app->view_dispatcher, Evil_PortalAppViewVarItemList, view_dispatcher_add_view(
app->view_dispatcher,
Evil_PortalAppViewVarItemList,
variable_item_list_get_view(app->var_item_list)); variable_item_list_get_view(app->var_item_list));
for (int i = 0; i < NUM_MENU_ITEMS; ++i) { for(int i = 0; i < NUM_MENU_ITEMS; ++i) {
app->selected_option_index[i] = 0; app->selected_option_index[i] = 0;
} }
app->text_box = text_box_alloc(); app->text_box = text_box_alloc();
view_dispatcher_add_view(app->view_dispatcher, view_dispatcher_add_view(
Evil_PortalAppViewConsoleOutput, app->view_dispatcher, Evil_PortalAppViewConsoleOutput, text_box_get_view(app->text_box));
text_box_get_view(app->text_box));
app->text_box_store = furi_string_alloc(); app->text_box_store = furi_string_alloc();
furi_string_reserve(app->text_box_store, EVIL_PORTAL_TEXT_BOX_STORE_SIZE); furi_string_reserve(app->text_box_store, EVIL_PORTAL_TEXT_BOX_STORE_SIZE);
@@ -70,25 +69,22 @@ Evil_PortalApp *evil_portal_app_alloc() {
return app; return app;
} }
void evil_portal_app_free(Evil_PortalApp *app) { void evil_portal_app_free(Evil_PortalApp* app) {
// save latest logs // save latest logs
if (furi_string_utf8_length(app->portal_logs) > 0) { if(furi_string_utf8_length(app->portal_logs) > 0) {
write_logs(app->portal_logs); write_logs(app->portal_logs);
furi_string_free(app->portal_logs); furi_string_free(app->portal_logs);
} }
// Send reset event to dev board // Send reset event to dev board
evil_portal_uart_tx((uint8_t *)(RESET_CMD), strlen(RESET_CMD)); evil_portal_uart_tx((uint8_t*)(RESET_CMD), strlen(RESET_CMD));
evil_portal_uart_tx((uint8_t *)("\n"), 1); evil_portal_uart_tx((uint8_t*)("\n"), 1);
furi_assert(app); furi_assert(app);
// Views // Views
view_dispatcher_remove_view(app->view_dispatcher, view_dispatcher_remove_view(app->view_dispatcher, Evil_PortalAppViewVarItemList);
Evil_PortalAppViewVarItemList); view_dispatcher_remove_view(app->view_dispatcher, Evil_PortalAppViewConsoleOutput);
view_dispatcher_remove_view(app->view_dispatcher,
Evil_PortalAppViewConsoleOutput);
text_box_free(app->text_box); text_box_free(app->text_box);
furi_string_free(app->text_box_store); furi_string_free(app->text_box_store);
@@ -105,9 +101,9 @@ void evil_portal_app_free(Evil_PortalApp *app) {
free(app); free(app);
} }
int32_t evil_portal_app(void *p) { int32_t evil_portal_app(void* p) {
UNUSED(p); UNUSED(p);
Evil_PortalApp *evil_portal_app = evil_portal_app_alloc(); Evil_PortalApp* evil_portal_app = evil_portal_app_alloc();
evil_portal_app->uart = evil_portal_uart_init(evil_portal_app); evil_portal_app->uart = evil_portal_uart_init(evil_portal_app);

View File

@@ -21,25 +21,25 @@
#define RESET_CMD "reset" #define RESET_CMD "reset"
struct Evil_PortalApp { struct Evil_PortalApp {
Gui *gui; Gui* gui;
ViewDispatcher *view_dispatcher; ViewDispatcher* view_dispatcher;
SceneManager *scene_manager; SceneManager* scene_manager;
FuriString* portal_logs; FuriString* portal_logs;
const char *command_queue[1]; const char* command_queue[1];
int command_index; int command_index;
bool has_command_queue; bool has_command_queue;
FuriString *text_box_store; FuriString* text_box_store;
size_t text_box_store_strlen; size_t text_box_store_strlen;
TextBox *text_box; TextBox* text_box;
VariableItemList *var_item_list; VariableItemList* var_item_list;
Evil_PortalUart *uart; Evil_PortalUart* uart;
int selected_menu_index; int selected_menu_index;
int selected_option_index[NUM_MENU_ITEMS]; int selected_option_index[NUM_MENU_ITEMS];
const char *selected_tx_string; const char* selected_tx_string;
bool is_command; bool is_command;
bool is_custom_tx_string; bool is_custom_tx_string;
bool focus_console_start; bool focus_console_start;
@@ -49,8 +49,8 @@ struct Evil_PortalApp {
bool sent_reset; bool sent_reset;
int BAUDRATE; int BAUDRATE;
uint8_t *index_html; uint8_t* index_html;
uint8_t *ap_name; uint8_t* ap_name;
}; };
typedef enum { typedef enum {

View File

@@ -3,11 +3,11 @@
#include "helpers/evil_portal_storage.h" #include "helpers/evil_portal_storage.h"
struct Evil_PortalUart { struct Evil_PortalUart {
Evil_PortalApp *app; Evil_PortalApp* app;
FuriThread *rx_thread; FuriThread* rx_thread;
FuriStreamBuffer *rx_stream; FuriStreamBuffer* rx_stream;
uint8_t rx_buf[RX_BUF_SIZE + 1]; uint8_t rx_buf[RX_BUF_SIZE + 1];
void (*handle_rx_data_cb)(uint8_t *buf, size_t len, void *context); void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context);
}; };
typedef enum { typedef enum {
@@ -16,55 +16,53 @@ typedef enum {
} WorkerEvtFlags; } WorkerEvtFlags;
void evil_portal_uart_set_handle_rx_data_cb( void evil_portal_uart_set_handle_rx_data_cb(
Evil_PortalUart *uart, Evil_PortalUart* uart,
void (*handle_rx_data_cb)(uint8_t *buf, size_t len, void *context)) { void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context)) {
furi_assert(uart); furi_assert(uart);
uart->handle_rx_data_cb = handle_rx_data_cb; uart->handle_rx_data_cb = handle_rx_data_cb;
} }
#define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone) #define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
void evil_portal_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void *context) { void evil_portal_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context) {
Evil_PortalUart *uart = (Evil_PortalUart *)context; Evil_PortalUart* uart = (Evil_PortalUart*)context;
if (ev == UartIrqEventRXNE) { if(ev == UartIrqEventRXNE) {
furi_stream_buffer_send(uart->rx_stream, &data, 1, 0); furi_stream_buffer_send(uart->rx_stream, &data, 1, 0);
furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtRxDone); furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtRxDone);
} }
} }
static int32_t uart_worker(void *context) { static int32_t uart_worker(void* context) {
Evil_PortalUart *uart = (void *)context; Evil_PortalUart* uart = (void*)context;
while (1) { while(1) {
uint32_t events =
uint32_t events = furi_thread_flags_wait(WORKER_ALL_RX_EVENTS, furi_thread_flags_wait(WORKER_ALL_RX_EVENTS, FuriFlagWaitAny, FuriWaitForever);
FuriFlagWaitAny, FuriWaitForever);
furi_check((events & FuriFlagError) == 0); furi_check((events & FuriFlagError) == 0);
if (events & WorkerEvtStop) if(events & WorkerEvtStop) break;
break; if(events & WorkerEvtRxDone) {
if (events & WorkerEvtRxDone) { size_t len = furi_stream_buffer_receive(uart->rx_stream, uart->rx_buf, RX_BUF_SIZE, 0);
size_t len = furi_stream_buffer_receive(uart->rx_stream, uart->rx_buf,
RX_BUF_SIZE, 0);
if (len > 0) { if(len > 0) {
if (uart->handle_rx_data_cb) { if(uart->handle_rx_data_cb) {
uart->handle_rx_data_cb(uart->rx_buf, len, uart->app); uart->handle_rx_data_cb(uart->rx_buf, len, uart->app);
if (uart->app->has_command_queue) { if(uart->app->has_command_queue) {
if (uart->app->command_index < 1) { if(uart->app->command_index < 1) {
if (0 == if(0 == strncmp(
strncmp(SET_AP_CMD, SET_AP_CMD,
uart->app->command_queue[uart->app->command_index], uart->app->command_queue[uart->app->command_index],
strlen(SET_AP_CMD))) { strlen(SET_AP_CMD))) {
FuriString *out_data = furi_string_alloc(); FuriString* out_data = furi_string_alloc();
furi_string_cat(out_data, "setap="); furi_string_cat(out_data, "setap=");
furi_string_cat(out_data, (char *)uart->app->ap_name); furi_string_cat(out_data, (char*)uart->app->ap_name);
evil_portal_uart_tx((uint8_t *)(furi_string_get_cstr(out_data)), evil_portal_uart_tx(
(uint8_t*)(furi_string_get_cstr(out_data)),
strlen(furi_string_get_cstr(out_data))); strlen(furi_string_get_cstr(out_data)));
evil_portal_uart_tx((uint8_t *)("\n"), 1); evil_portal_uart_tx((uint8_t*)("\n"), 1);
uart->app->sent_ap = true; uart->app->sent_ap = true;
@@ -78,21 +76,21 @@ static int32_t uart_worker(void *context) {
} }
} }
if (uart->app->sent_reset == false) { if(uart->app->sent_reset == false) {
furi_string_cat(uart->app->portal_logs, (char *)uart->rx_buf); furi_string_cat(uart->app->portal_logs, (char*)uart->rx_buf);
} }
if (furi_string_utf8_length(uart->app->portal_logs) > 4000) { if(furi_string_utf8_length(uart->app->portal_logs) > 4000) {
write_logs(uart->app->portal_logs); write_logs(uart->app->portal_logs);
furi_string_reset(uart->app->portal_logs); furi_string_reset(uart->app->portal_logs);
} }
} else { } else {
uart->rx_buf[len] = '\0'; uart->rx_buf[len] = '\0';
if (uart->app->sent_reset == false) { if(uart->app->sent_reset == false) {
furi_string_cat(uart->app->portal_logs, (char *)uart->rx_buf); furi_string_cat(uart->app->portal_logs, (char*)uart->rx_buf);
} }
if (furi_string_utf8_length(uart->app->portal_logs) > 4000) { if(furi_string_utf8_length(uart->app->portal_logs) > 4000) {
write_logs(uart->app->portal_logs); write_logs(uart->app->portal_logs);
furi_string_reset(uart->app->portal_logs); furi_string_reset(uart->app->portal_logs);
} }
@@ -106,12 +104,12 @@ static int32_t uart_worker(void *context) {
return 0; return 0;
} }
void evil_portal_uart_tx(uint8_t *data, size_t len) { void evil_portal_uart_tx(uint8_t* data, size_t len) {
furi_hal_uart_tx(UART_CH, data, len); furi_hal_uart_tx(UART_CH, data, len);
} }
Evil_PortalUart *evil_portal_uart_init(Evil_PortalApp *app) { Evil_PortalUart* evil_portal_uart_init(Evil_PortalApp* app) {
Evil_PortalUart *uart = malloc(sizeof(Evil_PortalUart)); Evil_PortalUart* uart = malloc(sizeof(Evil_PortalUart));
uart->app = app; uart->app = app;
// Init all rx stream and thread early to avoid crashes // Init all rx stream and thread early to avoid crashes
uart->rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1); uart->rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
@@ -124,7 +122,7 @@ Evil_PortalUart *evil_portal_uart_init(Evil_PortalApp *app) {
furi_thread_start(uart->rx_thread); furi_thread_start(uart->rx_thread);
furi_hal_console_disable(); furi_hal_console_disable();
if (app->BAUDRATE == 0) { if(app->BAUDRATE == 0) {
app->BAUDRATE = 115200; app->BAUDRATE = 115200;
} }
furi_hal_uart_set_br(UART_CH, app->BAUDRATE); furi_hal_uart_set_br(UART_CH, app->BAUDRATE);
@@ -133,7 +131,7 @@ Evil_PortalUart *evil_portal_uart_init(Evil_PortalApp *app) {
return uart; return uart;
} }
void evil_portal_uart_free(Evil_PortalUart *uart) { void evil_portal_uart_free(Evil_PortalUart* uart) {
furi_assert(uart); furi_assert(uart);
furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtStop); furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtStop);

View File

@@ -7,8 +7,8 @@
typedef struct Evil_PortalUart Evil_PortalUart; typedef struct Evil_PortalUart Evil_PortalUart;
void evil_portal_uart_set_handle_rx_data_cb( void evil_portal_uart_set_handle_rx_data_cb(
Evil_PortalUart *uart, Evil_PortalUart* uart,
void (*handle_rx_data_cb)(uint8_t *buf, size_t len, void *context)); void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context));
void evil_portal_uart_tx(uint8_t *data, size_t len); void evil_portal_uart_tx(uint8_t* data, size_t len);
Evil_PortalUart *evil_portal_uart_init(Evil_PortalApp *app); Evil_PortalUart* evil_portal_uart_init(Evil_PortalApp* app);
void evil_portal_uart_free(Evil_PortalUart *uart); void evil_portal_uart_free(Evil_PortalUart* uart);

View File

@@ -1,31 +1,29 @@
#include "evil_portal_storage.h" #include "evil_portal_storage.h"
static Storage *evil_portal_open_storage() { static Storage* evil_portal_open_storage() {
return furi_record_open(RECORD_STORAGE); return furi_record_open(RECORD_STORAGE);
} }
static void evil_portal_close_storage() { furi_record_close(RECORD_STORAGE); } static void evil_portal_close_storage() {
furi_record_close(RECORD_STORAGE);
}
void evil_portal_read_index_html(void *context) { void evil_portal_read_index_html(void* context) {
Evil_PortalApp* app = context;
Evil_PortalApp *app = context; Storage* storage = evil_portal_open_storage();
Storage *storage = evil_portal_open_storage();
FileInfo fi; FileInfo fi;
if (storage_common_stat(storage, EVIL_PORTAL_INDEX_SAVE_PATH, &fi) == if(storage_common_stat(storage, EVIL_PORTAL_INDEX_SAVE_PATH, &fi) == FSE_OK) {
FSE_OK) { File* index_html = storage_file_alloc(storage);
File *index_html = storage_file_alloc(storage); if(storage_file_open(
if (storage_file_open(index_html, EVIL_PORTAL_INDEX_SAVE_PATH, FSAM_READ, index_html, EVIL_PORTAL_INDEX_SAVE_PATH, FSAM_READ, FSOM_OPEN_EXISTING)) {
FSOM_OPEN_EXISTING)) {
app->index_html = malloc((size_t)fi.size); app->index_html = malloc((size_t)fi.size);
uint8_t *buf_ptr = app->index_html; uint8_t* buf_ptr = app->index_html;
size_t read = 0; size_t read = 0;
while (read < fi.size) { while(read < fi.size) {
size_t to_read = fi.size - read; size_t to_read = fi.size - read;
if (to_read > UINT16_MAX) if(to_read > UINT16_MAX) to_read = UINT16_MAX;
to_read = UINT16_MAX; uint16_t now_read = storage_file_read(index_html, buf_ptr, (uint16_t)to_read);
uint16_t now_read =
storage_file_read(index_html, buf_ptr, (uint16_t)to_read);
read += now_read; read += now_read;
buf_ptr += now_read; buf_ptr += now_read;
} }
@@ -34,35 +32,31 @@ void evil_portal_read_index_html(void *context) {
storage_file_close(index_html); storage_file_close(index_html);
storage_file_free(index_html); storage_file_free(index_html);
} else { } else {
char *html_error = char* html_error = "<b>Evil portal</b><br>Unable to read the html file.<br>"
"<b>Evil portal</b><br>Unable to read the html file.<br>"
"Is the SD Card set up correctly? <br>See instructions @ " "Is the SD Card set up correctly? <br>See instructions @ "
"github.com/bigbrodude6119/flipper-zero-evil-portal<br>" "github.com/bigbrodude6119/flipper-zero-evil-portal<br>"
"Under the 'Install pre-built app on the flipper' section."; "Under the 'Install pre-built app on the flipper' section.";
app->index_html = (uint8_t *)html_error; app->index_html = (uint8_t*)html_error;
} }
evil_portal_close_storage(); evil_portal_close_storage();
} }
void evil_portal_read_ap_name(void *context) { void evil_portal_read_ap_name(void* context) {
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
Storage *storage = evil_portal_open_storage(); Storage* storage = evil_portal_open_storage();
FileInfo fi; FileInfo fi;
if (storage_common_stat(storage, EVIL_PORTAL_AP_SAVE_PATH, &fi) == FSE_OK) { if(storage_common_stat(storage, EVIL_PORTAL_AP_SAVE_PATH, &fi) == FSE_OK) {
File *ap_name = storage_file_alloc(storage); File* ap_name = storage_file_alloc(storage);
if (storage_file_open(ap_name, EVIL_PORTAL_AP_SAVE_PATH, FSAM_READ, if(storage_file_open(ap_name, EVIL_PORTAL_AP_SAVE_PATH, FSAM_READ, FSOM_OPEN_EXISTING)) {
FSOM_OPEN_EXISTING)) {
app->ap_name = malloc((size_t)fi.size); app->ap_name = malloc((size_t)fi.size);
uint8_t *buf_ptr = app->ap_name; uint8_t* buf_ptr = app->ap_name;
size_t read = 0; size_t read = 0;
while (read < fi.size) { while(read < fi.size) {
size_t to_read = fi.size - read; size_t to_read = fi.size - read;
if (to_read > UINT16_MAX) if(to_read > UINT16_MAX) to_read = UINT16_MAX;
to_read = UINT16_MAX; uint16_t now_read = storage_file_read(ap_name, buf_ptr, (uint16_t)to_read);
uint16_t now_read =
storage_file_read(ap_name, buf_ptr, (uint16_t)to_read);
read += now_read; read += now_read;
buf_ptr += now_read; buf_ptr += now_read;
} }
@@ -71,15 +65,18 @@ void evil_portal_read_ap_name(void *context) {
storage_file_close(ap_name); storage_file_close(ap_name);
storage_file_free(ap_name); storage_file_free(ap_name);
} else { } else {
char *app_default = "Evil Portal"; char* app_default = "Evil Portal";
app->ap_name = (uint8_t *)app_default; app->ap_name = (uint8_t*)app_default;
} }
evil_portal_close_storage(); evil_portal_close_storage();
} }
char *sequential_file_resolve_path(Storage *storage, const char *dir, char* sequential_file_resolve_path(
const char *prefix, const char *extension) { Storage* storage,
if (storage == NULL || dir == NULL || prefix == NULL || extension == NULL) { const char* dir,
const char* prefix,
const char* extension) {
if(storage == NULL || dir == NULL || prefix == NULL || extension == NULL) {
return NULL; return NULL;
} }
@@ -87,30 +84,32 @@ char *sequential_file_resolve_path(Storage *storage, const char *dir,
int file_index = 0; int file_index = 0;
do { do {
if (snprintf(file_path, sizeof(file_path), "%s/%s_%d.%s", dir, prefix, if(snprintf(
file_index, extension) < 0) { file_path, sizeof(file_path), "%s/%s_%d.%s", dir, prefix, file_index, extension) <
0) {
return NULL; return NULL;
} }
file_index++; file_index++;
} while (storage_file_exists(storage, file_path)); } while(storage_file_exists(storage, file_path));
return strdup(file_path); return strdup(file_path);
} }
void write_logs(FuriString *portal_logs) { void write_logs(FuriString* portal_logs) {
Storage *storage = evil_portal_open_storage(); Storage* storage = evil_portal_open_storage();
if (!storage_file_exists(storage, EVIL_PORTAL_LOG_SAVE_PATH)) { if(!storage_file_exists(storage, EVIL_PORTAL_LOG_SAVE_PATH)) {
storage_simply_mkdir(storage, EVIL_PORTAL_LOG_SAVE_PATH); storage_simply_mkdir(storage, EVIL_PORTAL_LOG_SAVE_PATH);
} }
char *seq_file_path = sequential_file_resolve_path( char* seq_file_path =
storage, EVIL_PORTAL_LOG_SAVE_PATH, "log", "txt"); sequential_file_resolve_path(storage, EVIL_PORTAL_LOG_SAVE_PATH, "log", "txt");
File *file = storage_file_alloc(storage); File* file = storage_file_alloc(storage);
if (storage_file_open(file, seq_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) { if(storage_file_open(file, seq_file_path, FSAM_WRITE, FSOM_CREATE_ALWAYS)) {
storage_file_write(file, furi_string_get_cstr(portal_logs), furi_string_utf8_length(portal_logs)); storage_file_write(
file, furi_string_get_cstr(portal_logs), furi_string_utf8_length(portal_logs));
} }
storage_file_close(file); storage_file_close(file);
storage_file_free(file); storage_file_free(file);

View File

@@ -10,8 +10,11 @@
#define EVIL_PORTAL_AP_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/ap.config.txt" #define EVIL_PORTAL_AP_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/ap.config.txt"
#define EVIL_PORTAL_LOG_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/logs" #define EVIL_PORTAL_LOG_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/logs"
void evil_portal_read_index_html(void *context); void evil_portal_read_index_html(void* context);
void evil_portal_read_ap_name(void *context); void evil_portal_read_ap_name(void* context);
void write_logs(FuriString* portal_logs); void write_logs(FuriString* portal_logs);
char *sequential_file_resolve_path(Storage *storage, const char *dir, char* sequential_file_resolve_path(
const char *prefix, const char *extension); Storage* storage,
const char* dir,
const char* prefix,
const char* extension);

View File

@@ -2,22 +2,21 @@
// Generate scene on_enter handlers array // Generate scene on_enter handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter, #define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
void (*const evil_portal_scene_on_enter_handlers[])(void *) = { void (*const evil_portal_scene_on_enter_handlers[])(void*) = {
#include "evil_portal_scene_config.h" #include "evil_portal_scene_config.h"
}; };
#undef ADD_SCENE #undef ADD_SCENE
// Generate scene on_event handlers array // Generate scene on_event handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event, #define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
bool (*const evil_portal_scene_on_event_handlers[])(void *context, bool (*const evil_portal_scene_on_event_handlers[])(void* context, SceneManagerEvent event) = {
SceneManagerEvent event) = {
#include "evil_portal_scene_config.h" #include "evil_portal_scene_config.h"
}; };
#undef ADD_SCENE #undef ADD_SCENE
// Generate scene on_exit handlers array // Generate scene on_exit handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit, #define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
void (*const evil_portal_scene_on_exit_handlers[])(void *context) = { void (*const evil_portal_scene_on_exit_handlers[])(void* context) = {
#include "evil_portal_scene_config.h" #include "evil_portal_scene_config.h"
}; };
#undef ADD_SCENE #undef ADD_SCENE

View File

@@ -13,19 +13,17 @@ typedef enum {
extern const SceneManagerHandlers evil_portal_scene_handlers; extern const SceneManagerHandlers evil_portal_scene_handlers;
// Generate scene on_enter handlers declaration // Generate scene on_enter handlers declaration
#define ADD_SCENE(prefix, name, id) \ #define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
void prefix##_scene_##name##_on_enter(void *);
#include "evil_portal_scene_config.h" #include "evil_portal_scene_config.h"
#undef ADD_SCENE #undef ADD_SCENE
// Generate scene on_event handlers declaration // Generate scene on_event handlers declaration
#define ADD_SCENE(prefix, name, id) \ #define ADD_SCENE(prefix, name, id) \
bool prefix##_scene_##name##_on_event(void *context, SceneManagerEvent event); bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
#include "evil_portal_scene_config.h" #include "evil_portal_scene_config.h"
#undef ADD_SCENE #undef ADD_SCENE
// Generate scene on_exit handlers declaration // Generate scene on_exit handlers declaration
#define ADD_SCENE(prefix, name, id) \ #define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
void prefix##_scene_##name##_on_exit(void *context);
#include "evil_portal_scene_config.h" #include "evil_portal_scene_config.h"
#undef ADD_SCENE #undef ADD_SCENE

View File

@@ -1,14 +1,13 @@
#include "../evil_portal_app_i.h" #include "../evil_portal_app_i.h"
#include "../helpers/evil_portal_storage.h" #include "../helpers/evil_portal_storage.h"
void evil_portal_console_output_handle_rx_data_cb(uint8_t *buf, size_t len, void evil_portal_console_output_handle_rx_data_cb(uint8_t* buf, size_t len, void* context) {
void *context) {
furi_assert(context); furi_assert(context);
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
// If text box store gets too big, then truncate it // If text box store gets too big, then truncate it
app->text_box_store_strlen += len; app->text_box_store_strlen += len;
if (app->text_box_store_strlen >= EVIL_PORTAL_TEXT_BOX_STORE_SIZE - 1) { if(app->text_box_store_strlen >= EVIL_PORTAL_TEXT_BOX_STORE_SIZE - 1) {
furi_string_right(app->text_box_store, app->text_box_store_strlen / 2); furi_string_right(app->text_box_store, app->text_box_store_strlen / 2);
app->text_box_store_strlen = furi_string_size(app->text_box_store) + len; app->text_box_store_strlen = furi_string_size(app->text_box_store) + len;
} }
@@ -17,71 +16,67 @@ void evil_portal_console_output_handle_rx_data_cb(uint8_t *buf, size_t len,
buf[len] = '\0'; buf[len] = '\0';
furi_string_cat_printf(app->text_box_store, "%s", buf); furi_string_cat_printf(app->text_box_store, "%s", buf);
view_dispatcher_send_custom_event(app->view_dispatcher, view_dispatcher_send_custom_event(app->view_dispatcher, Evil_PortalEventRefreshConsoleOutput);
Evil_PortalEventRefreshConsoleOutput);
} }
void evil_portal_scene_console_output_on_enter(void *context) { void evil_portal_scene_console_output_on_enter(void* context) {
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
TextBox *text_box = app->text_box; TextBox* text_box = app->text_box;
text_box_reset(app->text_box); text_box_reset(app->text_box);
text_box_set_font(text_box, TextBoxFontText); text_box_set_font(text_box, TextBoxFontText);
if (app->focus_console_start) { if(app->focus_console_start) {
text_box_set_focus(text_box, TextBoxFocusStart); text_box_set_focus(text_box, TextBoxFocusStart);
} else { } else {
text_box_set_focus(text_box, TextBoxFocusEnd); text_box_set_focus(text_box, TextBoxFocusEnd);
} }
if (app->is_command) { if(app->is_command) {
furi_string_reset(app->text_box_store); furi_string_reset(app->text_box_store);
app->text_box_store_strlen = 0; app->text_box_store_strlen = 0;
app->sent_reset = false; app->sent_reset = false;
if (0 == strncmp("help", app->selected_tx_string, strlen("help"))) { if(0 == strncmp("help", app->selected_tx_string, strlen("help"))) {
const char *help_msg = const char* help_msg = "BLUE = Waiting\nGREEN = Good\nRED = Bad\n\nThis project is a "
"BLUE = Waiting\nGREEN = Good\nRED = Bad\n\nThis project is a "
"WIP.\ngithub.com/bigbrodude6119/flipper-zero-evil-portal\n\n" "WIP.\ngithub.com/bigbrodude6119/flipper-zero-evil-portal\n\n"
"Version 0.0.2\n\n"; "Version 0.0.2\n\n";
furi_string_cat_str(app->text_box_store, help_msg); furi_string_cat_str(app->text_box_store, help_msg);
app->text_box_store_strlen += strlen(help_msg); app->text_box_store_strlen += strlen(help_msg);
if (app->show_stopscan_tip) { if(app->show_stopscan_tip) {
const char *msg = "Press BACK to return\n"; const char* msg = "Press BACK to return\n";
furi_string_cat_str(app->text_box_store, msg); furi_string_cat_str(app->text_box_store, msg);
app->text_box_store_strlen += strlen(msg); app->text_box_store_strlen += strlen(msg);
} }
} }
if (0 == strncmp("savelogs", app->selected_tx_string, strlen("savelogs"))) { if(0 == strncmp("savelogs", app->selected_tx_string, strlen("savelogs"))) {
const char *help_msg = "Logs saved.\n\n"; const char* help_msg = "Logs saved.\n\n";
furi_string_cat_str(app->text_box_store, help_msg); furi_string_cat_str(app->text_box_store, help_msg);
app->text_box_store_strlen += strlen(help_msg); app->text_box_store_strlen += strlen(help_msg);
write_logs(app->portal_logs); write_logs(app->portal_logs);
furi_string_reset(app->portal_logs); furi_string_reset(app->portal_logs);
if (app->show_stopscan_tip) { if(app->show_stopscan_tip) {
const char *msg = "Press BACK to return\n"; const char* msg = "Press BACK to return\n";
furi_string_cat_str(app->text_box_store, msg); furi_string_cat_str(app->text_box_store, msg);
app->text_box_store_strlen += strlen(msg); app->text_box_store_strlen += strlen(msg);
} }
} }
if (0 == if(0 == strncmp(SET_HTML_CMD, app->selected_tx_string, strlen(SET_HTML_CMD))) {
strncmp(SET_HTML_CMD, app->selected_tx_string, strlen(SET_HTML_CMD))) {
app->command_queue[0] = SET_AP_CMD; app->command_queue[0] = SET_AP_CMD;
app->has_command_queue = true; app->has_command_queue = true;
app->command_index = 0; app->command_index = 0;
if (app->show_stopscan_tip) { if(app->show_stopscan_tip) {
const char *msg = const char* msg = "Starting portal\nIf no response press\nBACK to return\n";
"Starting portal\nIf no response press\nBACK to return\n";
furi_string_cat_str(app->text_box_store, msg); furi_string_cat_str(app->text_box_store, msg);
app->text_box_store_strlen += strlen(msg); app->text_box_store_strlen += strlen(msg);
} }
} }
if (0 == strncmp(RESET_CMD, app->selected_tx_string, strlen(RESET_CMD))) { if(0 == strncmp(RESET_CMD, app->selected_tx_string, strlen(RESET_CMD))) {
app->sent_reset = true; app->sent_reset = true;
if (app->show_stopscan_tip) { if(app->show_stopscan_tip) {
const char *msg = "Reseting portal\nPress BACK to return\n\n\n\n"; const char* msg = "Reseting portal\nPress BACK to return\n\n\n\n";
furi_string_cat_str(app->text_box_store, msg); furi_string_cat_str(app->text_box_store, msg);
app->text_box_store_strlen += strlen(msg); app->text_box_store_strlen += strlen(msg);
} }
@@ -90,27 +85,24 @@ void evil_portal_scene_console_output_on_enter(void *context) {
text_box_set_text(app->text_box, furi_string_get_cstr(app->text_box_store)); text_box_set_text(app->text_box, furi_string_get_cstr(app->text_box_store));
scene_manager_set_scene_state(app->scene_manager, scene_manager_set_scene_state(app->scene_manager, Evil_PortalSceneConsoleOutput, 0);
Evil_PortalSceneConsoleOutput, 0); view_dispatcher_switch_to_view(app->view_dispatcher, Evil_PortalAppViewConsoleOutput);
view_dispatcher_switch_to_view(app->view_dispatcher,
Evil_PortalAppViewConsoleOutput);
// Register callback to receive data // Register callback to receive data
evil_portal_uart_set_handle_rx_data_cb( evil_portal_uart_set_handle_rx_data_cb(
app->uart, evil_portal_console_output_handle_rx_data_cb); app->uart, evil_portal_console_output_handle_rx_data_cb);
if (app->is_command && app->selected_tx_string) { if(app->is_command && app->selected_tx_string) {
if (0 == if(0 == strncmp(SET_HTML_CMD, app->selected_tx_string, strlen(SET_HTML_CMD))) {
strncmp(SET_HTML_CMD, app->selected_tx_string, strlen(SET_HTML_CMD))) {
evil_portal_read_index_html(context); evil_portal_read_index_html(context);
FuriString *data = furi_string_alloc(); FuriString* data = furi_string_alloc();
furi_string_cat(data, "sethtml="); furi_string_cat(data, "sethtml=");
furi_string_cat(data, (char *)app->index_html); furi_string_cat(data, (char*)app->index_html);
evil_portal_uart_tx((uint8_t *)(furi_string_get_cstr(data)), evil_portal_uart_tx(
strlen(furi_string_get_cstr(data))); (uint8_t*)(furi_string_get_cstr(data)), strlen(furi_string_get_cstr(data)));
evil_portal_uart_tx((uint8_t *)("\n"), 1); evil_portal_uart_tx((uint8_t*)("\n"), 1);
app->sent_html = true; app->sent_html = true;
@@ -118,39 +110,37 @@ void evil_portal_scene_console_output_on_enter(void *context) {
free(app->index_html); free(app->index_html);
evil_portal_read_ap_name(context); evil_portal_read_ap_name(context);
} else if (0 == } else if(0 == strncmp(RESET_CMD, app->selected_tx_string, strlen(RESET_CMD))) {
strncmp(RESET_CMD, app->selected_tx_string, strlen(RESET_CMD))) {
app->sent_html = false; app->sent_html = false;
app->sent_ap = false; app->sent_ap = false;
evil_portal_uart_tx((uint8_t *)(app->selected_tx_string), evil_portal_uart_tx(
strlen(app->selected_tx_string)); (uint8_t*)(app->selected_tx_string), strlen(app->selected_tx_string));
evil_portal_uart_tx((uint8_t *)("\n"), 1); evil_portal_uart_tx((uint8_t*)("\n"), 1);
} else if (1 == strncmp("help", app->selected_tx_string, strlen("help"))) { } else if(1 == strncmp("help", app->selected_tx_string, strlen("help"))) {
evil_portal_uart_tx((uint8_t *)(app->selected_tx_string), evil_portal_uart_tx(
strlen(app->selected_tx_string)); (uint8_t*)(app->selected_tx_string), strlen(app->selected_tx_string));
evil_portal_uart_tx((uint8_t *)("\n"), 1); evil_portal_uart_tx((uint8_t*)("\n"), 1);
} }
} }
} }
bool evil_portal_scene_console_output_on_event(void *context, bool evil_portal_scene_console_output_on_event(void* context, SceneManagerEvent event) {
SceneManagerEvent event) { Evil_PortalApp* app = context;
Evil_PortalApp *app = context;
bool consumed = false; bool consumed = false;
if (event.type == SceneManagerEventTypeCustom) { if(event.type == SceneManagerEventTypeCustom) {
text_box_set_text(app->text_box, furi_string_get_cstr(app->text_box_store)); text_box_set_text(app->text_box, furi_string_get_cstr(app->text_box_store));
consumed = true; consumed = true;
} else if (event.type == SceneManagerEventTypeTick) { } else if(event.type == SceneManagerEventTypeTick) {
consumed = true; consumed = true;
} }
return consumed; return consumed;
} }
void evil_portal_scene_console_output_on_exit(void *context) { void evil_portal_scene_console_output_on_exit(void* context) {
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
// Unregister rx callback // Unregister rx callback
evil_portal_uart_set_handle_rx_data_cb(app->uart, NULL); evil_portal_uart_set_handle_rx_data_cb(app->uart, NULL);

View File

@@ -5,21 +5,17 @@
// text box should focus at the start of the output or the end // text box should focus at the start of the output or the end
typedef enum { NO_ARGS = 0, INPUT_ARGS, TOGGLE_ARGS } InputArgs; typedef enum { NO_ARGS = 0, INPUT_ARGS, TOGGLE_ARGS } InputArgs;
typedef enum { typedef enum { FOCUS_CONSOLE_END = 0, FOCUS_CONSOLE_START, FOCUS_CONSOLE_TOGGLE } FocusConsole;
FOCUS_CONSOLE_END = 0,
FOCUS_CONSOLE_START,
FOCUS_CONSOLE_TOGGLE
} FocusConsole;
#define SHOW_STOPSCAN_TIP (true) #define SHOW_STOPSCAN_TIP (true)
#define NO_TIP (false) #define NO_TIP (false)
#define MAX_OPTIONS (9) #define MAX_OPTIONS (9)
typedef struct { typedef struct {
const char *item_string; const char* item_string;
const char *options_menu[MAX_OPTIONS]; const char* options_menu[MAX_OPTIONS];
int num_options_menu; int num_options_menu;
const char *actual_commands[MAX_OPTIONS]; const char* actual_commands[MAX_OPTIONS];
InputArgs needs_keyboard; InputArgs needs_keyboard;
FocusConsole focus_console; FocusConsole focus_console;
bool show_stopscan_tip; bool show_stopscan_tip;
@@ -29,43 +25,24 @@ typedef struct {
// increment it! // increment it!
const Evil_PortalItem items[NUM_MENU_ITEMS] = { const Evil_PortalItem items[NUM_MENU_ITEMS] = {
// send command // send command
{"Start portal", {"Start portal", {""}, 1, {SET_HTML_CMD}, NO_ARGS, FOCUS_CONSOLE_END, SHOW_STOPSCAN_TIP},
{""},
1,
{SET_HTML_CMD},
NO_ARGS,
FOCUS_CONSOLE_END,
SHOW_STOPSCAN_TIP},
// stop portal // stop portal
{"Stop portal", {""}, 1, {RESET_CMD}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP}, {"Stop portal", {""}, 1, {RESET_CMD}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
// console // console
{"Save logs", {"Save logs", {""}, 1, {"savelogs"}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
{""},
1,
{"savelogs"},
NO_ARGS,
FOCUS_CONSOLE_START,
SHOW_STOPSCAN_TIP},
// help // help
{"Help", {"Help", {""}, 1, {"help"}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
{""},
1,
{"help"},
NO_ARGS,
FOCUS_CONSOLE_START,
SHOW_STOPSCAN_TIP},
}; };
static void evil_portal_scene_start_var_list_enter_callback(void *context, static void evil_portal_scene_start_var_list_enter_callback(void* context, uint32_t index) {
uint32_t index) {
furi_assert(context); furi_assert(context);
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
furi_assert(index < NUM_MENU_ITEMS); furi_assert(index < NUM_MENU_ITEMS);
const Evil_PortalItem *item = &items[index]; const Evil_PortalItem* item = &items[index];
const int selected_option_index = app->selected_option_index[index]; const int selected_option_index = app->selected_option_index[index];
furi_assert(selected_option_index < item->num_options_menu); furi_assert(selected_option_index < item->num_options_menu);
@@ -73,86 +50,81 @@ static void evil_portal_scene_start_var_list_enter_callback(void *context,
app->is_command = true; app->is_command = true;
app->is_custom_tx_string = false; app->is_custom_tx_string = false;
app->selected_menu_index = index; app->selected_menu_index = index;
app->focus_console_start = (item->focus_console == FOCUS_CONSOLE_TOGGLE) app->focus_console_start = (item->focus_console == FOCUS_CONSOLE_TOGGLE) ?
? (selected_option_index == 0) (selected_option_index == 0) :
: item->focus_console; item->focus_console;
app->show_stopscan_tip = item->show_stopscan_tip; app->show_stopscan_tip = item->show_stopscan_tip;
view_dispatcher_send_custom_event(app->view_dispatcher, view_dispatcher_send_custom_event(app->view_dispatcher, Evil_PortalEventStartConsole);
Evil_PortalEventStartConsole);
} }
static void static void evil_portal_scene_start_var_list_change_callback(VariableItem* item) {
evil_portal_scene_start_var_list_change_callback(VariableItem *item) {
furi_assert(item); furi_assert(item);
Evil_PortalApp *app = variable_item_get_context(item); Evil_PortalApp* app = variable_item_get_context(item);
furi_assert(app); furi_assert(app);
const Evil_PortalItem *menu_item = &items[app->selected_menu_index]; const Evil_PortalItem* menu_item = &items[app->selected_menu_index];
uint8_t item_index = variable_item_get_current_value_index(item); uint8_t item_index = variable_item_get_current_value_index(item);
furi_assert(item_index < menu_item->num_options_menu); furi_assert(item_index < menu_item->num_options_menu);
variable_item_set_current_value_text(item, variable_item_set_current_value_text(item, menu_item->options_menu[item_index]);
menu_item->options_menu[item_index]);
app->selected_option_index[app->selected_menu_index] = item_index; app->selected_option_index[app->selected_menu_index] = item_index;
} }
void evil_portal_scene_start_on_enter(void *context) { void evil_portal_scene_start_on_enter(void* context) {
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
VariableItemList *var_item_list = app->var_item_list; VariableItemList* var_item_list = app->var_item_list;
variable_item_list_set_enter_callback( variable_item_list_set_enter_callback(
var_item_list, evil_portal_scene_start_var_list_enter_callback, app); var_item_list, evil_portal_scene_start_var_list_enter_callback, app);
VariableItem *item; VariableItem* item;
for (int i = 0; i < NUM_MENU_ITEMS; ++i) { for(int i = 0; i < NUM_MENU_ITEMS; ++i) {
item = variable_item_list_add( item = variable_item_list_add(
var_item_list, items[i].item_string, items[i].num_options_menu, var_item_list,
evil_portal_scene_start_var_list_change_callback, app); items[i].item_string,
items[i].num_options_menu,
evil_portal_scene_start_var_list_change_callback,
app);
variable_item_set_current_value_index(item, app->selected_option_index[i]); variable_item_set_current_value_index(item, app->selected_option_index[i]);
variable_item_set_current_value_text( variable_item_set_current_value_text(
item, items[i].options_menu[app->selected_option_index[i]]); item, items[i].options_menu[app->selected_option_index[i]]);
} }
variable_item_list_set_selected_item( variable_item_list_set_selected_item(
var_item_list, var_item_list, scene_manager_get_scene_state(app->scene_manager, Evil_PortalSceneStart));
scene_manager_get_scene_state(app->scene_manager, Evil_PortalSceneStart));
view_dispatcher_switch_to_view(app->view_dispatcher, view_dispatcher_switch_to_view(app->view_dispatcher, Evil_PortalAppViewVarItemList);
Evil_PortalAppViewVarItemList);
} }
bool evil_portal_scene_start_on_event(void *context, SceneManagerEvent event) { bool evil_portal_scene_start_on_event(void* context, SceneManagerEvent event) {
UNUSED(context); UNUSED(context);
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
bool consumed = false; bool consumed = false;
if (event.type == SceneManagerEventTypeCustom) { if(event.type == SceneManagerEventTypeCustom) {
if (event.event == Evil_PortalEventStartPortal) { if(event.event == Evil_PortalEventStartPortal) {
scene_manager_set_scene_state(app->scene_manager, Evil_PortalSceneStart, scene_manager_set_scene_state(
app->selected_menu_index); app->scene_manager, Evil_PortalSceneStart, app->selected_menu_index);
scene_manager_next_scene(app->scene_manager, scene_manager_next_scene(app->scene_manager, Evil_PortalAppViewStartPortal);
Evil_PortalAppViewStartPortal); } else if(event.event == Evil_PortalEventStartKeyboard) {
} else if (event.event == Evil_PortalEventStartKeyboard) { scene_manager_set_scene_state(
scene_manager_set_scene_state(app->scene_manager, Evil_PortalSceneStart, app->scene_manager, Evil_PortalSceneStart, app->selected_menu_index);
app->selected_menu_index); } else if(event.event == Evil_PortalEventStartConsole) {
} else if (event.event == Evil_PortalEventStartConsole) { scene_manager_set_scene_state(
scene_manager_set_scene_state(app->scene_manager, Evil_PortalSceneStart, app->scene_manager, Evil_PortalSceneStart, app->selected_menu_index);
app->selected_menu_index); scene_manager_next_scene(app->scene_manager, Evil_PortalAppViewConsoleOutput);
scene_manager_next_scene(app->scene_manager,
Evil_PortalAppViewConsoleOutput);
} }
consumed = true; consumed = true;
} else if (event.type == SceneManagerEventTypeTick) { } else if(event.type == SceneManagerEventTypeTick) {
app->selected_menu_index = app->selected_menu_index = variable_item_list_get_selected_item_index(app->var_item_list);
variable_item_list_get_selected_item_index(app->var_item_list);
consumed = true; consumed = true;
} }
return consumed; return consumed;
} }
void evil_portal_scene_start_on_exit(void *context) { void evil_portal_scene_start_on_exit(void* context) {
Evil_PortalApp *app = context; Evil_PortalApp* app = context;
variable_item_list_reset(app->var_item_list); variable_item_list_reset(app->var_item_list);
} }