Refactor self-test (#1615)

* Refactor self-test

* Clean up logging on system init

* Change order of init, screen first

* Improve logging for self-test

* Review comments

Author: mutatrum

main/CMakeLists.txt

@@ -7,6 +7,7 @@ SRCS
     "display.c"
     "screen.c"
     "input.c"
+    "filesystem.c"
     "system.c"
     "work_queue.c"
     "lv_font_portfolio-6x8.c"

main/filesystem.c

@@ -0,0 +1,39 @@
+#include "filesystem.h"
+#include "global_state.h"
+#include "esp_log.h"
+#include "esp_spiffs.h"
+#include "esp_vfs.h"
+
+static const char * TAG = "filesystem";
+
+esp_err_t filesystem_init(void * pvParameters)
+{
+    GlobalState * GLOBAL_STATE = (GlobalState *) pvParameters;
+
+    esp_vfs_spiffs_conf_t conf = {.base_path = "", .partition_label = NULL, .max_files = 5, .format_if_mount_failed = false};
+    esp_err_t ret = esp_vfs_spiffs_register(&conf);
+
+    if (ret != ESP_OK) {
+        if (ret == ESP_FAIL) {
+            ESP_LOGE(TAG, "Failed to mount or format filesystem");
+        } else if (ret == ESP_ERR_NOT_FOUND) {
+            ESP_LOGE(TAG, "Failed to find SPIFFS partition");
+        } else {
+            ESP_LOGE(TAG, "Failed to initialize SPIFFS (%s)", esp_err_to_name(ret));
+        }
+        return ESP_FAIL;
+    }
+
+    GLOBAL_STATE->filesystem_is_available = true;
+
+    size_t total = 0, used = 0;
+    ret = esp_spiffs_info(NULL, &total, &used);
+    if (ret != ESP_OK) {
+        // This shouldn't happen
+        ESP_LOGE(TAG, "Failed to get SPIFFS partition information (%s)", esp_err_to_name(ret));
+    } else {
+        ESP_LOGI(TAG, "Partition size: total: %d, used: %d", total, used);
+    }
+
+    return ESP_OK;
+}

main/filesystem.h

@@ -0,0 +1,16 @@
+#ifndef FILESYSTEM_H_
+#define FILESYSTEM_H_
+
+#include "esp_err.h"
+
+/**
+ * @brief Initialize the SPIFFS filesystem
+ *
+ * This function mounts the SPIFFS partition and can be used
+ * independently of the REST server for self-test mode.
+ *
+ * @return ESP_OK on success, ESP_FAIL on failure
+ */
+esp_err_t filesystem_init(void * pvParameters);
+
+#endif /* FILESYSTEM_H_ */

main/global_state.h

@@ -146,6 +146,7 @@ typedef struct
 
     bool ASIC_initalized;
     bool psram_is_available;
+    bool filesystem_is_available;
 
     int block_height;
     char scriptsig[128];

main/http_server/http_server.c

@@ -302,33 +302,6 @@ esp_err_t is_network_allowed(httpd_req_t * req)
     return ESP_FAIL;
 }
 
-esp_err_t init_fs(void)
-{
-    esp_vfs_spiffs_conf_t conf = {.base_path = "", .partition_label = NULL, .max_files = 5, .format_if_mount_failed = false};
-    esp_err_t ret = esp_vfs_spiffs_register(&conf);
-
-    if (ret != ESP_OK) {
-        if (ret == ESP_FAIL) {
-            ESP_LOGE(TAG, "Failed to mount or format filesystem");
-        } else if (ret == ESP_ERR_NOT_FOUND) {
-            ESP_LOGE(TAG, "Failed to find SPIFFS partition");
-        } else {
-            ESP_LOGE(TAG, "Failed to initialize SPIFFS (%s)", esp_err_to_name(ret));
-        }
-        return ESP_FAIL;
-    }
-
-    size_t total = 0, used = 0;
-    ret = esp_spiffs_info(NULL, &total, &used);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "Failed to get SPIFFS partition information (%s)", esp_err_to_name(ret));
-    } else {
-        ESP_LOGI(TAG, "Partition size: total: %d, used: %d", total, used);
-    }
-
-    return ESP_OK;
-}
-
 /* Function for stopping the webserver */
 void stop_webserver(httpd_handle_t server)
 {
@@ -1346,13 +1319,6 @@ esp_err_t start_rest_server(void * pvParameters)
     asic_api_init(GLOBAL_STATE);
     const char * base_path = "";
 
-    bool enter_recovery = false;
-    if (init_fs() != ESP_OK) {
-        // Unable to initialize the web app filesystem.
-        // Enter recovery mode
-        enter_recovery = true;
-    }
-
     REST_CHECK(base_path, "wrong base path", err);
     rest_server_context_t * rest_context = calloc(1, sizeof(rest_server_context_t));
     REST_CHECK(rest_context, "No memory for rest context", err);
@@ -1495,7 +1461,7 @@ esp_err_t start_rest_server(void * pvParameters)
     };
     httpd_register_uri_handler(server, &ws);
 
