MX 2 лет назад
Родитель
Сommit
941cddc05f

+ 77 - 81
apps_source_code/flipper-evil-portal/evil_portal_app.c

@@ -4,117 +4,113 @@
 #include <furi.h>
 #include <furi_hal.h>
 
-static bool evil_portal_app_custom_event_callback(void *context,
-                                                  uint32_t event) {
-  furi_assert(context);
-  Evil_PortalApp *app = context;
-  return scene_manager_handle_custom_event(app->scene_manager, event);
+static bool evil_portal_app_custom_event_callback(void* context, uint32_t event) {
+    furi_assert(context);
+    Evil_PortalApp* app = context;
+    return scene_manager_handle_custom_event(app->scene_manager, event);
 }
 
-static bool evil_portal_app_back_event_callback(void *context) {
-  furi_assert(context);
-  Evil_PortalApp *app = context;
-  return scene_manager_handle_back_event(app->scene_manager);
+static bool evil_portal_app_back_event_callback(void* context) {
+    furi_assert(context);
+    Evil_PortalApp* app = context;
+    return scene_manager_handle_back_event(app->scene_manager);
 }
 
-static void evil_portal_app_tick_event_callback(void *context) {
-  furi_assert(context);
-  Evil_PortalApp *app = context;
-  scene_manager_handle_tick_event(app->scene_manager);
+static void evil_portal_app_tick_event_callback(void* context) {
+    furi_assert(context);
+    Evil_PortalApp* app = context;
+    scene_manager_handle_tick_event(app->scene_manager);
 }
 
-Evil_PortalApp *evil_portal_app_alloc() {
-  Evil_PortalApp *app = malloc(sizeof(Evil_PortalApp));
+Evil_PortalApp* evil_portal_app_alloc() {
+    Evil_PortalApp* app = malloc(sizeof(Evil_PortalApp));
 
-  app->sent_html = false;
-  app->sent_ap = false;
-  app->sent_reset = false;
-  app->has_command_queue = false;  
-  app->command_index = 0;
-  app->portal_logs = malloc(5000);
+    app->sent_html = false;
+    app->sent_ap = false;
+    app->sent_reset = false;
+    app->has_command_queue = false;
+    app->command_index = 0;
+    app->portal_logs = malloc(5000);
 
-  app->gui = furi_record_open(RECORD_GUI);
+    app->gui = furi_record_open(RECORD_GUI);
 
-  app->view_dispatcher = view_dispatcher_alloc();
-  app->scene_manager = scene_manager_alloc(&evil_portal_scene_handlers, app);
-  view_dispatcher_enable_queue(app->view_dispatcher);
-  view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
+    app->view_dispatcher = view_dispatcher_alloc();
+    app->scene_manager = scene_manager_alloc(&evil_portal_scene_handlers, app);
+    view_dispatcher_enable_queue(app->view_dispatcher);
+    view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
 
-  view_dispatcher_set_custom_event_callback(
-      app->view_dispatcher, evil_portal_app_custom_event_callback);
-  view_dispatcher_set_navigation_event_callback(
-      app->view_dispatcher, evil_portal_app_back_event_callback);
-  view_dispatcher_set_tick_event_callback(
-      app->view_dispatcher, evil_portal_app_tick_event_callback, 100);
+    view_dispatcher_set_custom_event_callback(
+        app->view_dispatcher, evil_portal_app_custom_event_callback);
+    view_dispatcher_set_navigation_event_callback(
+        app->view_dispatcher, evil_portal_app_back_event_callback);
+    view_dispatcher_set_tick_event_callback(
+        app->view_dispatcher, evil_portal_app_tick_event_callback, 100);
 
-  view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui,
-                                ViewDispatcherTypeFullscreen);
+    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
-  app->var_item_list = variable_item_list_alloc();
-  view_dispatcher_add_view(app->view_dispatcher, Evil_PortalAppViewVarItemList,
-                           variable_item_list_get_view(app->var_item_list));
+    app->var_item_list = variable_item_list_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher,
+        Evil_PortalAppViewVarItemList,
+        variable_item_list_get_view(app->var_item_list));
 
-  for (int i = 0; i < NUM_MENU_ITEMS; ++i) {
-    app->selected_option_index[i] = 0;
-  }
+    for(int i = 0; i < NUM_MENU_ITEMS; ++i) {
+        app->selected_option_index[i] = 0;
+    }
 
-  app->text_box = text_box_alloc();
-  view_dispatcher_add_view(app->view_dispatcher,
-                           Evil_PortalAppViewConsoleOutput,
-                           text_box_get_view(app->text_box));
-  app->text_box_store = furi_string_alloc();
-  furi_string_reserve(app->text_box_store, EVIL_PORTAL_TEXT_BOX_STORE_SIZE);
+    app->text_box = text_box_alloc();
+    view_dispatcher_add_view(
+        app->view_dispatcher, Evil_PortalAppViewConsoleOutput, text_box_get_view(app->text_box));
+    app->text_box_store = furi_string_alloc();
+    furi_string_reserve(app->text_box_store, EVIL_PORTAL_TEXT_BOX_STORE_SIZE);
 
-  scene_manager_next_scene(app->scene_manager, Evil_PortalSceneStart);
+    scene_manager_next_scene(app->scene_manager, Evil_PortalSceneStart);
 
-  return app;
+    return app;
 }
 
-void evil_portal_app_free(Evil_PortalApp *app) {  
+void evil_portal_app_free(Evil_PortalApp* app) {
+    // save latest logs
+    if(strlen(app->portal_logs) > 0) {
+        write_logs(app->portal_logs);
+        free(app->portal_logs);
+    }
 
-  // save latest logs
-  if (strlen(app->portal_logs) > 0) {
-    write_logs(app->portal_logs);
-    free(app->portal_logs);
-  }
+    // Send reset event to dev board
+    evil_portal_uart_tx((uint8_t*)(RESET_CMD), strlen(RESET_CMD));
+    evil_portal_uart_tx((uint8_t*)("\n"), 1);
 
-  // Send reset event to dev board
-  evil_portal_uart_tx((uint8_t *)(RESET_CMD), strlen(RESET_CMD));
-  evil_portal_uart_tx((uint8_t *)("\n"), 1);
+    furi_assert(app);
 
-  furi_assert(app);
+    // Views
+    view_dispatcher_remove_view(app->view_dispatcher, Evil_PortalAppViewVarItemList);
+    view_dispatcher_remove_view(app->view_dispatcher, Evil_PortalAppViewConsoleOutput);
 
-  // Views
-  view_dispatcher_remove_view(app->view_dispatcher,
-                              Evil_PortalAppViewVarItemList);
-  view_dispatcher_remove_view(app->view_dispatcher,
-                              Evil_PortalAppViewConsoleOutput);
+    text_box_free(app->text_box);
+    furi_string_free(app->text_box_store);
 
-  text_box_free(app->text_box);
-  furi_string_free(app->text_box_store);
+    // View dispatcher
+    view_dispatcher_free(app->view_dispatcher);
+    scene_manager_free(app->scene_manager);
 
-  // View dispatcher
-  view_dispatcher_free(app->view_dispatcher);
-  scene_manager_free(app->scene_manager);
+    evil_portal_uart_free(app->uart);
 
-  evil_portal_uart_free(app->uart);
+    // Close records
+    furi_record_close(RECORD_GUI);
 
-  // Close records
-  furi_record_close(RECORD_GUI);
-
-  free(app);
+    free(app);
 }
 
-int32_t evil_portal_app(void *p) {  
-  UNUSED(p);
-  Evil_PortalApp *evil_portal_app = evil_portal_app_alloc();
+int32_t evil_portal_app(void* p) {
+    UNUSED(p);
+    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_dispatcher_run(evil_portal_app->view_dispatcher);  
+    view_dispatcher_run(evil_portal_app->view_dispatcher);
 
-  // crashing here
-  evil_portal_app_free(evil_portal_app);
+    // crashing here
+    evil_portal_app_free(evil_portal_app);
 
-  return 0;
+    return 0;
 }

+ 33 - 33
apps_source_code/flipper-evil-portal/evil_portal_app_i.h

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

+ 4 - 4
apps_source_code/flipper-evil-portal/evil_portal_custom_event.h

@@ -1,8 +1,8 @@
 #pragma once
 
 typedef enum {
-  Evil_PortalEventRefreshConsoleOutput = 0,
-  Evil_PortalEventStartConsole,
-  Evil_PortalEventStartKeyboard,
-  Evil_PortalEventStartPortal,
+    Evil_PortalEventRefreshConsoleOutput = 0,
+    Evil_PortalEventStartConsole,
+    Evil_PortalEventStartKeyboard,
+    Evil_PortalEventStartPortal,
 } Evil_PortalCustomEvent;

+ 101 - 105
apps_source_code/flipper-evil-portal/evil_portal_uart.c

@@ -3,136 +3,132 @@
 #include "helpers/evil_portal_storage.h"
 
 struct Evil_PortalUart {
-  Evil_PortalApp *app;
-  FuriThread *rx_thread;
-  FuriStreamBuffer *rx_stream;
-  uint8_t rx_buf[RX_BUF_SIZE + 1];
-  void (*handle_rx_data_cb)(uint8_t *buf, size_t len, void *context);
+    Evil_PortalApp* app;
+    FuriThread* rx_thread;
+    FuriStreamBuffer* rx_stream;
+    uint8_t rx_buf[RX_BUF_SIZE + 1];
+    void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context);
 };
 
 typedef enum {
-  WorkerEvtStop = (1 << 0),
-  WorkerEvtRxDone = (1 << 1),
+    WorkerEvtStop = (1 << 0),
+    WorkerEvtRxDone = (1 << 1),
 } WorkerEvtFlags;
 
 void evil_portal_uart_set_handle_rx_data_cb(
-    Evil_PortalUart *uart,
-    void (*handle_rx_data_cb)(uint8_t *buf, size_t len, void *context)) {
-  furi_assert(uart);
-  uart->handle_rx_data_cb = handle_rx_data_cb;
+    Evil_PortalUart* uart,
+    void (*handle_rx_data_cb)(uint8_t* buf, size_t len, void* context)) {
+    furi_assert(uart);
+    uart->handle_rx_data_cb = handle_rx_data_cb;
 }
 
 #define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
 
-void evil_portal_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void *context) {
-  Evil_PortalUart *uart = (Evil_PortalUart *)context;
+void evil_portal_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context) {
+    Evil_PortalUart* uart = (Evil_PortalUart*)context;
 
-  if (ev == UartIrqEventRXNE) {
-    furi_stream_buffer_send(uart->rx_stream, &data, 1, 0);
-    furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtRxDone);
-  }
+    if(ev == UartIrqEventRXNE) {
+        furi_stream_buffer_send(uart->rx_stream, &data, 1, 0);
+        furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtRxDone);
+    }
 }
 
