Update to master

Author: mutatrum

main/display.c

@@ -69,7 +69,7 @@ esp_err_t display_init(void * pvParameters)
 
     lvgl_port_cfg_t lvgl_cfg = ESP_LVGL_PORT_INIT_CONFIG();
 
-    lvgl_cfg.task_stack_caps = MALLOC_CAP_SPIRAM;
+    // lvgl_cfg.task_stack_caps = MALLOC_CAP_SPIRAM;
 
     if (GLOBAL_STATE->DISPLAY_CONFIG.display == NONE) {
         ESP_LOGI(TAG, "Initialize LVGL");

main/lv_conf.h

@@ -67,7 +67,7 @@
 #define LV_BUILD_EXAMPLES 0
 #define LV_BUILD_DEMOS    0
 
-#define LV_MEM_POOL_INCLUDE     "esp_heap_caps.h"
-#define LV_MEM_POOL_ALLOC(size) heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA)
+// #define LV_MEM_POOL_INCLUDE     "esp_heap_caps.h"
+// #define LV_MEM_POOL_ALLOC(size) heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA)
 
 #endif /* LV_CONF_H */

main/main.c

@@ -122,7 +122,7 @@ void app_main(void)
     if (xTaskCreate(ASIC_result_task, "asic result", 8192, (void *) &GLOBAL_STATE, 15, NULL) != pdPASS) {
         ESP_LOGE(TAG, "Error creating asic result task");
     }
-    if (xTaskCreateWithCaps(hashrate_monitor_task, "hashrate monitor", 8192, (void *) &GLOBAL_STATE, 5, NULL, MALLOC_CAP_SPIRAM) != pdPASS) {
+    if (xTaskCreate(hashrate_monitor_task, "hashrate monitor", 8192, (void *) &GLOBAL_STATE, 5, NULL) != pdPASS) {
         ESP_LOGE(TAG, "Error creating hashrate monitor task");
     }
     if (GLOBAL_STATE.psram_is_available) {

main/tasks/asic_task.c

@@ -21,8 +21,8 @@ void ASIC_task(void *pvParameters)
     //initialize the semaphore
     GLOBAL_STATE->ASIC_TASK_MODULE.semaphore = xSemaphoreCreateBinary();
 
-    GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs = heap_caps_malloc(sizeof(bm_job *) * 128, MALLOC_CAP_SPIRAM);
-    GLOBAL_STATE->valid_jobs = heap_caps_malloc(sizeof(uint8_t) * 128, MALLOC_CAP_SPIRAM);
+    GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs = malloc(sizeof(bm_job *) * 128);
+    GLOBAL_STATE->valid_jobs = malloc(sizeof(uint8_t) * 128);
     for (int i = 0; i < 128; i++)
     {
         GLOBAL_STATE->ASIC_TASK_MODULE.active_jobs[i] = NULL;

main/tasks/hashrate_monitor_task.c

@@ -85,15 +85,15 @@ void hashrate_monitor_task(void *pvParameters)
     int asic_count = GLOBAL_STATE->DEVICE_CONFIG.family.asic_count;
     int hash_domains = GLOBAL_STATE->DEVICE_CONFIG.family.asic.hash_domains;
 
-    HASHRATE_MONITOR_MODULE->total_measurement = heap_caps_malloc(asic_count * sizeof(measurement_t), MALLOC_CAP_SPIRAM);
+    HASHRATE_MONITOR_MODULE->total_measurement = malloc(asic_count * sizeof(measurement_t));
     if (hash_domains > 0) {
         measurement_t* data = malloc(asic_count * hash_domains * sizeof(measurement_t));
-        HASHRATE_MONITOR_MODULE->domain_measurements = heap_caps_malloc(hash_domains * sizeof(measurement_t*), MALLOC_CAP_SPIRAM);
+        HASHRATE_MONITOR_MODULE->domain_measurements = malloc(hash_domains * sizeof(measurement_t*));
         for (size_t i = 0; i < hash_domains; i++) {
             HASHRATE_MONITOR_MODULE->domain_measurements[i] = data + (i * asic_count);
         }
     }
-    HASHRATE_MONITOR_MODULE->error_measurement = heap_caps_malloc(asic_count * sizeof(measurement_t), MALLOC_CAP_SPIRAM);
+    HASHRATE_MONITOR_MODULE->error_measurement = malloc(asic_count * sizeof(measurement_t));
 
     clear_measurements(HASHRATE_MONITOR_MODULE, asic_count, hash_domains);