Update submodules to latest and enable new optimizations (#8)

* update espp and esp-protocols submodules * remove older jpegdec * add esp-cpp/jpegdec * simplify config and enable some optimizations / speedup * remove touch / lvgl since they are not needed * minor update * update * fix log * decrease lvgl memory since it is not used so we can have larger framebuffers if we want
esp-cpp · Aug 15, 2024 · 5f35059 · 5f35059
1 parent 90f55f5
commit 5f35059
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 43 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
       with:
         submodules: 'recursive'
 
-    - name: Build Examples
+    - name: Build Main
       uses: espressif/esp-idf-ci-action@v1
       with:
         esp_idf_version: v5.2.2

diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "components/espp"]
 	path = components/espp
 	url = [email protected]:esp-cpp/espp
-[submodule "components/jpegdec"]
-	path = components/jpegdec
-	url = [email protected]:bitbank2/JPEGDEC
 [submodule "components/esp-protocols"]
 	path = components/esp-protocols
 	url = [email protected]:espressif/esp-protocols
+[submodule "components/jpegdec"]
+	path = components/jpegdec
+	url = https://github.com/esp-cpp/jpegdec
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,6 +10,9 @@ set(EXTRA_COMPONENT_DIRS
   "components/esp-protocols/components"
 )
 
+# add compile definition ARDUINO_ARCH_ESP32, enabling jpegdec simd support
+add_compile_definitions(ARDUINO_ARCH_ESP32)
+
 add_compile_definitions(BOARD_HAS_PSRAM)
 
 set(

diff --git a/components/esp-protocols b/components/esp-protocols
diff --git a/components/espp b/components/espp
diff --git a/components/jpegdec b/components/jpegdec
diff --git a/main/main.cpp b/main/main.cpp
@@ -65,7 +65,7 @@ extern "C" void app_main(void) {
     logger.error("Could not initialize LCD");
     return;
   }
-  static constexpr size_t pixel_buffer_size = hal::lcd_width() * 50;
+  static constexpr size_t pixel_buffer_size = hw.lcd_width() * 50;
   if (!hw.initialize_display(pixel_buffer_size)) {
     logger.error("Could not initialize display");
     return;
@@ -181,12 +181,12 @@ extern "C" void app_main(void) {
   auto display_task = espp::Task::make_unique({
       .name = "Display Task",
       .callback = display_task_fn,
-      .stack_size_bytes = 10 * 1024,
+      .stack_size_bytes = 5 * 1024,
   });
   display_task->start();
 
   // make the rtsp client
-  logger.info("Starting server task");
+  logger.info("Starting RTSP client");
   std::atomic<int> num_frames_received{0};
   espp::RtspClient rtsp_client({
       .server_address = mdns_service_address,

diff --git a/sdkconfig.defaults b/sdkconfig.defaults
@@ -9,7 +9,9 @@ CONFIG_ESP_TASK_WDT_EN=n
 
 CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
 CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
-CONFIG_ESPTOOLPY_FLASHMODE_QIO=y # over twice as fast as DIO
+# over twice as fast as DIO
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
 CONFIG_FREERTOS_HZ=1000
 
@@ -49,35 +51,4 @@ CONFIG_FATFS_LFN_HEAP=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 
-#
-# LVGL configuration - # Monitoring
-#
-# CONFIG_LV_USE_PERF_MONITOR=y
-# CONFIG_LV_USE_MEM_MONITOR=y
-
-#
-# LVGL configuration - # Color settings
-#
-# CONFIG_LV_COLOR_DEPTH_32 is not set
-CONFIG_LV_COLOR_DEPTH_16=y
-# CONFIG_LV_COLOR_DEPTH_8 is not set
-# CONFIG_LV_COLOR_DEPTH_1 is not set
-CONFIG_LV_COLOR_DEPTH=16
-CONFIG_LV_COLOR_16_SWAP=y
-CONFIG_LV_COLOR_MIX_ROUND_OFS=128
-CONFIG_LV_COLOR_CHROMA_KEY_HEX=0x00FF00
-
-#
-# LVGL configuration - # Themes
-#
-CONFIG_LV_USE_THEME_DEFAULT=y
-CONFIG_LV_THEME_DEFAULT_DARK=y
-CONFIG_LV_THEME_DEFAULT_GROW=y
-CONFIG_LV_THEME_DEFAULT_TRANSITION_TIME=80
-
-# LVGL Configuration - 3rd party libraries
-CONFIG_LV_USE_FS_POSIX=y
-# configure the lv drive letter to be 'L' (76) for use as "L:/..."
-CONFIG_LV_FS_POSIX_LETTER=76
-CONFIG_LV_USE_SJPG=y
-CONFIG_LV_USE_QRCODE=y
+CONFIG_LV_MEM_SIZE_KILOBYTES=10