Skip to content

Update submodules to latest and enable new optimizations #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 15, 2024
Merged

Update submodules to latest and enable new optimizations #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f996e21
update espp and esp-protocols submodules
finger563 Aug 15, 2024
c2dd52f
remove older jpegdec
finger563 Aug 15, 2024
eb1a68d
add esp-cpp/jpegdec
finger563 Aug 15, 2024
3bbeee6
simplify config and enable some optimizations / speedup
finger563 Aug 15, 2024
d42a0e8
remove touch / lvgl since they are not needed
finger563 Aug 15, 2024
6e6a61b
minor update
finger563 Aug 15, 2024
5e43941
update
finger563 Aug 15, 2024
b69bb6d
fix log
finger563 Aug 15, 2024
2712917
decrease lvgl memory since it is not used so we can have larger frame…
finger563 Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "components/espp"]
path = components/espp
url = git@github.com:esp-cpp/espp
[submodule "components/jpegdec"]
path = components/jpegdec
url = git@github.com:bitbank2/JPEGDEC
[submodule "components/esp-protocols"]
path = components/esp-protocols
url = git@github.com:espressif/esp-protocols
[submodule "components/jpegdec"]
path = components/jpegdec
url = https://github.com/esp-cpp/jpegdec
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion components/esp-protocols
Open in desktop
Submodule esp-protocols updated 8 files
+3 −1 .github/workflows/modem__target-test.yml
+1 −0 common_components/linux_compat/freertos/include/freertos/FreeRTOS.h
+31 −4 components/esp_websocket_client/esp_websocket_client.c
+0 −1 components/esp_websocket_client/examples/linux/CMakeLists.txt
+1 −3 components/esp_websocket_client/examples/linux/main/CMakeLists.txt
+1 −8 components/esp_websocket_client/examples/linux/main/websocket_linux.c
+2 −0 components/esp_websocket_client/include/esp_websocket_client.h
+33 −4 components/mdns/mdns.c
2 changes: 1 addition & 1 deletion components/espp
Open in desktop
Submodule espp updated 307 files
2 changes: 1 addition & 1 deletion components/jpegdec
Open in desktop
Submodule jpegdec updated 13 files
+30 −0 .github/ISSUE_TEMPLATE/bug_report.md
+4 −1 CMakeLists.txt
+4 −1 examples/ILI9431_t3_slideshow/ILI9431_t3_slideshow.ino
+4 −4 examples/jpeg_perf_test/jpeg_perf_test.ino
+1 −1 library.properties
+225 −32 linux/main.c
+36 −3 src/JPEGDEC.cpp
+60 −9 src/JPEGDEC.h
+2,018 −222 src/jpeg.inl
+57 −0 src/my_cm4_simd.h
+128 −0 src/s3_simd_420.S
+109 −0 src/s3_simd_444.S
+64 −0 src/s3_simd_dequant.S
6 changes: 3 additions & 3 deletions main/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
37 changes: 4 additions & 33 deletions sdkconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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