show binary file, generated by server

Signed-off-by: Peter Siegmund <developer@mars3142.org>

firmware/main/main.cpp

@@ -2,23 +2,31 @@
 #include <lvgl.h>
 
 #include "esp_err.h"
+#include "esp_heap_caps.h"
 #include "esp_log.h"
+#include "esp_task_wdt.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
 
 #include "ff.h"
-#include "image.h"
 #include "storage.h"
+#include <stdlib.h>
 
-#define screenWidth (480)
-#define screenHeight (320)
+#define DISPLAY_WIDTH (480)
+#define DISPLAY_HEIGHT (320)
 
-const unsigned int lvBufferSize = screenWidth * screenHeight / 10 * (LV_COLOR_DEPTH / 8);
+const unsigned int lvBufferSize = DISPLAY_WIDTH * DISPLAY_HEIGHT / 10 * (LV_COLOR_DEPTH / 8);
 uint8_t lvBuffer1[lvBufferSize];
 uint8_t lvBuffer2[lvBufferSize];
 
 static const char *TAG = "main";
 
 LGFX tft;
-static FATFS fs;
+
+// Image cache variables
+static uint8_t *image_cache = NULL;
+static size_t image_cache_size = 0;
+static lv_image_dsc_t cached_image_dsc;
 
 void setup_tft(void)
 {
@@ -52,25 +60,86 @@ void my_touch_read(lv_indev_t *indev_driver, lv_indev_data_t *data)
     }
 }
 
