Merge pull request #81 from Spooks4576/Development

Development
Spooks4576 · Nov 14, 2024 · 29b7c3b · 29b7c3b
2 parents e7a1fda + 1bfa6a5
commit 29b7c3b
Show file tree

Hide file tree

Showing 26 changed files with 11,329 additions and 2,356 deletions.
diff --git a/.github/workflows/compile_generics.yml b/.github/workflows/compile_generics.yml
@@ -28,15 +28,19 @@ jobs:
           - { name: "ghostboard", idf_target: "esp32c6", sdkconfig_file: "configs/sdkconfig.ghostboard", zip_name: "ghostboard.zip"}
 
           # Screen-supported builds
+          - { name: "MarauderV4_FlipperHub", idf_target: "esp32", sdkconfig_file: "configs/sdkconfig.marauderv4", zip_name: "MarauderV4_FlipperHub.zip"}
           - { name: "MarauderV6&AwokDual", idf_target: "esp32", sdkconfig_file: "configs/sdkconfig.marauderv6", zip_name: "MarauderV6_AwokDual.zip"}
           - { name: "AwokMini", idf_target: "esp32", sdkconfig_file: "configs/sdkconfig.awokmini", zip_name: "AwokMini.zip"}
           - { name: "ESP32-S3-Cardputer", idf_target: "esp32s3", sdkconfig_file: "configs/sdkconfig.cardputer", zip_name: "ESP32-S3-Cardputer.zip"}
+          - { name: "LillyGoTWatch_S3", idf_target: "esp32s3", sdkconfig_file: "configs/sdkconfig.S3TWatch", zip_name: "lillygos3watch.zip"}
+
 
           # CYD (Cheap Yellow Display) with touch screen
           - { name: "CYD2USB", idf_target: "esp32", sdkconfig_file: "configs/sdkconfig.CYD2USB", zip_name: "CYD2USB.zip"}
           - { name: "CYDMicroUSB", idf_target: "esp32", sdkconfig_file: "configs/sdkconfig.CYDMicroUSB", zip_name: "CYDMicroUSB.zip"}
           - { name: "CYDDualUSB", idf_target: "esp32",  sdkconfig_file: "configs/sdkconfig.CYDDualUSB", zip_name: "CYDDualUSB.zip"}
-
+          - { name: "CYD2USB2.4_Inch", idf_target: "esp32", sdkconfig_file: "configs/sdkconfig.CYD2USB2.4Inch", zip_name: "CYD2USB2.4Inch.zip"}
+
 
           # 7-inch boards
           - { name: "Waveshare_LCD", idf_target: "esp32s3", sdkconfig_file: "configs/sdkconfig.waveshare7inch", zip_name: "Waveshare_LCD.zip"}

diff --git a/components/lvgl_esp32_drivers/lvgl_helpers.c b/components/lvgl_esp32_drivers/lvgl_helpers.c
@@ -195,7 +195,7 @@ bool lvgl_spi_driver_init(int host,
 #else
     esp_err_t ret = spi_bus_initialize(host, &buscfg, (spi_dma_chan_t)dma_channel);
 #endif
-    assert(ret == ESP_OK);
+    //assert(ret == ESP_OK);
 
     return ESP_OK != ret;
 }