Script scanning/running working.

blackhat_app_i.h

@@ -27,8 +27,8 @@
 #define UART_CH FuriHalSerialIdUsart
 
 #define SHELL_CMD "whoami"
-#define SCAN_CMD "bh scripts"
-#define RUN_CMD "bh scripts run"
+#define SCAN_CMD "bh script scan"
+#define RUN_CMD "bh scriptrun"
 #define WIFI_CON_CMD "bh wifi connect"
 #define SET_INET_SSID_CMD "bh set SSID"
 #define SET_INET_PWD_CMD "bh set PASS"

blackhat_uart.c

@@ -1,6 +1,5 @@
-#include "blackhat_uart.h"
-
 #include "blackhat_app_i.h"
+#include "blackhat_uart.h"
 
 struct BlackhatUart {
     BlackhatApp* app;

scenes/blackhat_scene_scripts.c

@@ -23,7 +23,7 @@ static void blackhat_scene_script_list_enter_callback(
 
 static void blackhat_scene_script_list_change_callback(VariableItem* item)
 {
-    furi_assert(item);  // REMOVE
+    UNUSED(item);
 }
 
 void blackhat_scene_scripts_on_enter(void* context)
@@ -68,9 +68,8 @@ void blackhat_scene_scripts_on_enter(void* context)
 
 bool blackhat_scene_scripts_on_event(void* context, SceneManagerEvent event)
 {
-    BlackhatApp* app = context;
-    furi_assert(app);    // REMOVE
-    furi_assert(event);  // REMOVE
+    UNUSED(context);
+    UNUSED(event);
     return false;
 }
 

scenes/blackhat_scene_start.c

@@ -49,8 +49,13 @@ static void blackhat_scene_start_var_list_enter_callback(
     app->selected_menu_index = index;
 
     app->selected_option_item_text = item->selected_option;
-    view_dispatcher_send_custom_event(
-        app->view_dispatcher, BlackhatEventStartConsole
+
+    scene_manager_set_scene_state(
+        app->scene_manager, BlackhatSceneStart, app->selected_menu_index
+    );
+
+    scene_manager_next_scene(
+        app->scene_manager, BlackhatAppViewConsoleOutput
     );
 }
 
@@ -117,37 +122,8 @@ void blackhat_scene_start_on_enter(void* context)
 bool blackhat_scene_start_on_event(void* context, SceneManagerEvent event)
 {
     UNUSED(context);
-    BlackhatApp* app = context;
-    bool consumed = false;
-
-    if (event.type == SceneManagerEventTypeCustom) {
-        if (event.event == BlackhatEventStartPortal) {
-            scene_manager_set_scene_state(
-                app->scene_manager, BlackhatSceneStart, app->selected_menu_index
-            );
-            scene_manager_next_scene(
-                app->scene_manager, BlackhatAppViewStartPortal
-            );
-        } else if (event.event == BlackhatEventStartKeyboard) {
-            scene_manager_set_scene_state(
-                app->scene_manager, BlackhatSceneStart, app->selected_menu_index
-            );
-        } else if (event.event == BlackhatEventStartConsole) {
-            scene_manager_set_scene_state(
-                app->scene_manager, BlackhatSceneStart, app->selected_menu_index
-            );
-            scene_manager_next_scene(
-                app->scene_manager, BlackhatAppViewConsoleOutput
-            );
-        }
-        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;
+    UNUSED(event);
+    return false;
 }
 
 void blackhat_scene_start_on_exit(void* context)