Compare commits

...

2 Commits
main ... v1.9.1

Author SHA1 Message Date
Terrence
1e94e884b8 fix: c3 stack protection error, remove lvgl jpg library 2025-09-05 11:37:31 +08:00
Terrence
b35bf0c344 fix compiling errors 2025-09-04 13:47:02 +08:00
7 changed files with 14 additions and 19 deletions

View File

@@ -4,7 +4,7 @@
# CMakeLists in this exact order for cmake to work correctly # CMakeLists in this exact order for cmake to work correctly
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
set(PROJECT_VER "1.9.0") set(PROJECT_VER "1.9.1")
# Add this line to disable the specific warning # Add this line to disable the specific warning
add_compile_options(-Wno-missing-field-initializers) add_compile_options(-Wno-missing-field-initializers)

View File

@@ -428,24 +428,24 @@ endchoice
choice DISPLAY_ESP32S3_KORVO2_V3 choice DISPLAY_ESP32S3_KORVO2_V3
depends on BOARD_TYPE_ESP32S3_KORVO2_V3 depends on BOARD_TYPE_ESP32S3_KORVO2_V3
prompt "ESP32S3_KORVO2_V3 LCD Type" prompt "ESP32S3_KORVO2_V3 LCD Type"
default LCD_ST7789 default ESP32S3_KORVO2_V3_LCD_ST7789
help help
屏幕类型选择 屏幕类型选择
config LCD_ST7789 config ESP32S3_KORVO2_V3_LCD_ST7789
bool "ST7789, 分辨率240*280" bool "ST7789, 分辨率240*280"
config LCD_ILI9341 config ESP32S3_KORVO2_V3_LCD_ILI9341
bool "ILI9341, 分辨率240*320" bool "ILI9341, 分辨率240*320"
endchoice endchoice
choice DISPLAY_ESP32S3_AUDIO_BOARD choice DISPLAY_ESP32S3_AUDIO_BOARD
depends on BOARD_TYPE_ESP32S3_AUDIO_BOARD depends on BOARD_TYPE_ESP32S3_AUDIO_BOARD
prompt "ESP32S3_AUDIO_BOARD LCD Type" prompt "ESP32S3_AUDIO_BOARD LCD Type"
default LCD_JD9853 default AUDIO_BOARD_LCD_JD9853
help help
屏幕类型选择 屏幕类型选择
config LCD_JD9853 config AUDIO_BOARD_LCD_JD9853
bool "JD9853, 分辨率320*172" bool "JD9853, 分辨率320*172"
config LCD_ST7789 config AUDIO_BOARD_LCD_ST7789
bool "ST7789, 分辨率240*320" bool "ST7789, 分辨率240*320"
endchoice endchoice

View File

@@ -26,7 +26,7 @@
#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_NC #define VOLUME_UP_BUTTON_GPIO GPIO_NUM_NC
#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC #define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC
#ifdef CONFIG_LCD_ST7789 #ifdef CONFIG_ESP32S3_KORVO2_V3_LCD_ST7789
#define DISPLAY_SDA_PIN GPIO_NUM_NC #define DISPLAY_SDA_PIN GPIO_NUM_NC
#define DISPLAY_SCL_PIN GPIO_NUM_NC #define DISPLAY_SCL_PIN GPIO_NUM_NC
#define DISPLAY_WIDTH 280 #define DISPLAY_WIDTH 280
@@ -40,7 +40,7 @@
#define DISPLAY_OFFSET_Y 0 #define DISPLAY_OFFSET_Y 0
#endif #endif
#ifdef CONFIG_LCD_ILI9341 #ifdef CONFIG_ESP32S3_KORVO2_V3_LCD_ILI9341
#define LCD_TYPE_ILI9341_SERIAL #define LCD_TYPE_ILI9341_SERIAL
#define DISPLAY_SDA_PIN GPIO_NUM_NC #define DISPLAY_SDA_PIN GPIO_NUM_NC
#define DISPLAY_SCL_PIN GPIO_NUM_NC #define DISPLAY_SCL_PIN GPIO_NUM_NC
@@ -78,4 +78,4 @@
#define CAMERA_PIN_PCLK 11 #define CAMERA_PIN_PCLK 11
#define XCLK_FREQ_HZ 20000000 #define XCLK_FREQ_HZ 20000000
#endif // _BOARD_CONFIG_H_ #endif // _BOARD_CONFIG_H_

View File

@@ -62,7 +62,7 @@
#ifdef CONFIG_LCD_JD9853 #ifdef CONFIG_AUDIO_BOARD_LCD_JD9853
#define LCD_TYPE_JD9853_SERIAL #define LCD_TYPE_JD9853_SERIAL
#define DISPLAY_WIDTH 320 #define DISPLAY_WIDTH 320
#define DISPLAY_HEIGHT 172 #define DISPLAY_HEIGHT 172
@@ -76,7 +76,7 @@
#define DISPLAY_OFFSET_Y 0 #define DISPLAY_OFFSET_Y 0
#endif #endif
#ifdef CONFIG_LCD_ST7789 #ifdef CONFIG_AUDIO_BOARD_LCD_ST7789
#define LCD_TYPE_ST7789_SERIAL #define LCD_TYPE_ST7789_SERIAL
#define DISPLAY_WIDTH 240 #define DISPLAY_WIDTH 240
#define DISPLAY_HEIGHT 320 #define DISPLAY_HEIGHT 320
@@ -92,4 +92,4 @@
#endif // _BOARD_CONFIG_H_ #endif // _BOARD_CONFIG_H_

View File

@@ -3,7 +3,6 @@
#include "lcd_display.h" #include "lcd_display.h"
#include <vector> #include <vector>
#include <font_awesome_symbols.h>
#include <esp_log.h> #include <esp_log.h>
#include <esp_err.h> #include <esp_err.h>
#include <esp_lvgl_port.h> #include <esp_lvgl_port.h>
@@ -350,4 +349,4 @@ CustomLcdDisplay::CustomLcdDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_p
} }
SetupUI(); SetupUI();
} }

View File

@@ -636,9 +636,6 @@ void LcdDisplay::SetPreviewImage(const lv_img_dsc_t* img_dsc) {
// Create the image object inside the bubble // Create the image object inside the bubble
lv_obj_t* preview_image = lv_image_create(img_bubble); lv_obj_t* preview_image = lv_image_create(img_bubble);
// Create the image object inside the bubble
lv_obj_t* preview_image = lv_image_create(img_bubble);
// Copy the image descriptor and data to avoid source data changes // Copy the image descriptor and data to avoid source data changes
lv_img_dsc_t* copied_img_dsc = (lv_img_dsc_t*)heap_caps_malloc(sizeof(lv_img_dsc_t), MALLOC_CAP_8BIT); lv_img_dsc_t* copied_img_dsc = (lv_img_dsc_t*)heap_caps_malloc(sizeof(lv_img_dsc_t), MALLOC_CAP_8BIT);
if (copied_img_dsc == nullptr) { if (copied_img_dsc == nullptr) {

View File

@@ -54,7 +54,6 @@ CONFIG_LV_USE_IMGFONT=y
CONFIG_LV_USE_ASSERT_STYLE=y CONFIG_LV_USE_ASSERT_STYLE=y
CONFIG_LV_USE_GIF=y CONFIG_LV_USE_GIF=y
CONFIG_LV_USE_LODEPNG=y CONFIG_LV_USE_LODEPNG=y
CONFIG_LV_USE_TJPGD=y
# Use compressed font # Use compressed font
CONFIG_LV_FONT_FMT_TXT_LARGE=y CONFIG_LV_FONT_FMT_TXT_LARGE=y