Merge pull request #34 from jaylikesbunda/main

v1.2.2

Author: jaylikesbunda

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.2.2
+
+- fixed race condition and blocking of UART initialization causing freeze on launch
+- slightly improved startup time
+
 ## v1.2.1
 
 - Added 'apcred' commands to change and reset WebUI SSID & Password

src/main.c

@@ -50,14 +50,16 @@ int32_t ghost_esp_app(void* p) {
    Expansion* expansion = furi_record_open(RECORD_EXPANSION);
    expansion_disable(expansion);
 
-   // Power initialization
+   // Modified power initialization
    uint8_t attempts = 0;
    bool otg_was_enabled = furi_hal_power_is_otg_enabled();
-   while(!furi_hal_power_is_otg_enabled() && attempts++ < 5) {
+
+   // Simply try to enable OTG if not already enabled
+   while(!furi_hal_power_is_otg_enabled() && attempts++ < 3) {
        furi_hal_power_enable_otg();
-       furi_delay_ms(10);
+       furi_delay_ms(20);
    }
-   furi_delay_ms(200);  // Longer delay for power stabilization
+   furi_delay_ms(50);  // Reduced stabilization time
 
    // Set up bare minimum UI state
    AppState* state = malloc(sizeof(AppState));
@@ -150,6 +152,7 @@ int32_t ghost_esp_app(void* p) {
        UART_INIT_STACK_SIZE,  
        init_uart_task,
        state);
+   furi_thread_start(uart_init_thread);  // ACTUALLY START THE THREAD
 
    // Add views to dispatcher - check each component before adding
    if(state->view_dispatcher) {
@@ -169,19 +172,6 @@ int32_t ghost_esp_app(void* p) {
    // Show main menu immediately
    show_main_menu(state);
 
-   // Initialize UART in background
-   state->uart_context = uart_init(state);
-
-   // Check if ESP is connected, if not, try to initialize it
-   if(!uart_is_esp_connected(state->uart_context)) {
-       FURI_LOG_W("Ghost_ESP", "ESP not connected, trying to initialize...");
-       if(uart_init(state) != NULL) {
-           FURI_LOG_I("Ghost_ESP", "ESP initialized successfully");
-       } else {
-           FURI_LOG_E("Ghost_ESP", "Failed to initialize ESP");
-       }
-   }
-
    // Set up and run GUI
    Gui* gui = furi_record_open("gui");
    if(gui && state->view_dispatcher) {

src/menu.c

@@ -6,7 +6,6 @@
 #include "settings_def.h"
 #include "confirmation_view.h"
 
-// Struct definitions must come before they are used
 typedef struct {
     const char* label; // Display label in menu
     const char* command; // UART command to send

src/settings_ui.c

@@ -524,7 +524,7 @@ bool settings_custom_event_callback(void* context, uint32_t event_id) {
                                 "Updated by: Jay Candel\n"
                                 "Built with <3";
 
-        confirmation_view_set_header(app_state->confirmation_view, "Ghost ESP v1.2.1");
+        confirmation_view_set_header(app_state->confirmation_view, "Ghost ESP v1.2.2");
         confirmation_view_set_text(app_state->confirmation_view, info_text);
 
         // Save current view before switching