-    if (enter_recovery) {
+    if (!GLOBAL_STATE->filesystem_is_available) {
         /* Make default route serve Recovery */
         httpd_uri_t recovery_implicit_get_uri = {
             .uri = "/*", .method = HTTP_GET, 

main/main.c

@@ -21,6 +21,8 @@
 #include "connect.h"
 #include "asic_reset.h"
 #include "asic_init.h"
+#include "filesystem.h"
+#include "input.h"
 
 static GlobalState GLOBAL_STATE;
 
@@ -73,25 +75,30 @@ void app_main(void)
         return;
     }
 
-    if (self_test(&GLOBAL_STATE))
+    if (self_test_init(&GLOBAL_STATE) != ESP_OK) {
+        ESP_LOGE(TAG, "Failed to init self test");
         return;
+    }
 
     SYSTEM_init_system(&GLOBAL_STATE);
 
-    // init AP and connect to wifi
-    wifi_init(&GLOBAL_STATE);
+    if (!GLOBAL_STATE.SELF_TEST_MODULE.is_active) {
+        wifi_init(&GLOBAL_STATE);
+    }
 
     SYSTEM_init_peripherals(&GLOBAL_STATE);
 
     if (xTaskCreate(POWER_MANAGEMENT_task, "power management", 8192, (void *) &GLOBAL_STATE, 10, NULL) != pdPASS) {
         ESP_LOGE(TAG, "Error creating power management task");
     }
-    if (xTaskCreate(FAN_CONTROLLER_task, "fan_controller", 8192, (void *) &GLOBAL_STATE, 5, NULL) != pdPASS) {
-        ESP_LOGE(TAG, "Error creating fan controller task");
-    }
 
-    // start the API for AxeOS
-    start_rest_server((void *) &GLOBAL_STATE);
+    if (!GLOBAL_STATE.SELF_TEST_MODULE.is_active) {
+        if (xTaskCreate(FAN_CONTROLLER_task, "fan_controller", 8192, (void *) &GLOBAL_STATE, 5, NULL) != pdPASS) {
+            ESP_LOGE(TAG, "Error creating fan controller task");
+        }
+        // start the API for AxeOS
+        start_rest_server((void *) &GLOBAL_STATE);
+    }
 
     // After mounting SPIFFS
     SYSTEM_init_versions(&GLOBAL_STATE);
@@ -113,15 +120,23 @@ void app_main(void)
         return;
     }
 
-    if (xTaskCreate(stratum_task, "stratum admin", 8192, (void *) &GLOBAL_STATE, 5, NULL) != pdPASS) {
-        ESP_LOGE(TAG, "Error creating stratum admin task");
-    }
     if (xTaskCreate(create_jobs_task, "stratum miner", 8192, (void *) &GLOBAL_STATE, 20, NULL) != pdPASS) {
         ESP_LOGE(TAG, "Error creating stratum miner task");
     }
     if (xTaskCreate(ASIC_result_task, "asic result", 8192, (void *) &GLOBAL_STATE, 15, NULL) != pdPASS) {
         ESP_LOGE(TAG, "Error creating asic result task");
     }
+
+    if (!GLOBAL_STATE.SELF_TEST_MODULE.is_active) {
+        if (xTaskCreate(stratum_task, "stratum admin", 8192, (void *) &GLOBAL_STATE, 5, NULL) != pdPASS) {
+            ESP_LOGE(TAG, "Error creating stratum admin task");
+        }
+    } else {
+        if (xTaskCreate(self_test_task, "self_test", 8192, (void *) &GLOBAL_STATE, 10, NULL) != pdPASS) {
+            ESP_LOGE(TAG, "Error creating self test task");
+        }
+    }
+
     if (xTaskCreateWithCaps(hashrate_monitor_task, "hashrate monitor", 8192, (void *) &GLOBAL_STATE, 5, NULL, MALLOC_CAP_SPIRAM) !=
         pdPASS) {
         ESP_LOGE(TAG, "Error creating hashrate monitor task");