-static int32_t uart_worker(void *context) {
-  Evil_PortalUart *uart = (void *)context;
-
-  while (1) {
-
-    uint32_t events = furi_thread_flags_wait(WORKER_ALL_RX_EVENTS,
-                                             FuriFlagWaitAny, FuriWaitForever);
-    furi_check((events & FuriFlagError) == 0);
-    if (events & WorkerEvtStop)
-      break;
-    if (events & WorkerEvtRxDone) {
-      size_t len = furi_stream_buffer_receive(uart->rx_stream, uart->rx_buf,
-                                              RX_BUF_SIZE, 0);
-
-      if (len > 0) {
-        if (uart->handle_rx_data_cb) {
-          uart->handle_rx_data_cb(uart->rx_buf, len, uart->app);
-
-          if (uart->app->has_command_queue) {
-            if (uart->app->command_index < 1) {
-              if (0 ==
-                  strncmp(SET_AP_CMD,
-                          uart->app->command_queue[uart->app->command_index],
-                          strlen(SET_AP_CMD))) {
-                char *out_data =
-                    malloc((size_t)(strlen((char *)uart->app->ap_name) +
-                                    strlen("setap=")));
-                strcat(out_data, "setap=");
-                strcat(out_data, (char *)uart->app->ap_name);
-
-                evil_portal_uart_tx((uint8_t *)(out_data), strlen(out_data));
-                evil_portal_uart_tx((uint8_t *)("\n"), 1);
-
-                uart->app->sent_ap = true;
-
-                free(out_data);
-                free(uart->app->ap_name);
-              }
-
-              uart->app->command_index = 0;
-              uart->app->has_command_queue = false;
-              uart->app->command_queue[0] = "";
+static int32_t uart_worker(void* context) {
+    Evil_PortalUart* uart = (void*)context;
+
+    while(1) {
+        uint32_t events =
+            furi_thread_flags_wait(WORKER_ALL_RX_EVENTS, FuriFlagWaitAny, FuriWaitForever);
+        furi_check((events & FuriFlagError) == 0);
+        if(events & WorkerEvtStop) break;
+        if(events & WorkerEvtRxDone) {
+            size_t len = furi_stream_buffer_receive(uart->rx_stream, uart->rx_buf, RX_BUF_SIZE, 0);
+
+            if(len > 0) {
+                if(uart->handle_rx_data_cb) {
+                    uart->handle_rx_data_cb(uart->rx_buf, len, uart->app);
+
+                    if(uart->app->has_command_queue) {
+                        if(uart->app->command_index < 1) {
+                            if(0 == strncmp(
+                                        SET_AP_CMD,
+                                        uart->app->command_queue[uart->app->command_index],
+                                        strlen(SET_AP_CMD))) {
+                                char* out_data = malloc((
+                                    size_t)(strlen((char*)uart->app->ap_name) + strlen("setap=")));
+                                strcat(out_data, "setap=");
+                                strcat(out_data, (char*)uart->app->ap_name);
+
+                                evil_portal_uart_tx((uint8_t*)(out_data), strlen(out_data));
+                                evil_portal_uart_tx((uint8_t*)("\n"), 1);
+
+                                uart->app->sent_ap = true;
+
+                                free(out_data);
+                                free(uart->app->ap_name);
+                            }
+
+                            uart->app->command_index = 0;
+                            uart->app->has_command_queue = false;
+                            uart->app->command_queue[0] = "";
+                        }
+                    }
+
+                    if(uart->app->sent_reset == false) {
+                        strcat(uart->app->portal_logs, (char*)uart->rx_buf);
+                    }
+
+                    if(strlen(uart->app->portal_logs) > 4000) {
+                        write_logs(uart->app->portal_logs);
+                        free(uart->app->portal_logs);
+                        strcpy(uart->app->portal_logs, "");
+                    }
+                }
             }
-          }
-
-          if (uart->app->sent_reset == false) {
-            strcat(uart->app->portal_logs, (char *)uart->rx_buf);
-          }
-
-          if (strlen(uart->app->portal_logs) > 4000) {
-            write_logs(uart->app->portal_logs);
-            free(uart->app->portal_logs);
-            strcpy(uart->app->portal_logs, "");
-          }
         }
-      }
     }
-  }
 
-  furi_stream_buffer_free(uart->rx_stream);
+    furi_stream_buffer_free(uart->rx_stream);
 
-  return 0;
+    return 0;
 }
 
-void evil_portal_uart_tx(uint8_t *data, size_t len) {
-  furi_hal_uart_tx(UART_CH, data, len);
+void evil_portal_uart_tx(uint8_t* data, size_t len) {
+    furi_hal_uart_tx(UART_CH, data, len);
 }
 
-Evil_PortalUart *evil_portal_uart_init(Evil_PortalApp *app) {
-  Evil_PortalUart *uart = malloc(sizeof(Evil_PortalUart));
-  uart->app = app;
-  // Init all rx stream and thread early to avoid crashes
-  uart->rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
-  uart->rx_thread = furi_thread_alloc();
-  furi_thread_set_name(uart->rx_thread, "Evil_PortalUartRxThread");
-  furi_thread_set_stack_size(uart->rx_thread, 1024);
-  furi_thread_set_context(uart->rx_thread, uart);
-  furi_thread_set_callback(uart->rx_thread, uart_worker);
-
-  furi_thread_start(uart->rx_thread);
-
-  furi_hal_console_disable();
-  if (app->BAUDRATE == 0) {
-    app->BAUDRATE = 115200;
-  }
-  furi_hal_uart_set_br(UART_CH, app->BAUDRATE);
-  furi_hal_uart_set_irq_cb(UART_CH, evil_portal_uart_on_irq_cb, uart);
-
-  return uart;
+Evil_PortalUart* evil_portal_uart_init(Evil_PortalApp* app) {
+    Evil_PortalUart* uart = malloc(sizeof(Evil_PortalUart));
+    uart->app = app;
+    // Init all rx stream and thread early to avoid crashes
+    uart->rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
+    uart->rx_thread = furi_thread_alloc();
+    furi_thread_set_name(uart->rx_thread, "Evil_PortalUartRxThread");
+    furi_thread_set_stack_size(uart->rx_thread, 1024);
+    furi_thread_set_context(uart->rx_thread, uart);
+    furi_thread_set_callback(uart->rx_thread, uart_worker);
+
+    furi_thread_start(uart->rx_thread);
+
+    furi_hal_console_disable();
+    if(app->BAUDRATE == 0) {
+        app->BAUDRATE = 115200;
+    }
+    furi_hal_uart_set_br(UART_CH, app->BAUDRATE);
+    furi_hal_uart_set_irq_cb(UART_CH, evil_portal_uart_on_irq_cb, uart);
+
+    return uart;
 }
 
-void evil_portal_uart_free(Evil_PortalUart *uart) {
-  furi_assert(uart);
+void evil_portal_uart_free(Evil_PortalUart* uart) {
+    furi_assert(uart);
 
-  furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtStop);
-  furi_thread_join(uart->rx_thread);
-  furi_thread_free(uart->rx_thread);
+    furi_thread_flags_set(furi_thread_get_id(uart->rx_thread), WorkerEvtStop);
+    furi_thread_join(uart->rx_thread);
+    furi_thread_free(uart->rx_thread);
 
-  furi_hal_uart_set_irq_cb(UART_CH, NULL, NULL);
-  furi_hal_console_enable();
+    furi_hal_uart_set_irq_cb(UART_CH, NULL, NULL);
+    furi_hal_console_enable();
 
-  free(uart);
+    free(uart);
 }

+ 5 - 5
apps_source_code/flipper-evil-portal/evil_portal_uart.h

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

+ 97 - 99
apps_source_code/flipper-evil-portal/helpers/evil_portal_storage.c

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

+ 7 - 4
apps_source_code/flipper-evil-portal/helpers/evil_portal_storage.h

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

+ 3 - 4
apps_source_code/flipper-evil-portal/scenes/evil_portal_scene.c

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

+ 5 - 7
apps_source_code/flipper-evil-portal/scenes/evil_portal_scene.h

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

+ 127 - 138
apps_source_code/flipper-evil-portal/scenes/evil_portal_scene_console_output.c

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

+ 90 - 118
apps_source_code/flipper-evil-portal/scenes/evil_portal_scene_start.c

@@ -5,154 +5,126 @@
 // 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 {
-  FOCUS_CONSOLE_END = 0,
-  FOCUS_CONSOLE_START,
-  FOCUS_CONSOLE_TOGGLE
-} FocusConsole;
+typedef enum { FOCUS_CONSOLE_END = 0, FOCUS_CONSOLE_START, FOCUS_CONSOLE_TOGGLE } FocusConsole;
 
 #define SHOW_STOPSCAN_TIP (true)
 #define NO_TIP (false)
 
 #define MAX_OPTIONS (9)
 typedef struct {
-  const char *item_string;
-  const char *options_menu[MAX_OPTIONS];
-  int num_options_menu;
-  const char *actual_commands[MAX_OPTIONS];
-  InputArgs needs_keyboard;
-  FocusConsole focus_console;
-  bool show_stopscan_tip;
+    const char* item_string;
+    const char* options_menu[MAX_OPTIONS];
+    int num_options_menu;
+    const char* actual_commands[MAX_OPTIONS];
+    InputArgs needs_keyboard;
+    FocusConsole focus_console;
+    bool show_stopscan_tip;
 } Evil_PortalItem;
 
 // NUM_MENU_ITEMS defined in evil_portal_app_i.h - if you add an entry here,
 // increment it!
 const Evil_PortalItem items[NUM_MENU_ITEMS] = {
     // send command
-    {"Start portal",
-     {""},
-     1,
-     {SET_HTML_CMD},
-     NO_ARGS,
-     FOCUS_CONSOLE_END,
-     SHOW_STOPSCAN_TIP},
+    {"Start portal", {""}, 1, {SET_HTML_CMD}, NO_ARGS, FOCUS_CONSOLE_END, SHOW_STOPSCAN_TIP},
 
     // stop portal
     {"Stop portal", {""}, 1, {RESET_CMD}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
 
     // console
-    {"Save logs",
-     {""},
-     1,
-     {"savelogs"},
-     NO_ARGS,
-     FOCUS_CONSOLE_START,
-     SHOW_STOPSCAN_TIP},
+    {"Save logs", {""}, 1, {"savelogs"}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
 
     // help
-    {"Help",
-     {""},
-     1,
-     {"help"},
-     NO_ARGS,
-     FOCUS_CONSOLE_START,
-     SHOW_STOPSCAN_TIP},
+    {"Help", {""}, 1, {"help"}, NO_ARGS, FOCUS_CONSOLE_START, SHOW_STOPSCAN_TIP},
 };
 
-static void evil_portal_scene_start_var_list_enter_callback(void *context,
-                                                            uint32_t index) {
-  furi_assert(context);
-  Evil_PortalApp *app = context;
-
-  furi_assert(index < NUM_MENU_ITEMS);
-  const Evil_PortalItem *item = &items[index];
-
-  const int selected_option_index = app->selected_option_index[index];
-  furi_assert(selected_option_index < item->num_options_menu);
-  app->selected_tx_string = item->actual_commands[selected_option_index];
-  app->is_command = true;
-  app->is_custom_tx_string = false;
-  app->selected_menu_index = index;
-  app->focus_console_start = (item->focus_console == FOCUS_CONSOLE_TOGGLE)
-                                 ? (selected_option_index == 0)
-                                 : item->focus_console;
-  app->show_stopscan_tip = item->show_stopscan_tip;
-
-  view_dispatcher_send_custom_event(app->view_dispatcher,
-                                    Evil_PortalEventStartConsole);
+static void evil_portal_scene_start_var_list_enter_callback(void* context, uint32_t index) {
+    furi_assert(context);
+    Evil_PortalApp* app = context;
+
+    furi_assert(index < NUM_MENU_ITEMS);
+    const Evil_PortalItem* item = &items[index];
+
+    const int selected_option_index = app->selected_option_index[index];
+    furi_assert(selected_option_index < item->num_options_menu);
+    app->selected_tx_string = item->actual_commands[selected_option_index];
+    app->is_command = true;
+    app->is_custom_tx_string = false;
+    app->selected_menu_index = index;
+    app->focus_console_start = (item->focus_console == FOCUS_CONSOLE_TOGGLE) ?
+                                   (selected_option_index == 0) :
+                                   item->focus_console;
+    app->show_stopscan_tip = item->show_stopscan_tip;
+
+    view_dispatcher_send_custom_event(app->view_dispatcher, Evil_PortalEventStartConsole);
 }
 
-static void
-evil_portal_scene_start_var_list_change_callback(VariableItem *item) {
-  furi_assert(item);
+static void evil_portal_scene_start_var_list_change_callback(VariableItem* item) {
+    furi_assert(item);
 
-  Evil_PortalApp *app = variable_item_get_context(item);
-  furi_assert(app);
+    Evil_PortalApp* app = variable_item_get_context(item);
+    furi_assert(app);
 
-  const Evil_PortalItem *menu_item = &items[app->selected_menu_index];
-  uint8_t item_index = variable_item_get_current_value_index(item);
-  furi_assert(item_index < menu_item->num_options_menu);
-  variable_item_set_current_value_text(item,
-                                       menu_item->options_menu[item_index]);
-  app->selected_option_index[app->selected_menu_index] = item_index;
+    const Evil_PortalItem* menu_item = &items[app->selected_menu_index];
+    uint8_t item_index = variable_item_get_current_value_index(item);
+    furi_assert(item_index < menu_item->num_options_menu);
+    variable_item_set_current_value_text(item, menu_item->options_menu[item_index]);
+    app->selected_option_index[app->selected_menu_index] = item_index;
 }
 
-void evil_portal_scene_start_on_enter(void *context) {
-  Evil_PortalApp *app = context;
-  VariableItemList *var_item_list = app->var_item_list;
-
-  variable_item_list_set_enter_callback(
-      var_item_list, evil_portal_scene_start_var_list_enter_callback, app);
-
-  VariableItem *item;
-  for (int i = 0; i < NUM_MENU_ITEMS; ++i) {
-    item = variable_item_list_add(
-        var_item_list, 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_text(
-        item, items[i].options_menu[app->selected_option_index[i]]);
-  }
-
-  variable_item_list_set_selected_item(
-      var_item_list,
-      scene_manager_get_scene_state(app->scene_manager, Evil_PortalSceneStart));
-
-  view_dispatcher_switch_to_view(app->view_dispatcher,
-                                 Evil_PortalAppViewVarItemList);
+void evil_portal_scene_start_on_enter(void* context) {
+    Evil_PortalApp* app = context;
+    VariableItemList* var_item_list = app->var_item_list;
+
+    variable_item_list_set_enter_callback(
+        var_item_list, evil_portal_scene_start_var_list_enter_callback, app);
+
+    VariableItem* item;
+    for(int i = 0; i < NUM_MENU_ITEMS; ++i) {
+        item = variable_item_list_add(
+            var_item_list,
+            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_text(
+            item, items[i].options_menu[app->selected_option_index[i]]);
+    }
+
+    variable_item_list_set_selected_item(
+        var_item_list, scene_manager_get_scene_state(app->scene_manager, Evil_PortalSceneStart));
+
+    view_dispatcher_switch_to_view(app->view_dispatcher, Evil_PortalAppViewVarItemList);
 }
 
-bool evil_portal_scene_start_on_event(void *context, SceneManagerEvent event) {
-  UNUSED(context);
-  Evil_PortalApp *app = context;
-  bool consumed = false;
-
-  if (event.type == SceneManagerEventTypeCustom) {
-    if (event.event == Evil_PortalEventStartPortal) {
-      scene_manager_set_scene_state(app->scene_manager, Evil_PortalSceneStart,
-                                    app->selected_menu_index);
-      scene_manager_next_scene(app->scene_manager,
-                               Evil_PortalAppViewStartPortal);
-    } else if (event.event == Evil_PortalEventStartKeyboard) {
-      scene_manager_set_scene_state(app->scene_manager, Evil_PortalSceneStart,
-                                    app->selected_menu_index);
-    } else if (event.event == Evil_PortalEventStartConsole) {
-      scene_manager_set_scene_state(app->scene_manager, Evil_PortalSceneStart,
-                                    app->selected_menu_index);
-      scene_manager_next_scene(app->scene_manager,
-                               Evil_PortalAppViewConsoleOutput);
+bool evil_portal_scene_start_on_event(void* context, SceneManagerEvent event) {
+    UNUSED(context);
+    Evil_PortalApp* app = context;
+    bool consumed = false;
+
+    if(event.type == SceneManagerEventTypeCustom) {
+        if(event.event == Evil_PortalEventStartPortal) {
+            scene_manager_set_scene_state(
+                app->scene_manager, Evil_PortalSceneStart, app->selected_menu_index);
+            scene_manager_next_scene(app->scene_manager, Evil_PortalAppViewStartPortal);
+        } else if(event.event == Evil_PortalEventStartKeyboard) {
+            scene_manager_set_scene_state(
+                app->scene_manager, Evil_PortalSceneStart, app->selected_menu_index);
+        } else if(event.event == Evil_PortalEventStartConsole) {
+            scene_manager_set_scene_state(
+                app->scene_manager, Evil_PortalSceneStart, app->selected_menu_index);
+            scene_manager_next_scene(app->scene_manager, Evil_PortalAppViewConsoleOutput);
+        }
+        consumed = true;
+    } else if(event.type == SceneManagerEventTypeTick) {
+        app->selected_menu_index = variable_item_list_get_selected_item_index(app->var_item_list);
+        consumed = true;
     }
-    consumed = true;
-  } else if (event.type == SceneManagerEventTypeTick) {
-    app->selected_menu_index =
-        variable_item_list_get_selected_item_index(app->var_item_list);
-    consumed = true;
-  }
-
-  return consumed;
+
+    return consumed;
 }
 
-void evil_portal_scene_start_on_exit(void *context) {
-  Evil_PortalApp *app = context;
-  variable_item_list_reset(app->var_item_list);
+void evil_portal_scene_start_on_exit(void* context) {
+    Evil_PortalApp* app = context;
+    variable_item_list_reset(app->var_item_list);
 }

+ 2 - 1
apps_source_code/nupogodi_game/nupogodi.c

@@ -288,7 +288,8 @@ static bool nupogodi_view_input_callback(InputEvent* event, void* context) {
                     break;
                 }
             }
-    }, consumed);
+        },
+        consumed);
 
     return consumed;
 }