-void fatfs_lvgl_init(void)
+bool load_image_to_cache(const char *filename)
 {
-    // 1. Das Dateisystem "mounten" (einmalig für FatFS)
-    f_mount(&fs, "S:", 1); // "S:" ist der Laufwerksbuchstabe
+    FIL file;
+    FRESULT result = f_open(&file, filename, FA_READ);
+    if (result != FR_OK)
+    {
+        ESP_LOGE(TAG, "Failed to open %s: %d", filename, result);
+        return false;
+    }
 
-    // 2. Eine Treiber-Variable deklarieren
-    static lv_fs_drv_t drv;
-    lv_fs_drv_init(&drv); // Treiberstruktur initialisieren
+    // Determine file size
+    FSIZE_t file_size = f_size(&file);
+    ESP_LOGI(TAG, "Image file size: %d bytes", (int)file_size);
 
-    // 3. Unsere Bridge-Funktionen zuweisen
-    drv.letter = 'S'; // WICHTIG: Muss mit dem Buchstaben in f_mount übereinstimmen
-    drv.open_cb = fs_open;
-    drv.close_cb = fs_close;
-    drv.read_cb = fs_read;
-    drv.seek_cb = fs_seek;
-    drv.tell_cb = fs_tell;
+    // Allocate memory for entire image (prefer PSRAM)
+    image_cache = (uint8_t *)heap_caps_malloc(file_size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
+    if (image_cache == NULL)
+    {
+        ESP_LOGW(TAG, "Failed to allocate PSRAM, trying internal RAM");
+        // Fallback to internal RAM
+        image_cache = (uint8_t *)malloc(file_size);
+    }
 
-    // 4. Den Treiber bei LVGL registrieren
-    lv_fs_drv_register(&drv);
+    if (image_cache == NULL)
+    {
+        ESP_LOGE(TAG, "Failed to allocate memory for image cache");
+        f_close(&file);
+        return false;
+    }
+
+    // Check which memory type is used
+    bool is_psram = esp_ptr_external_ram(image_cache);
+    ESP_LOGI(TAG, "Image cache allocated in %s: %d bytes", is_psram ? "PSRAM" : "internal RAM", (int)file_size);
+
+    // Read entire image in one go
+    UINT bytes_read;
+    result = f_read(&file, image_cache, file_size, &bytes_read);
+    f_close(&file);
+
+    if (result != FR_OK || bytes_read != file_size)
+    {
+        ESP_LOGE(TAG, "Failed to read image file completely");
+        free(image_cache);
+        image_cache = NULL;
+        return false;
+    }
+
+    image_cache_size = file_size;
+
+    // Read image header from first bytes (LVGL BIN format)
+    if (image_cache_size >= 4)
+    {
+        // Parse LVGL BIN header
+        lv_image_header_t *header = (lv_image_header_t *)image_cache;
+
+        // Set up image descriptor for LVGL with correct header data
+        cached_image_dsc.header.w = header->w;
+        cached_image_dsc.header.h = header->h;
+        cached_image_dsc.header.cf = header->cf;
+        cached_image_dsc.header.flags = header->flags;
+        cached_image_dsc.header.stride = header->stride;
+        cached_image_dsc.data_size = image_cache_size;
+        cached_image_dsc.data = image_cache;
+
+        ESP_LOGI(TAG, "Image header: %dx%d, format: %d", header->w, header->h, header->cf);
+    }
+    else
+    {
+        // Fallback for unknown format
+        cached_image_dsc.header.w = 0;
+        cached_image_dsc.header.h = 0;
+        cached_image_dsc.header.cf = LV_COLOR_FORMAT_UNKNOWN;
+        cached_image_dsc.header.flags = 0;
+        cached_image_dsc.header.stride = 0;
+        cached_image_dsc.data_size = image_cache_size;
+        cached_image_dsc.data = image_cache;
+    }
+
+    ESP_LOGI(TAG, "Image successfully loaded to cache (%d bytes)", (int)image_cache_size);
+    return true;
 }
 
 void esp_lv_log_print(lv_log_level_t level, const char *buf)
@@ -106,9 +175,8 @@ void setup()
     lv_log_register_print_cb(esp_lv_log_print);
 
     fs_mount();
-    fatfs_lvgl_init();
 
-    static auto *display = lv_display_create(screenWidth, screenHeight);
+    static auto *display = lv_display_create(DISPLAY_WIDTH, DISPLAY_HEIGHT);
     lv_display_set_color_format(display, LV_COLOR_FORMAT_RGB565);
     lv_display_set_flush_cb(display, flush);
     lv_display_set_buffers(display, lvBuffer1, lvBuffer2, lvBufferSize, LV_DISPLAY_RENDER_MODE_PARTIAL);
@@ -118,15 +186,19 @@ void setup()
     lv_indev_set_read_cb(lvInput, my_touch_read);
 
     ESP_LOGI(TAG, "create image");
-#ifndef LOCAL
-    static auto *image = lv_image_create(lv_scr_act());
-    lv_image_set_src(image, &image_data);
-    lv_obj_align(image, LV_ALIGN_TOP_LEFT, 0, 0);
-#else
-    lv_obj_t *img = lv_image_create(lv_screen_active());
-    lv_image_set_src(img, "S:/response.png"); // Pfad beginnt mit "S:"
-    lv_obj_center(img);
-#endif
+
+    // Load image once into cache
+    if (load_image_to_cache("/poster.bin"))
+    {
+        lv_obj_t *img = lv_image_create(lv_screen_active());
+        lv_image_set_src(img, &cached_image_dsc); // Use cached image data
+        lv_obj_center(img);
+    }
+    else
+    {
+        ESP_LOGE(TAG, "Failed to load image from cache");
+    }
+
     ESP_LOGI(TAG, "image created");
 }
 
@@ -137,6 +209,26 @@ void loop()
     vTaskDelay(pdMS_TO_TICKS(10));
 }
 
+void cleanup_image_cache(void)
+{
+    if (image_cache != NULL)
+    {
+        // Use heap_caps_free since we used heap_caps_malloc
+        if (esp_ptr_external_ram(image_cache))
+        {
+            ESP_LOGI(TAG, "Freeing PSRAM image cache");
+        }
+        else
+        {
+            ESP_LOGI(TAG, "Freeing internal RAM image cache");
+        }
+        heap_caps_free(image_cache);
+        image_cache = NULL;
+        image_cache_size = 0;
+        ESP_LOGI(TAG, "Image cache cleaned up");
+    }
+}
+
 void lvgl_task(void *pvParameter)
 {
     setup();
@@ -144,6 +236,8 @@ void lvgl_task(void *pvParameter)
     {
         loop();
     }
+
+    cleanup_image_cache();
     fs_unmount();
 }