2626// Include the header where settings_custom_event_callback is declared
2727#include "settings_ui.h"
2828
29+ #define UART_INIT_STACK_SIZE 2048
30+
31+ static int32_t init_uart_task (void * context ) {
32+ AppState * state = context ;
33+
34+ // Add some delay to let system stabilize
35+ furi_delay_ms (50 );
36+
37+ state -> uart_context = uart_init (state );
38+ if (state -> uart_context ) {
39+ FURI_LOG_I ("Ghost_ESP" , "UART initialized successfully" );
40+ } else {
41+ FURI_LOG_E ("Ghost_ESP" , "UART initialization failed" );
42+ }
43+ return 0 ;
44+ }
45+
46+
2947int32_t ghost_esp_app (void * p ) {
3048 UNUSED (p );
3149
32- uint8_t attempts = 0 ;
50+ // Quick power check and initialization
3351 bool otg_was_enabled = furi_hal_power_is_otg_enabled ();
34- while (!furi_hal_power_is_otg_enabled () && attempts ++ < 5 ) {
35- furi_hal_power_enable_otg ();
36- furi_delay_ms (10 );
52+ if (!otg_was_enabled ) {
53+ uint8_t attempts = 0 ;
54+ while (!furi_hal_power_is_otg_enabled () && attempts ++ < 3 ) {
55+ furi_hal_power_enable_otg ();
56+ furi_delay_ms (10 );
57+ }
58+ furi_delay_ms (50 );
3759 }
38- furi_delay_ms (200 );
3960
40- // Set up UI
61+ // Set up bare minimum UI state
4162 AppState * state = malloc (sizeof (AppState ));
4263 if (!state ) return -1 ;
4364 memset (state , 0 , sizeof (AppState )); // Zero all memory first
4465
45- // Initialize text buffers
66+ // Initialize essential text buffers with minimal size
4667 state -> textBoxBuffer = malloc (1 );
4768 if (state -> textBoxBuffer ) {
4869 state -> textBoxBuffer [0 ] = '\0' ;
@@ -53,50 +74,75 @@ int32_t ghost_esp_app(void* p) {
5374 memset (state -> input_buffer , 0 , 32 );
5475 }
5576
56- // Initialize UI components
77+ // Initialize UI components - core components first
5778 state -> view_dispatcher = view_dispatcher_alloc ();
5879 state -> main_menu = main_menu_alloc ();
80+ if (!state -> view_dispatcher || !state -> main_menu ) {
81+ // Clean up and exit if core components fail
82+ if (state -> view_dispatcher ) view_dispatcher_free (state -> view_dispatcher );
83+ if (state -> main_menu ) main_menu_free (state -> main_menu );
84+ free (state -> textBoxBuffer );
85+ free (state -> input_buffer );
86+ free (state );
87+ return -1 ;
88+ }
89+
90+ // Allocate remaining UI components
5991 state -> wifi_menu = submenu_alloc ();
6092 state -> ble_menu = submenu_alloc ();
6193 state -> gps_menu = submenu_alloc ();
6294 state -> text_box = text_box_alloc ();
6395 state -> settings_menu = variable_item_list_alloc ();
6496 state -> text_input = text_input_alloc ();
6597 state -> confirmation_view = confirmation_view_alloc ();
98+ state -> settings_actions_menu = submenu_alloc ();
6699
67- // Set headers after allocation
100+ // Set headers - only for successfully allocated components
68101 if (state -> main_menu ) main_menu_set_header (state -> main_menu , "Select a Utility" );
69102 if (state -> wifi_menu ) submenu_set_header (state -> wifi_menu , "Select a Wifi Utility" );
70103 if (state -> ble_menu ) submenu_set_header (state -> ble_menu , "Select a Bluetooth Utility" );
71104 if (state -> gps_menu ) submenu_set_header (state -> gps_menu , "Select a GPS Utility" );
72105 if (state -> text_input ) text_input_set_header_text (state -> text_input , "Enter Your Text" );
106+ if (state -> settings_actions_menu ) submenu_set_header (state -> settings_actions_menu , "Settings" );
73107
74- // Initialize storage and load settings before UART
108+ // Initialize settings and configuration early
75109 settings_storage_init ();
76110 if (settings_storage_load (& state -> settings , GHOST_ESP_APP_SETTINGS_FILE ) != SETTINGS_OK ) {
77111 memset (& state -> settings , 0 , sizeof (Settings ));
78112 state -> settings .stop_on_back_index = 1 ;
79113 settings_storage_save (& state -> settings , GHOST_ESP_APP_SETTINGS_FILE );
80114 }
81115
116+ // Initialize filter config
117+ state -> filter_config = malloc (sizeof (FilterConfig ));
118+ if (state -> filter_config ) {
119+ state -> filter_config -> enabled = state -> settings .enable_filtering_index ;
120+ state -> filter_config -> show_ble_status = true;
121+ state -> filter_config -> show_wifi_status = true;
122+ state -> filter_config -> show_flipper_devices = true;
123+ state -> filter_config -> show_wifi_networks = true;
124+ state -> filter_config -> strip_ansi_codes = true;
125+ state -> filter_config -> add_prefixes = true;
126+ }
127+
82128 // Set up settings UI context
83129 state -> settings_ui_context .settings = & state -> settings ;
84130 state -> settings_ui_context .send_uart_command = send_uart_command ;
85131 state -> settings_ui_context .switch_to_view = NULL ;
86132 state -> settings_ui_context .show_confirmation_view = show_confirmation_view_wrapper ;
87133 state -> settings_ui_context .context = state ;
88- state -> settings_actions_menu = submenu_alloc ();
89- if (state -> settings_actions_menu ) {
90- submenu_set_header (state -> settings_actions_menu , "Settings Actions" );
91- }
92134
93135 // Initialize settings menu
94136 settings_setup_gui (state -> settings_menu , & state -> settings_ui_context );
95137
96- // Initialize UART after settings are ready
97- state -> uart_context = uart_init (state );
138+ // Start UART init in background thread
139+ FuriThread * uart_init_thread = furi_thread_alloc_ex (
140+ "UartInit" ,
141+ UART_INIT_STACK_SIZE , // Increased stack size
142+ init_uart_task ,
143+ state );
98144
99- // Add views if view_dispatcher exists
145+ // Add views to dispatcher - check each component before adding
100146 if (state -> view_dispatcher ) {
101147 if (state -> main_menu ) view_dispatcher_add_view (state -> view_dispatcher , 0 , main_menu_get_view (state -> main_menu ));
102148 if (state -> wifi_menu ) view_dispatcher_add_view (state -> view_dispatcher , 1 , submenu_get_view (state -> wifi_menu ));
@@ -108,14 +154,16 @@ int32_t ghost_esp_app(void* p) {
108154 if (state -> confirmation_view ) view_dispatcher_add_view (state -> view_dispatcher , 7 , confirmation_view_get_view (state -> confirmation_view ));
109155 if (state -> settings_actions_menu ) view_dispatcher_add_view (state -> view_dispatcher , 8 , submenu_get_view (state -> settings_actions_menu ));
110156
111- view_dispatcher_set_custom_event_callback (state -> view_dispatcher , settings_custom_event_callback );
112-
157+ view_dispatcher_set_custom_event_callback (state -> view_dispatcher , settings_custom_event_callback );
113158 }
114159
115- // Show main menu
160+ // Show main menu immediately
116161 show_main_menu (state );
117162
118- // Set up GUI
163+ // Initialize UART in background
164+ state -> uart_context = uart_init (state );
165+
166+ // Set up and run GUI
119167 Gui * gui = furi_record_open ("gui" );
120168 if (gui && state -> view_dispatcher ) {
121169 view_dispatcher_attach_to_gui (state -> view_dispatcher , gui , ViewDispatcherTypeFullscreen );
@@ -125,13 +173,18 @@ int32_t ghost_esp_app(void* p) {
125173 }
126174 furi_record_close ("gui" );
127175
176+ // Wait for UART initialization to complete
177+ furi_thread_join (uart_init_thread );
178+ furi_thread_free (uart_init_thread );
179+
128180 // Start cleanup - first remove views
129181 if (state -> view_dispatcher ) {
130182 for (size_t i = 0 ; i <= 8 ; i ++ ) {
131183 view_dispatcher_remove_view (state -> view_dispatcher , i );
132184 }
133185 }
134186
187+
135188 // Clear callbacks before cleanup
136189 if (state -> confirmation_view ) {
137190 confirmation_view_set_ok_callback (state -> confirmation_view , NULL , NULL );
@@ -197,7 +250,11 @@ int32_t ghost_esp_app(void* p) {
197250 free (state -> textBoxBuffer );
198251 state -> textBoxBuffer = NULL ;
199252 }
200-
253+ // Add filter config cleanup
254+ if (state -> filter_config ) {
255+ free (state -> filter_config );
256+ state -> filter_config = NULL ;
257+ }
201258 // Final state cleanup
202259 free (state );
203260
0 commit comments