fix: Categorizing waveshare products (#1734)
content: Update the README.md ci: Adapt to the lower directory ci: the lower directory support ci: board type errors fixed. ci: board_type errors fixed to board_leaf. fix: A naming error problem fix: jd9365 member error fix: Update product naming feat: Add manufacturer parameters to the firmware name for 'release' fix: Verification logic fix: Verification logic
This commit is contained in:
@ -255,131 +255,181 @@ elseif(CONFIG_BOARD_TYPE_ESP_SENSAIRSHUTTLE)
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_16_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_32)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_AUDIO_BOARD)
|
||||
set(BOARD_TYPE "waveshare-s3-audio-board")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_AUDIO_BOARD)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-audio-board")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_16_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_32)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_8)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_8)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-amoled-1.8")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_8)
|
||||
set(BOARD_TYPE "waveshare-c6-touch-amoled-1.8")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_1_8)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-c6-touch-amoled-1.8")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_2_06)
|
||||
set(BOARD_TYPE "waveshare-s3-touch-amoled-2.06")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_06)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-amoled-2.06")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_2_06)
|
||||
set(BOARD_TYPE "waveshare-c6-touch-amoled-2.06")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_2_06)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-c6-touch-amoled-2.06")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_4B)
|
||||
set(BOARD_TYPE "waveshare-s3-touch-lcd-4b")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_4B)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-4b")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_4_3C)
|
||||
set(BOARD_TYPE "waveshare-s3-touch-lcd-4.3c")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3C)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-4.3c")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_75)
|
||||
set(BOARD_TYPE "waveshare-s3-touch-amoled-1.75")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_75)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-amoled-1.75")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_83)
|
||||
set(BOARD_TYPE "waveshare-s3-touch-lcd-1.83")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_83)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-1.83")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_16_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_85C)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-1.85c")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_16_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_85)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-1.85")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_16_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_46)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_46)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-1.46")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_16_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_5)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_5)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-3.5")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_20_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_5B)
|
||||
set(BOARD_TYPE "waveshare-s3-touch-lcd-3.5b")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_5B)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-3.5b")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_16_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_32)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_ePaper_1_54)
|
||||
set(BOARD_TYPE "waveshare-s3-epaper-1.54")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_ePaper_1_54)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-epaper-1.54")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_20_4)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_RLCD_4_2)
|
||||
set(BOARD_TYPE "waveshare-s3-rlcd-4.2")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_RLCD_4_2)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-rlcd-4.2")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_49)
|
||||
set(BOARD_TYPE "waveshare-s3-touch-lcd-3.49")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_49)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-lcd-3.49")
|
||||
set(LVGL_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(LVGL_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_LCD_1_69)
|
||||
set(BOARD_TYPE "waveshare-c6-lcd-1.69")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_C6_LCD_1_69)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-c6-lcd-1.69")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_20_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_TOUCH_LCD_1_83)
|
||||
set(BOARD_TYPE "waveshare-c6-touch-lcd-1.83")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_LCD_1_83)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-c6-touch-lcd-1.83")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_16_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_16_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_43)
|
||||
set(BOARD_TYPE "waveshare-c6-touch-amoled-1.43")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_1_43)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-c6-touch-amoled-1.43")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_32)
|
||||
set(BOARD_TYPE "waveshare-c6-touch-amoled-1.32")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_1_32)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-c6-touch-amoled-1.32")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_20_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_32)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_32)
|
||||
set(BOARD_TYPE "waveshare-s3-touch-amoled-1.32")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_32)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-s3-touch-amoled-1.32")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_20_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_32)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_NANO)
|
||||
set(BOARD_TYPE "waveshare-p4-nano")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_NANO)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-p4-nano")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_4B)
|
||||
set(BOARD_TYPE "waveshare-p4-wifi6-touch-lcd-4b")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4B)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-p4-wifi6-touch-lcd")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_7B)
|
||||
set(BOARD_TYPE "waveshare-p4-wifi6-touch-lcd-7b")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7B)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-p4-wifi6-touch-lcd")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_XC)
|
||||
set(BOARD_TYPE "waveshare-p4-wifi6-touch-lcd-xc")
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_3_4C)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-p4-wifi6-touch-lcd")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4C)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-p4-wifi6-touch-lcd")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-p4-wifi6-touch-lcd")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_8)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-p4-wifi6-touch-lcd")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_10_1)
|
||||
set(MANUFACTURER "waveshare")
|
||||
set(BOARD_TYPE "esp32-p4-wifi6-touch-lcd")
|
||||
set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
|
||||
set(BUILTIN_ICON_FONT font_awesome_30_4)
|
||||
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
|
||||
@ -644,8 +694,15 @@ elseif(CONFIG_BOARD_TYPE_HU_087)
|
||||
endif()
|
||||
|
||||
file(GLOB BOARD_SOURCES
|
||||
if(MANUFACTURER)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/boards/${MANUFACTURER}/${BOARD_TYPE}/*.cc
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/boards/${MANUFACTURER}/${BOARD_TYPE}/*.c
|
||||
else
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.c
|
||||
endif()
|
||||
|
||||
|
||||
)
|
||||
list(APPEND SOURCES ${BOARD_SOURCES})
|
||||
|
||||
|
||||
@ -257,83 +257,95 @@ choice BOARD_TYPE
|
||||
config BOARD_TYPE_M5STACK_ATOM_MATRIX_ECHO_BASE
|
||||
bool "M5Stack AtomMatrix + Echo Base"
|
||||
depends on IDF_TARGET_ESP32
|
||||
config BOARD_TYPE_WAVESHARE_S3_AUDIO_BOARD
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_AUDIO_BOARD
|
||||
bool "Waveshare ESP32-S3-Audio-Board"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_8
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_8
|
||||
bool "Waveshare ESP32-S3-Touch-AMOLED-1.8"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_2_06
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_06
|
||||
bool "Waveshare ESP32-S3-Touch-AMOLED-2.06"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_2_06
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_2_06
|
||||
bool "Waveshare ESP32-C6-Touch-AMOLED-2.06"
|
||||
depends on IDF_TARGET_ESP32C6
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_75
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_75
|
||||
bool "Waveshare ESP32-S3-Touch-AMOLED-1.75"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_83
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_83
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-1.83"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_4B
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_4B
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-4B"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_4_3C
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3C
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-4.3C"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_85C
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85C
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-1.85C"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_85
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-1.85"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_46
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_46
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-1.46"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_C6_LCD_1_69
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_C6_LCD_1_69
|
||||
bool "Waveshare ESP32-C6-LCD-1.69"
|
||||
depends on IDF_TARGET_ESP32C6
|
||||
config BOARD_TYPE_WAVESHARE_C6_TOUCH_LCD_1_83
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_LCD_1_83
|
||||
bool "Waveshare ESP32-C6-Touch-LCD-1.83"
|
||||
depends on IDF_TARGET_ESP32C6
|
||||
config BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_43
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_1_43
|
||||
bool "Waveshare ESP32-C6-Touch-AMOLOED-1.43"
|
||||
depends on IDF_TARGET_ESP32C6
|
||||
config BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_32
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_1_32
|
||||
bool "Waveshare ESP32-C6-Touch-AMOLOED-1.32"
|
||||
depends on IDF_TARGET_ESP32C6
|
||||
config BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_8
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_1_8
|
||||
bool "Waveshare ESP32-C6-Touch-AMOLED-1.8"
|
||||
depends on IDF_TARGET_ESP32C6
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_32
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_32
|
||||
bool "Waveshare ESP32-S3-Touch-AMOLOED-1.32"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_49
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_49
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-3.49"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_5
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_5
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-3.5"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_ePaper_1_54
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_ePaper_1_54
|
||||
bool "Waveshare ESP32-S3-ePaper-1.54"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_RLCD_4_2
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_RLCD_4_2
|
||||
bool "Waveshare ESP32-S3-RLCD-4.2"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_5B
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_5B
|
||||
bool "Waveshare ESP32-S3-Touch-LCD-3.5B"
|
||||
depends on IDF_TARGET_ESP32S3
|
||||
config BOARD_TYPE_WAVESHARE_P4_NANO
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_P4_NANO
|
||||
bool "Waveshare ESP32-P4-NANO"
|
||||
depends on IDF_TARGET_ESP32P4
|
||||
config BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_4B
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4B
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-4B"
|
||||
depends on IDF_TARGET_ESP32P4
|
||||
config BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_7B
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7B
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-7B"
|
||||
depends on IDF_TARGET_ESP32P4
|
||||
config BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_XC
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-3.4C or ESP32-P4-WIFI6-Touch-LCD-4C"
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_3_4C
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-3.4C"
|
||||
depends on IDF_TARGET_ESP32P4
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4C
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-4C"
|
||||
depends on IDF_TARGET_ESP32P4
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-7"
|
||||
depends on IDF_TARGET_ESP32P4
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_8
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-8"
|
||||
depends on IDF_TARGET_ESP32P4
|
||||
config BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_10_1
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-10.1"
|
||||
depends on IDF_TARGET_ESP32P4
|
||||
config BOARD_TYPE_TUDOUZI
|
||||
bool "土豆子"
|
||||
@ -529,7 +541,7 @@ choice DISPLAY_OLED_TYPE
|
||||
endchoice
|
||||
|
||||
choice DISPLAY_LCD_TYPE
|
||||
depends on BOARD_TYPE_BREAD_COMPACT_WIFI_LCD || BOARD_TYPE_BREAD_COMPACT_ESP32_LCD || BOARD_TYPE_CGC || BOARD_TYPE_WAVESHARE_P4_NANO || BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_XC || BOARD_TYPE_BREAD_COMPACT_WIFI_CAM
|
||||
depends on BOARD_TYPE_BREAD_COMPACT_WIFI_LCD || BOARD_TYPE_BREAD_COMPACT_ESP32_LCD || BOARD_TYPE_CGC || BOARD_TYPE_BREAD_COMPACT_WIFI_CAM
|
||||
prompt "LCD Type"
|
||||
default LCD_ST7789_240X320
|
||||
help
|
||||
@ -564,14 +576,6 @@ choice DISPLAY_LCD_TYPE
|
||||
bool "ILI9341 240*320, Non-IPS"
|
||||
config LCD_GC9A01_240X240
|
||||
bool "GC9A01 240*240 Circle"
|
||||
config LCD_TYPE_800_1280_10_1_INCH
|
||||
bool "Waveshare 101M-8001280-IPS-CT-K Display"
|
||||
config LCD_TYPE_800_1280_10_1_INCH_A
|
||||
bool "Waveshare 10.1-DSI-TOUCH-A Display"
|
||||
config LCD_TYPE_800_800_3_4_INCH
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-3.4C with 800*800 3.4inch round display"
|
||||
config LCD_TYPE_720_720_4_INCH
|
||||
bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-4C with 720*720 4inch round display"
|
||||
config LCD_CUSTOM
|
||||
bool "Custom LCD (自定义屏幕参数)"
|
||||
endchoice
|
||||
@ -589,7 +593,7 @@ choice DISPLAY_ESP32S3_KORVO2_V3
|
||||
endchoice
|
||||
|
||||
choice DISPLAY_ESP32S3_AUDIO_BOARD
|
||||
depends on BOARD_TYPE_WAVESHARE_S3_AUDIO_BOARD
|
||||
depends on BOARD_TYPE_WAVESHARE_ESP32_S3_AUDIO_BOARD
|
||||
prompt "ESP32S3_AUDIO_BOARD LCD Type"
|
||||
default AUDIO_BOARD_LCD_JD9853
|
||||
help
|
||||
@ -701,11 +705,12 @@ config USE_DEVICE_AEC
|
||||
bool "Enable Device-Side AEC"
|
||||
default n
|
||||
depends on USE_AUDIO_PROCESSOR && (BOARD_TYPE_ESP_BOX_3 || BOARD_TYPE_ESP_BOX || BOARD_TYPE_ESP_BOX_LITE \
|
||||
|| BOARD_TYPE_LICHUANG_DEV_S3 || BOARD_TYPE_ESP_KORVO2_V3 || BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_75 || BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_83\
|
||||
|| BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_2_06 || BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_4B || BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_4B || BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_7B \
|
||||
|| BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_XC || BOARD_TYPE_ESP_S3_LCD_EV_Board_2 || BOARD_TYPE_YUNLIAO_S3 \
|
||||
|| BOARD_TYPE_ECHOEAR || BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_49 || BOARD_TYPE_WAVESHARE_S3_RLCD_4_2 || BOARD_TYPE_ZHENGCHEN_CAM || BOARD_TYPE_ZHENGCHEN_CAM_ML307 \
|
||||
|| BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_4_3C)
|
||||
|| BOARD_TYPE_LICHUANG_DEV_S3 || BOARD_TYPE_ESP_KORVO2_V3 || BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_75 || BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_1_83\
|
||||
|| BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_2_06 || BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_4B || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4B || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7B \
|
||||
|| BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_3_4C || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4C || BOARD_TYPE_ESP_S3_LCD_EV_Board_2 || BOARD_TYPE_YUNLIAO_S3 \
|
||||
|| BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7 || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_8 || BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_10_1 \
|
||||
|| BOARD_TYPE_ECHOEAR || BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_3_49 || BOARD_TYPE_WAVESHARE_ESP32_S3_RLCD_4_2 || BOARD_TYPE_ZHENGCHEN_CAM || BOARD_TYPE_ZHENGCHEN_CAM_ML307 \
|
||||
|| BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3C)
|
||||
help
|
||||
To work properly, device-side AEC requires a clean output reference path from the speaker signal and physical acoustic isolation between the microphone and speaker.
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
# Waveshare ESP32-P4-WIFI6-Touch-LCD-4B
|
||||
|
||||
|
||||
[ESP32-P4-WIFI6-Touch-LCD-4B](https://www.waveshare.com/esp32-p4-wifi6-touch-lcd-4b.htm) is waveshare electronics designed an intelligent 86 box based on ESP32-P4 module equipped with a 720*720 IPS capacitive touch screen
|
||||
|
||||
|
||||
## Configuration
|
||||
|
||||
Configuration in `menuconfig`.
|
||||
|
||||
Selection Board Type `Xiaozhi Assistant --> Board Type`
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-4B
|
||||
@ -1,47 +0,0 @@
|
||||
#ifndef _BOARD_CONFIG_H_
|
||||
#define _BOARD_CONFIG_H_
|
||||
|
||||
#include <driver/gpio.h>
|
||||
|
||||
#define AUDIO_INPUT_SAMPLE_RATE 24000
|
||||
#define AUDIO_OUTPUT_SAMPLE_RATE 24000
|
||||
|
||||
#define AUDIO_INPUT_REFERENCE true
|
||||
|
||||
#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_13
|
||||
#define AUDIO_I2S_GPIO_WS GPIO_NUM_10
|
||||
#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_12
|
||||
#define AUDIO_I2S_GPIO_DIN GPIO_NUM_11
|
||||
#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_9
|
||||
|
||||
#define AUDIO_CODEC_PA_PIN GPIO_NUM_53
|
||||
#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_7
|
||||
#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_8
|
||||
#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR
|
||||
#define AUDIO_CODEC_ES7210_ADDR ES7210_CODEC_DEFAULT_ADDR
|
||||
|
||||
#define BOOT_BUTTON_GPIO GPIO_NUM_35
|
||||
|
||||
#define DISPLAY_WIDTH 720
|
||||
#define DISPLAY_HEIGHT 720
|
||||
|
||||
#define LCD_BIT_PER_PIXEL (16)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_27
|
||||
|
||||
#define DELAY_TIME_MS (3000)
|
||||
#define LCD_MIPI_DSI_LANE_NUM (2) // 2 data lanes
|
||||
|
||||
#define MIPI_DSI_PHY_PWR_LDO_CHAN (3)
|
||||
#define MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV (2500)
|
||||
|
||||
#define DISPLAY_SWAP_XY false
|
||||
#define DISPLAY_MIRROR_X false
|
||||
#define DISPLAY_MIRROR_Y false
|
||||
|
||||
#define DISPLAY_OFFSET_X 0
|
||||
#define DISPLAY_OFFSET_Y 0
|
||||
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_26
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
|
||||
|
||||
#endif // _BOARD_CONFIG_H_
|
||||
@ -1,16 +0,0 @@
|
||||
{
|
||||
"target": "esp32p4",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-p4-wifi6-touch-lcd-4b",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,228 +0,0 @@
|
||||
#include "wifi_board.h"
|
||||
#include "codecs/box_audio_codec.h"
|
||||
#include "application.h"
|
||||
#include "display/lcd_display.h"
|
||||
// #include "display/no_display.h"
|
||||
#include "button.h"
|
||||
#include "config.h"
|
||||
|
||||
#include "esp_video.h"
|
||||
#include "esp_video_init.h"
|
||||
#include "esp_cam_sensor_xclk.h"
|
||||
|
||||
#include "esp_lcd_panel_ops.h"
|
||||
#include "esp_lcd_mipi_dsi.h"
|
||||
#include "esp_ldo_regulator.h"
|
||||
|
||||
#include "esp_lcd_st7703.h"
|
||||
|
||||
#include <esp_log.h>
|
||||
#include <driver/i2c_master.h>
|
||||
#include <esp_lvgl_port.h>
|
||||
#include "esp_lcd_touch_gt911.h"
|
||||
#define TAG "WaveshareEsp32p44b"
|
||||
|
||||
class WaveshareEsp32p44b : public WifiBoard {
|
||||
private:
|
||||
i2c_master_bus_handle_t i2c_bus_;
|
||||
Button boot_button_;
|
||||
LcdDisplay *display_;
|
||||
EspVideo* camera_ = nullptr;
|
||||
|
||||
void InitializeCodecI2c() {
|
||||
// Initialize I2C peripheral
|
||||
i2c_master_bus_config_t i2c_bus_cfg = {
|
||||
.i2c_port = I2C_NUM_1,
|
||||
.sda_io_num = AUDIO_CODEC_I2C_SDA_PIN,
|
||||
.scl_io_num = AUDIO_CODEC_I2C_SCL_PIN,
|
||||
.clk_source = I2C_CLK_SRC_DEFAULT,
|
||||
.glitch_ignore_cnt = 7,
|
||||
.intr_priority = 0,
|
||||
.trans_queue_depth = 0,
|
||||
.flags = {
|
||||
.enable_internal_pullup = 1,
|
||||
},
|
||||
};
|
||||
ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_));
|
||||
}
|
||||
|
||||
static esp_err_t bsp_enable_dsi_phy_power(void) {
|
||||
#if MIPI_DSI_PHY_PWR_LDO_CHAN > 0
|
||||
// Turn on the power for MIPI DSI PHY, so it can go from "No Power" state to "Shutdown" state
|
||||
static esp_ldo_channel_handle_t phy_pwr_chan = NULL;
|
||||
esp_ldo_channel_config_t ldo_cfg = {
|
||||
.chan_id = MIPI_DSI_PHY_PWR_LDO_CHAN,
|
||||
.voltage_mv = MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV,
|
||||
};
|
||||
esp_ldo_acquire_channel(&ldo_cfg, &phy_pwr_chan);
|
||||
ESP_LOGI(TAG, "MIPI DSI PHY Powered on");
|
||||
#endif // BSP_MIPI_DSI_PHY_PWR_LDO_CHAN > 0
|
||||
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
void InitializeLCD() {
|
||||
bsp_enable_dsi_phy_power();
|
||||
esp_lcd_panel_io_handle_t io = NULL;
|
||||
esp_lcd_panel_handle_t disp_panel = NULL;
|
||||
|
||||
esp_lcd_dsi_bus_handle_t mipi_dsi_bus = NULL;
|
||||
esp_lcd_dsi_bus_config_t bus_config = {
|
||||
.bus_id = 0,
|
||||
.num_data_lanes = 2,
|
||||
.lane_bit_rate_mbps = 480,
|
||||
};
|
||||
esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus);
|
||||
|
||||
ESP_LOGI(TAG, "Install MIPI DSI LCD control panel");
|
||||
// we use DBI interface to send LCD commands and parameters
|
||||
esp_lcd_dbi_io_config_t dbi_config = ST7703_PANEL_IO_DBI_CONFIG();
|
||||
esp_lcd_new_panel_io_dbi(mipi_dsi_bus, &dbi_config, &io);
|
||||
|
||||
esp_lcd_dpi_panel_config_t dpi_config = {
|
||||
.dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT,
|
||||
.dpi_clock_freq_mhz = 46,
|
||||
.pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
|
||||
.num_fbs = 1,
|
||||
.video_timing = {
|
||||
.h_size = 720,
|
||||
.v_size = 720,
|
||||
.hsync_pulse_width = 20,
|
||||
.hsync_back_porch = 80,
|
||||
.hsync_front_porch = 80,
|
||||
.vsync_pulse_width = 4,
|
||||
.vsync_back_porch = 12,
|
||||
.vsync_front_porch = 30,
|
||||
},
|
||||
.flags = {
|
||||
.use_dma2d = true,
|
||||
},
|
||||
};
|
||||
st7703_vendor_config_t vendor_config = {
|
||||
|
||||
.mipi_config = {
|
||||
.dsi_bus = mipi_dsi_bus,
|
||||
.dpi_config = &dpi_config,
|
||||
},
|
||||
.flags = {
|
||||
.use_mipi_interface = 1,
|
||||
},
|
||||
};
|
||||
|
||||
const esp_lcd_panel_dev_config_t lcd_dev_config = {
|
||||
.reset_gpio_num = PIN_NUM_LCD_RST,
|
||||
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
|
||||
.bits_per_pixel = 16,
|
||||
.vendor_config = &vendor_config,
|
||||
};
|
||||
esp_lcd_new_panel_st7703(io, &lcd_dev_config, &disp_panel);
|
||||
esp_lcd_panel_reset(disp_panel);
|
||||
esp_lcd_panel_init(disp_panel);
|
||||
|
||||
display_ = new MipiLcdDisplay(io, disp_panel, DISPLAY_WIDTH, DISPLAY_HEIGHT,
|
||||
DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
|
||||
}
|
||||
void InitializeTouch()
|
||||
{
|
||||
esp_lcd_touch_handle_t tp;
|
||||
esp_lcd_touch_config_t tp_cfg = {
|
||||
.x_max = DISPLAY_WIDTH,
|
||||
.y_max = DISPLAY_HEIGHT,
|
||||
.rst_gpio_num = GPIO_NUM_23,
|
||||
.int_gpio_num = GPIO_NUM_NC,
|
||||
.levels = {
|
||||
.reset = 0,
|
||||
.interrupt = 0,
|
||||
},
|
||||
.flags = {
|
||||
.swap_xy = 0,
|
||||
.mirror_x = 0,
|
||||
.mirror_y = 0,
|
||||
},
|
||||
};
|
||||
esp_lcd_panel_io_handle_t tp_io_handle = NULL;
|
||||
esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG();
|
||||
tp_io_config.scl_speed_hz = 400 * 1000;
|
||||
ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle));
|
||||
ESP_LOGI(TAG, "Initialize touch controller");
|
||||
ESP_ERROR_CHECK(esp_lcd_touch_new_i2c_gt911(tp_io_handle, &tp_cfg, &tp));
|
||||
const lvgl_port_touch_cfg_t touch_cfg = {
|
||||
.disp = lv_display_get_default(),
|
||||
.handle = tp,
|
||||
};
|
||||
lvgl_port_add_touch(&touch_cfg);
|
||||
ESP_LOGI(TAG, "Touch panel initialized successfully");
|
||||
}
|
||||
void InitializeCamera() {
|
||||
esp_video_init_csi_config_t base_csi_config = {
|
||||
.sccb_config = {
|
||||
.init_sccb = false,
|
||||
.i2c_handle = i2c_bus_,
|
||||
.freq = 400000,
|
||||
},
|
||||
.reset_pin = GPIO_NUM_NC,
|
||||
.pwdn_pin = GPIO_NUM_NC,
|
||||
};
|
||||
|
||||
esp_video_init_config_t cam_config = {
|
||||
.csi = &base_csi_config,
|
||||
};
|
||||
|
||||
camera_ = new EspVideo(cam_config);
|
||||
}
|
||||
void InitializeButtons() {
|
||||
boot_button_.OnClick([this]() {
|
||||
auto& app = Application::GetInstance();
|
||||
// During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
|
||||
if (app.GetDeviceState() == kDeviceStateStarting) {
|
||||
EnterWifiConfigMode();
|
||||
return;
|
||||
}
|
||||
app.ToggleChatState();
|
||||
});
|
||||
}
|
||||
|
||||
public:
|
||||
WaveshareEsp32p44b() :
|
||||
boot_button_(BOOT_BUTTON_GPIO) {
|
||||
InitializeCodecI2c();
|
||||
InitializeLCD();
|
||||
InitializeTouch();
|
||||
InitializeCamera();
|
||||
InitializeButtons();
|
||||
GetBacklight()->RestoreBrightness();
|
||||
}
|
||||
|
||||
virtual AudioCodec* GetAudioCodec() override {
|
||||
static BoxAudioCodec audio_codec(
|
||||
i2c_bus_,
|
||||
AUDIO_INPUT_SAMPLE_RATE,
|
||||
AUDIO_OUTPUT_SAMPLE_RATE,
|
||||
AUDIO_I2S_GPIO_MCLK,
|
||||
AUDIO_I2S_GPIO_BCLK,
|
||||
AUDIO_I2S_GPIO_WS,
|
||||
AUDIO_I2S_GPIO_DOUT,
|
||||
AUDIO_I2S_GPIO_DIN,
|
||||
AUDIO_CODEC_PA_PIN,
|
||||
AUDIO_CODEC_ES8311_ADDR,
|
||||
AUDIO_CODEC_ES7210_ADDR,
|
||||
AUDIO_INPUT_REFERENCE);
|
||||
return &audio_codec;
|
||||
}
|
||||
|
||||
virtual Display *GetDisplay() override {
|
||||
return display_;
|
||||
}
|
||||
|
||||
virtual Camera* GetCamera() override {
|
||||
return camera_;
|
||||
}
|
||||
|
||||
virtual Backlight* GetBacklight() override {
|
||||
static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
|
||||
return &backlight;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
DECLARE_BOARD(WaveshareEsp32p44b);
|
||||
@ -1,12 +0,0 @@
|
||||
# Waveshare ESP32-P4-WIFI6-Touch-LCD-7B
|
||||
|
||||
|
||||
[ESP32-P4-WIFI6-Touch-LCD-7B](https://www.waveshare.com/esp32-p4-wifi6-touch-lcd-7b.htm) is waveshare electronics designed an intelligent 86 box based on ESP32-P4 module equipped with a 1024*600 IPS capacitive touch screen
|
||||
|
||||
|
||||
## Configuration
|
||||
|
||||
Configuration in `menuconfig`.
|
||||
|
||||
Selection Board Type `Xiaozhi Assistant --> Board Type`
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-7B
|
||||
@ -1,47 +0,0 @@
|
||||
#ifndef _BOARD_CONFIG_H_
|
||||
#define _BOARD_CONFIG_H_
|
||||
|
||||
#include <driver/gpio.h>
|
||||
|
||||
#define AUDIO_INPUT_SAMPLE_RATE 24000
|
||||
#define AUDIO_OUTPUT_SAMPLE_RATE 24000
|
||||
|
||||
#define AUDIO_INPUT_REFERENCE true
|
||||
|
||||
#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_13
|
||||
#define AUDIO_I2S_GPIO_WS GPIO_NUM_10
|
||||
#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_12
|
||||
#define AUDIO_I2S_GPIO_DIN GPIO_NUM_11
|
||||
#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_9
|
||||
|
||||
#define AUDIO_CODEC_PA_PIN GPIO_NUM_53
|
||||
#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_7
|
||||
#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_8
|
||||
#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR
|
||||
#define AUDIO_CODEC_ES7210_ADDR ES7210_CODEC_DEFAULT_ADDR
|
||||
|
||||
#define BOOT_BUTTON_GPIO GPIO_NUM_35
|
||||
|
||||
#define DISPLAY_WIDTH 1024
|
||||
#define DISPLAY_HEIGHT 600
|
||||
|
||||
#define LCD_BIT_PER_PIXEL (16)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_33
|
||||
|
||||
#define DELAY_TIME_MS (3000)
|
||||
#define LCD_MIPI_DSI_LANE_NUM (2) // 2 data lanes
|
||||
|
||||
#define MIPI_DSI_PHY_PWR_LDO_CHAN (3)
|
||||
#define MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV (2500)
|
||||
|
||||
#define DISPLAY_SWAP_XY false
|
||||
#define DISPLAY_MIRROR_X false
|
||||
#define DISPLAY_MIRROR_Y false
|
||||
|
||||
#define DISPLAY_OFFSET_X 0
|
||||
#define DISPLAY_OFFSET_Y 0
|
||||
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_32
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
|
||||
|
||||
#endif // _BOARD_CONFIG_H_
|
||||
@ -1,16 +0,0 @@
|
||||
{
|
||||
"target": "esp32p4",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-p4-wifi6-touch-lcd-7b",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
# Waveshare ESP32-P4-WIFI6-Touch-LCD-XC
|
||||
|
||||
|
||||
[ESP32-P4-WIFI6-Touch-LCD-XC](https://www.waveshare.com/esp32-p4-wifi6-touch-lcd-3.4c.htm) is waveshare electronics designed a 3.4-inch, 4-inch circular screen, highly integrated development board
|
||||
|
||||
|
||||
## Configuration
|
||||
|
||||
Configuration in `menuconfig`.
|
||||
|
||||
Selection Board Type `Xiaozhi Assistant --> Board Type`
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-3.4C or ESP32-P4-WIFI6-Touch-LCD-4C
|
||||
|
||||
Selection Display LCD Type `Xiaozhi Assistant --> LCD Type`
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-3.4C with 800*800 3.4inch round display
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-4C with 720*720 4inch round display
|
||||
|
||||
|
||||
|
||||
| [ESP32-P4-WIFI6-Touch-LCD-3.4C](https://www.waveshare.com/esp32-p4-wifi6-touch-lcd-3.4c.htm) | [ESP32-P4-WIFI6-Touch-LCD-4C](https://www.waveshare.com/esp32-p4-wifi6-touch-lcd-4c.htm) |
|
||||
|----------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------|
|
||||
| <img style="width: 150px; height: auto; display: block; margin: 0 auto;" src= "https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/e/s/esp32-p4-wifi6-touch-lcd-3.4c-1.jpg"> | <img style="width: 150px; height: auto; display: block; margin: 0 auto;" src= "https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/e/s/esp32-p4-wifi6-touch-lcd-4c-1.jpg"> |
|
||||
@ -1,490 +0,0 @@
|
||||
#ifndef _BOARD_CONFIG_H_
|
||||
#define _BOARD_CONFIG_H_
|
||||
|
||||
#include <driver/gpio.h>
|
||||
|
||||
#define AUDIO_INPUT_SAMPLE_RATE 24000
|
||||
#define AUDIO_OUTPUT_SAMPLE_RATE 24000
|
||||
|
||||
#define AUDIO_INPUT_REFERENCE true
|
||||
|
||||
#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_13
|
||||
#define AUDIO_I2S_GPIO_WS GPIO_NUM_10
|
||||
#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_12
|
||||
#define AUDIO_I2S_GPIO_DIN GPIO_NUM_11
|
||||
#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_9
|
||||
|
||||
#define AUDIO_CODEC_PA_PIN GPIO_NUM_53
|
||||
#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_7
|
||||
#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_8
|
||||
#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR
|
||||
#define AUDIO_CODEC_ES7210_ADDR ES7210_CODEC_DEFAULT_ADDR
|
||||
|
||||
#define BOOT_BUTTON_GPIO GPIO_NUM_35
|
||||
|
||||
#define LCD_BIT_PER_PIXEL (16)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_27
|
||||
|
||||
#define DELAY_TIME_MS (3000)
|
||||
#define LCD_MIPI_DSI_LANE_NUM (2) // 2 data lanes
|
||||
|
||||
#define MIPI_DSI_PHY_PWR_LDO_CHAN (3)
|
||||
#define MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV (2500)
|
||||
|
||||
#define DISPLAY_SWAP_XY false
|
||||
#define DISPLAY_MIRROR_X false
|
||||
#define DISPLAY_MIRROR_Y false
|
||||
|
||||
#define DISPLAY_OFFSET_X 0
|
||||
#define DISPLAY_OFFSET_Y 0
|
||||
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_26
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
|
||||
|
||||
#if CONFIG_LCD_TYPE_800_800_3_4_INCH
|
||||
#define DISPLAY_WIDTH 800
|
||||
#define DISPLAY_HEIGHT 800
|
||||
|
||||
static const jd9365_lcd_init_cmd_t lcd_init_cmds[] = {
|
||||
{0xE0, (uint8_t[]){0x00}, 1, 0},
|
||||
|
||||
{0xE1, (uint8_t[]){0x93}, 1, 0},
|
||||
{0xE2, (uint8_t[]){0x65}, 1, 0},
|
||||
{0xE3, (uint8_t[]){0xF8}, 1, 0},
|
||||
{0x80, (uint8_t[]){0x01}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x01}, 1, 0},
|
||||
|
||||
{0x00, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x01, (uint8_t[]){0x41}, 1, 0},
|
||||
{0x03, (uint8_t[]){0x10}, 1, 0},
|
||||
{0x04, (uint8_t[]){0x44}, 1, 0},
|
||||
|
||||
{0x17, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x18, (uint8_t[]){0xD0}, 1, 0},
|
||||
{0x19, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x1A, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x1B, (uint8_t[]){0xD0}, 1, 0},
|
||||
{0x1C, (uint8_t[]){0x00}, 1, 0},
|
||||
|
||||
{0x24, (uint8_t[]){0xFE}, 1, 0},
|
||||
{0x35, (uint8_t[]){0x26}, 1, 0},
|
||||
|
||||
{0x37, (uint8_t[]){0x09}, 1, 0},
|
||||
|
||||
{0x38, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x39, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x3A, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x3C, (uint8_t[]){0x78}, 1, 0},
|
||||
{0x3D, (uint8_t[]){0xFF}, 1, 0},
|
||||
{0x3E, (uint8_t[]){0xFF}, 1, 0},
|
||||
{0x3F, (uint8_t[]){0xFF}, 1, 0},
|
||||
|
||||
{0x40, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x41, (uint8_t[]){0x64}, 1, 0},
|
||||
{0x42, (uint8_t[]){0xC7}, 1, 0},
|
||||
{0x43, (uint8_t[]){0x18}, 1, 0},
|
||||
{0x44, (uint8_t[]){0x0B}, 1, 0},
|
||||
{0x45, (uint8_t[]){0x14}, 1, 0},
|
||||
|
||||
{0x55, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x57, (uint8_t[]){0x49}, 1, 0},
|
||||
{0x59, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x5A, (uint8_t[]){0x1B}, 1, 0},
|
||||
{0x5B, (uint8_t[]){0x19}, 1, 0},
|
||||
|
||||
{0x5D, (uint8_t[]){0x7F}, 1, 0},
|
||||
{0x5E, (uint8_t[]){0x56}, 1, 0},
|
||||
{0x5F, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x60, (uint8_t[]){0x37}, 1, 0},
|
||||
{0x61, (uint8_t[]){0x33}, 1, 0},
|
||||
{0x62, (uint8_t[]){0x25}, 1, 0},
|
||||
{0x63, (uint8_t[]){0x2A}, 1, 0},
|
||||
{0x64, (uint8_t[]){0x16}, 1, 0},
|
||||
{0x65, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x66, (uint8_t[]){0x2F}, 1, 0},
|
||||
{0x67, (uint8_t[]){0x32}, 1, 0},
|
||||
{0x68, (uint8_t[]){0x53}, 1, 0},
|
||||
{0x69, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x6A, (uint8_t[]){0x4C}, 1, 0},
|
||||
{0x6B, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x6C, (uint8_t[]){0x3D}, 1, 0},
|
||||
{0x6D, (uint8_t[]){0x31}, 1, 0},
|
||||
{0x6E, (uint8_t[]){0x20}, 1, 0},
|
||||
{0x6F, (uint8_t[]){0x0F}, 1, 0},
|
||||
|
||||
{0x70, (uint8_t[]){0x7F}, 1, 0},
|
||||
{0x71, (uint8_t[]){0x56}, 1, 0},
|
||||
{0x72, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x73, (uint8_t[]){0x37}, 1, 0},
|
||||
{0x74, (uint8_t[]){0x33}, 1, 0},
|
||||
{0x75, (uint8_t[]){0x25}, 1, 0},
|
||||
{0x76, (uint8_t[]){0x2A}, 1, 0},
|
||||
{0x77, (uint8_t[]){0x16}, 1, 0},
|
||||
{0x78, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x79, (uint8_t[]){0x2F}, 1, 0},
|
||||
{0x7A, (uint8_t[]){0x32}, 1, 0},
|
||||
{0x7B, (uint8_t[]){0x53}, 1, 0},
|
||||
{0x7C, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x7D, (uint8_t[]){0x4C}, 1, 0},
|
||||
{0x7E, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x7F, (uint8_t[]){0x3D}, 1, 0},
|
||||
{0x80, (uint8_t[]){0x31}, 1, 0},
|
||||
{0x81, (uint8_t[]){0x20}, 1, 0},
|
||||
{0x82, (uint8_t[]){0x0F}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x00, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x01, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x02, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x03, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x04, (uint8_t[]){0x50}, 1, 0},
|
||||
{0x05, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x06, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x07, (uint8_t[]){0x4A}, 1, 0},
|
||||
{0x08, (uint8_t[]){0x4A}, 1, 0},
|
||||
{0x09, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x0A, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x0B, (uint8_t[]){0x46}, 1, 0},
|
||||
{0x0C, (uint8_t[]){0x46}, 1, 0},
|
||||
{0x0D, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x0E, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x0F, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x10, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x11, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x12, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x13, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x14, (uint8_t[]){0x42}, 1, 0},
|
||||
{0x15, (uint8_t[]){0x5F}, 1, 0},
|
||||
|
||||
{0x16, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x17, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x18, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x19, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x1A, (uint8_t[]){0x50}, 1, 0},
|
||||
{0x1B, (uint8_t[]){0x49}, 1, 0},
|
||||
{0x1C, (uint8_t[]){0x49}, 1, 0},
|
||||
{0x1D, (uint8_t[]){0x4B}, 1, 0},
|
||||
{0x1E, (uint8_t[]){0x4B}, 1, 0},
|
||||
{0x1F, (uint8_t[]){0x45}, 1, 0},
|
||||
{0x20, (uint8_t[]){0x45}, 1, 0},
|
||||
{0x21, (uint8_t[]){0x47}, 1, 0},
|
||||
{0x22, (uint8_t[]){0x47}, 1, 0},
|
||||
{0x23, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x24, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x25, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x26, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x27, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x28, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x29, (uint8_t[]){0x41}, 1, 0},
|
||||
{0x2A, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x2B, (uint8_t[]){0x5F}, 1, 0},
|
||||
|
||||
{0x2C, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x2D, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x2E, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x2F, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x30, (uint8_t[]){0x10}, 1, 0},
|
||||
{0x31, (uint8_t[]){0x07}, 1, 0},
|
||||
{0x32, (uint8_t[]){0x07}, 1, 0},
|
||||
{0x33, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x34, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x35, (uint8_t[]){0x0B}, 1, 0},
|
||||
{0x36, (uint8_t[]){0x0B}, 1, 0},
|
||||
{0x37, (uint8_t[]){0x09}, 1, 0},
|
||||
{0x38, (uint8_t[]){0x09}, 1, 0},
|
||||
{0x39, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x3A, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x3B, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x3C, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x3D, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x3E, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x3F, (uint8_t[]){0x03}, 1, 0},
|
||||
{0x40, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x41, (uint8_t[]){0x1F}, 1, 0},
|
||||
|
||||
{0x42, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x43, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x44, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x45, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x46, (uint8_t[]){0x10}, 1, 0},
|
||||
{0x47, (uint8_t[]){0x06}, 1, 0},
|
||||
{0x48, (uint8_t[]){0x06}, 1, 0},
|
||||
{0x49, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x4A, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x4B, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x4C, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x4D, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x4E, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x4F, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x50, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x51, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x52, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x53, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x54, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x55, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x56, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x57, (uint8_t[]){0x1F}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x58, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x59, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x5A, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x5B, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x5C, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x5D, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x5E, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x5F, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x60, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x61, (uint8_t[]){0x03}, 1, 0},
|
||||
{0x62, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x63, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x64, (uint8_t[]){0xA6}, 1, 0},
|
||||
{0x65, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x66, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x67, (uint8_t[]){0x73}, 1, 0},
|
||||
{0x68, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x69, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x6A, (uint8_t[]){0x7F}, 1, 0},
|
||||
{0x6B, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x6C, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x6D, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x6E, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x6F, (uint8_t[]){0x88}, 1, 0},
|
||||
|
||||
{0x75, (uint8_t[]){0xD9}, 1, 0},
|
||||
{0x76, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x77, (uint8_t[]){0x33}, 1, 0},
|
||||
{0x78, (uint8_t[]){0x43}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x00}, 1, 0},
|
||||
|
||||
{0x11, (uint8_t[]){0x00}, 1, 120},
|
||||
|
||||
{0x29, (uint8_t[]){0x00}, 1, 20},
|
||||
{0x35, (uint8_t[]){0x00}, 1, 0},
|
||||
};
|
||||
#else
|
||||
#define DISPLAY_WIDTH 720
|
||||
#define DISPLAY_HEIGHT 720
|
||||
static const jd9365_lcd_init_cmd_t lcd_init_cmds[] = {
|
||||
{0xE0, (uint8_t[]){0x00}, 1, 0},
|
||||
|
||||
{0xE1, (uint8_t[]){0x93}, 1, 0},
|
||||
{0xE2, (uint8_t[]){0x65}, 1, 0},
|
||||
{0xE3, (uint8_t[]){0xF8}, 1, 0},
|
||||
{0x80, (uint8_t[]){0x01}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x01}, 1, 0},
|
||||
|
||||
{0x00, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x01, (uint8_t[]){0x41}, 1, 0},
|
||||
{0x03, (uint8_t[]){0x10}, 1, 0},
|
||||
{0x04, (uint8_t[]){0x44}, 1, 0},
|
||||
|
||||
{0x17, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x18, (uint8_t[]){0xD0}, 1, 0},
|
||||
{0x19, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x1A, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x1B, (uint8_t[]){0xD0}, 1, 0},
|
||||
{0x1C, (uint8_t[]){0x00}, 1, 0},
|
||||
|
||||
{0x24, (uint8_t[]){0xFE}, 1, 0},
|
||||
{0x35, (uint8_t[]){0x26}, 1, 0},
|
||||
|
||||
{0x37, (uint8_t[]){0x09}, 1, 0},
|
||||
|
||||
{0x38, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x39, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x3A, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x3C, (uint8_t[]){0x78}, 1, 0},
|
||||
{0x3D, (uint8_t[]){0xFF}, 1, 0},
|
||||
{0x3E, (uint8_t[]){0xFF}, 1, 0},
|
||||
{0x3F, (uint8_t[]){0xFF}, 1, 0},
|
||||
|
||||
{0x40, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x41, (uint8_t[]){0x64}, 1, 0},
|
||||
{0x42, (uint8_t[]){0xC7}, 1, 0},
|
||||
{0x43, (uint8_t[]){0x18}, 1, 0},
|
||||
{0x44, (uint8_t[]){0x0B}, 1, 0},
|
||||
{0x45, (uint8_t[]){0x14}, 1, 0},
|
||||
|
||||
{0x55, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x57, (uint8_t[]){0x49}, 1, 0},
|
||||
{0x59, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x5A, (uint8_t[]){0x1B}, 1, 0},
|
||||
{0x5B, (uint8_t[]){0x19}, 1, 0},
|
||||
|
||||
{0x5D, (uint8_t[]){0x7F}, 1, 0},
|
||||
{0x5E, (uint8_t[]){0x56}, 1, 0},
|
||||
{0x5F, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x60, (uint8_t[]){0x37}, 1, 0},
|
||||
{0x61, (uint8_t[]){0x33}, 1, 0},
|
||||
{0x62, (uint8_t[]){0x25}, 1, 0},
|
||||
{0x63, (uint8_t[]){0x2A}, 1, 0},
|
||||
{0x64, (uint8_t[]){0x16}, 1, 0},
|
||||
{0x65, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x66, (uint8_t[]){0x2F}, 1, 0},
|
||||
{0x67, (uint8_t[]){0x32}, 1, 0},
|
||||
{0x68, (uint8_t[]){0x53}, 1, 0},
|
||||
{0x69, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x6A, (uint8_t[]){0x4C}, 1, 0},
|
||||
{0x6B, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x6C, (uint8_t[]){0x3D}, 1, 0},
|
||||
{0x6D, (uint8_t[]){0x31}, 1, 0},
|
||||
{0x6E, (uint8_t[]){0x20}, 1, 0},
|
||||
{0x6F, (uint8_t[]){0x0F}, 1, 0},
|
||||
|
||||
{0x70, (uint8_t[]){0x7F}, 1, 0},
|
||||
{0x71, (uint8_t[]){0x56}, 1, 0},
|
||||
{0x72, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x73, (uint8_t[]){0x37}, 1, 0},
|
||||
{0x74, (uint8_t[]){0x33}, 1, 0},
|
||||
{0x75, (uint8_t[]){0x25}, 1, 0},
|
||||
{0x76, (uint8_t[]){0x2A}, 1, 0},
|
||||
{0x77, (uint8_t[]){0x16}, 1, 0},
|
||||
{0x78, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x79, (uint8_t[]){0x2F}, 1, 0},
|
||||
{0x7A, (uint8_t[]){0x32}, 1, 0},
|
||||
{0x7B, (uint8_t[]){0x53}, 1, 0},
|
||||
{0x7C, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x7D, (uint8_t[]){0x4C}, 1, 0},
|
||||
{0x7E, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x7F, (uint8_t[]){0x3D}, 1, 0},
|
||||
{0x80, (uint8_t[]){0x31}, 1, 0},
|
||||
{0x81, (uint8_t[]){0x20}, 1, 0},
|
||||
{0x82, (uint8_t[]){0x0F}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x00, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x01, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x02, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x03, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x04, (uint8_t[]){0x50}, 1, 0},
|
||||
{0x05, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x06, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x07, (uint8_t[]){0x4A}, 1, 0},
|
||||
{0x08, (uint8_t[]){0x4A}, 1, 0},
|
||||
{0x09, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x0A, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x0B, (uint8_t[]){0x46}, 1, 0},
|
||||
{0x0C, (uint8_t[]){0x46}, 1, 0},
|
||||
{0x0D, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x0E, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x0F, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x10, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x11, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x12, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x13, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x14, (uint8_t[]){0x42}, 1, 0},
|
||||
{0x15, (uint8_t[]){0x5F}, 1, 0},
|
||||
|
||||
{0x16, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x17, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x18, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x19, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x1A, (uint8_t[]){0x50}, 1, 0},
|
||||
{0x1B, (uint8_t[]){0x49}, 1, 0},
|
||||
{0x1C, (uint8_t[]){0x49}, 1, 0},
|
||||
{0x1D, (uint8_t[]){0x4B}, 1, 0},
|
||||
{0x1E, (uint8_t[]){0x4B}, 1, 0},
|
||||
{0x1F, (uint8_t[]){0x45}, 1, 0},
|
||||
{0x20, (uint8_t[]){0x45}, 1, 0},
|
||||
{0x21, (uint8_t[]){0x47}, 1, 0},
|
||||
{0x22, (uint8_t[]){0x47}, 1, 0},
|
||||
{0x23, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x24, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x25, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x26, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x27, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x28, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x29, (uint8_t[]){0x41}, 1, 0},
|
||||
{0x2A, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x2B, (uint8_t[]){0x5F}, 1, 0},
|
||||
|
||||
{0x2C, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x2D, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x2E, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x2F, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x30, (uint8_t[]){0x10}, 1, 0},
|
||||
{0x31, (uint8_t[]){0x07}, 1, 0},
|
||||
{0x32, (uint8_t[]){0x07}, 1, 0},
|
||||
{0x33, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x34, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x35, (uint8_t[]){0x0B}, 1, 0},
|
||||
{0x36, (uint8_t[]){0x0B}, 1, 0},
|
||||
{0x37, (uint8_t[]){0x09}, 1, 0},
|
||||
{0x38, (uint8_t[]){0x09}, 1, 0},
|
||||
{0x39, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x3A, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x3B, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x3C, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x3D, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x3E, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x3F, (uint8_t[]){0x03}, 1, 0},
|
||||
{0x40, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x41, (uint8_t[]){0x1F}, 1, 0},
|
||||
|
||||
{0x42, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x43, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x44, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x45, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x46, (uint8_t[]){0x10}, 1, 0},
|
||||
{0x47, (uint8_t[]){0x06}, 1, 0},
|
||||
{0x48, (uint8_t[]){0x06}, 1, 0},
|
||||
{0x49, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x4A, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x4B, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x4C, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x4D, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x4E, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x4F, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x50, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x51, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x52, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x53, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x54, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x55, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x56, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x57, (uint8_t[]){0x1F}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x58, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x59, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x5A, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x5B, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x5C, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x5D, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x5E, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x5F, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x60, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x61, (uint8_t[]){0x03}, 1, 0},
|
||||
{0x62, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x63, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x64, (uint8_t[]){0xA6}, 1, 0},
|
||||
{0x65, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x66, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x67, (uint8_t[]){0x73}, 1, 0},
|
||||
{0x68, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x69, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x6A, (uint8_t[]){0x7F}, 1, 0},
|
||||
{0x6B, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x6C, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x6D, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x6E, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x6F, (uint8_t[]){0x88}, 1, 0},
|
||||
|
||||
{0x75, (uint8_t[]){0xD9}, 1, 0},
|
||||
{0x76, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x77, (uint8_t[]){0x33}, 1, 0},
|
||||
{0x78, (uint8_t[]){0x43}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x11, (uint8_t[]){0x00}, 1, 120},
|
||||
|
||||
{0x29, (uint8_t[]){0x00}, 1, 20},
|
||||
{0x35, (uint8_t[]){0x00}, 1, 0},
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif // _BOARD_CONFIG_H_
|
||||
@ -1,29 +0,0 @@
|
||||
{
|
||||
"target": "esp32p4",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-p4-wifi6-touch-lcd-xc-3.4c",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_LCD_TYPE_800_800_3_4_INCH=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "waveshare-p4-wifi6-touch-lcd-xc-4c",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_LCD_TYPE_720_720_4_INCH=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,229 +0,0 @@
|
||||
#include "wifi_board.h"
|
||||
#include "codecs/box_audio_codec.h"
|
||||
#include "application.h"
|
||||
#include "display/lcd_display.h"
|
||||
// #include "display/no_display.h"
|
||||
#include "button.h"
|
||||
|
||||
#include "esp_video.h"
|
||||
#include "esp_video_init.h"
|
||||
#include "esp_cam_sensor_xclk.h"
|
||||
|
||||
#include "esp_lcd_panel_ops.h"
|
||||
#include "esp_lcd_mipi_dsi.h"
|
||||
#include "esp_ldo_regulator.h"
|
||||
|
||||
#include "esp_lcd_jd9365_10_1.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <esp_log.h>
|
||||
#include <driver/i2c_master.h>
|
||||
#include <esp_lvgl_port.h>
|
||||
#include "esp_lcd_touch_gt911.h"
|
||||
#define TAG "WaveshareEsp32p4xc"
|
||||
|
||||
class WaveshareEsp32p4xc : public WifiBoard {
|
||||
private:
|
||||
i2c_master_bus_handle_t i2c_bus_;
|
||||
Button boot_button_;
|
||||
LcdDisplay *display_;
|
||||
EspVideo* camera_ = nullptr;
|
||||
|
||||
void InitializeCodecI2c() {
|
||||
// Initialize I2C peripheral
|
||||
i2c_master_bus_config_t i2c_bus_cfg = {
|
||||
.i2c_port = I2C_NUM_1,
|
||||
.sda_io_num = AUDIO_CODEC_I2C_SDA_PIN,
|
||||
.scl_io_num = AUDIO_CODEC_I2C_SCL_PIN,
|
||||
.clk_source = I2C_CLK_SRC_DEFAULT,
|
||||
.glitch_ignore_cnt = 7,
|
||||
.intr_priority = 0,
|
||||
.trans_queue_depth = 0,
|
||||
.flags = {
|
||||
.enable_internal_pullup = 1,
|
||||
},
|
||||
};
|
||||
ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_));
|
||||
}
|
||||
|
||||
static esp_err_t bsp_enable_dsi_phy_power(void) {
|
||||
#if MIPI_DSI_PHY_PWR_LDO_CHAN > 0
|
||||
// Turn on the power for MIPI DSI PHY, so it can go from "No Power" state to "Shutdown" state
|
||||
static esp_ldo_channel_handle_t phy_pwr_chan = NULL;
|
||||
esp_ldo_channel_config_t ldo_cfg = {
|
||||
.chan_id = MIPI_DSI_PHY_PWR_LDO_CHAN,
|
||||
.voltage_mv = MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV,
|
||||
};
|
||||
esp_ldo_acquire_channel(&ldo_cfg, &phy_pwr_chan);
|
||||
ESP_LOGI(TAG, "MIPI DSI PHY Powered on");
|
||||
#endif // BSP_MIPI_DSI_PHY_PWR_LDO_CHAN > 0
|
||||
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
void InitializeLCD() {
|
||||
bsp_enable_dsi_phy_power();
|
||||
esp_lcd_panel_io_handle_t io = NULL;
|
||||
esp_lcd_panel_handle_t disp_panel = NULL;
|
||||
|
||||
esp_lcd_dsi_bus_handle_t mipi_dsi_bus = NULL;
|
||||
esp_lcd_dsi_bus_config_t bus_config = {
|
||||
.bus_id = 0,
|
||||
.num_data_lanes = 2,
|
||||
.lane_bit_rate_mbps = 1500,
|
||||
};
|
||||
esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus);
|
||||
|
||||
ESP_LOGI(TAG, "Install MIPI DSI LCD control panel");
|
||||
// we use DBI interface to send LCD commands and parameters
|
||||
esp_lcd_dbi_io_config_t dbi_config = JD9365_PANEL_IO_DBI_CONFIG();
|
||||
esp_lcd_new_panel_io_dbi(mipi_dsi_bus, &dbi_config, &io);
|
||||
|
||||
esp_lcd_dpi_panel_config_t dpi_config = {
|
||||
.dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT,
|
||||
.dpi_clock_freq_mhz = 46,
|
||||
.pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
|
||||
.num_fbs = 1,
|
||||
.video_timing = {
|
||||
.h_size = DISPLAY_WIDTH,
|
||||
.v_size = DISPLAY_HEIGHT,
|
||||
.hsync_pulse_width = 20,
|
||||
.hsync_back_porch = 20,
|
||||
.hsync_front_porch = 40,
|
||||
.vsync_pulse_width = 4,
|
||||
.vsync_back_porch = 12,
|
||||
.vsync_front_porch = 24,
|
||||
},
|
||||
.flags = {
|
||||
.use_dma2d = true,
|
||||
},
|
||||
};
|
||||
jd9365_vendor_config_t vendor_config = {
|
||||
.init_cmds = lcd_init_cmds,
|
||||
.init_cmds_size = sizeof(lcd_init_cmds) / sizeof(lcd_init_cmds[0]),
|
||||
.mipi_config = {
|
||||
.dsi_bus = mipi_dsi_bus,
|
||||
.dpi_config = &dpi_config,
|
||||
.lane_num = 2,
|
||||
},
|
||||
.flags = {
|
||||
.use_mipi_interface = 1,
|
||||
},
|
||||
};
|
||||
|
||||
const esp_lcd_panel_dev_config_t lcd_dev_config = {
|
||||
.reset_gpio_num = PIN_NUM_LCD_RST,
|
||||
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
|
||||
.bits_per_pixel = 16,
|
||||
.vendor_config = &vendor_config,
|
||||
};
|
||||
esp_lcd_new_panel_jd9365(io, &lcd_dev_config, &disp_panel);
|
||||
esp_lcd_panel_reset(disp_panel);
|
||||
esp_lcd_panel_init(disp_panel);
|
||||
|
||||
display_ = new MipiLcdDisplay(io, disp_panel, DISPLAY_WIDTH, DISPLAY_HEIGHT,
|
||||
DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
|
||||
}
|
||||
void InitializeTouch()
|
||||
{
|
||||
esp_lcd_touch_handle_t tp;
|
||||
esp_lcd_touch_config_t tp_cfg = {
|
||||
.x_max = DISPLAY_WIDTH,
|
||||
.y_max = DISPLAY_HEIGHT,
|
||||
.rst_gpio_num = GPIO_NUM_23,
|
||||
.int_gpio_num = GPIO_NUM_NC,
|
||||
.levels = {
|
||||
.reset = 0,
|
||||
.interrupt = 0,
|
||||
},
|
||||
.flags = {
|
||||
.swap_xy = 0,
|
||||
.mirror_x = 0,
|
||||
.mirror_y = 0,
|
||||
},
|
||||
};
|
||||
esp_lcd_panel_io_handle_t tp_io_handle = NULL;
|
||||
esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_GT911_CONFIG();
|
||||
tp_io_config.scl_speed_hz = 400 * 1000;
|
||||
ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle));
|
||||
ESP_LOGI(TAG, "Initialize touch controller");
|
||||
ESP_ERROR_CHECK(esp_lcd_touch_new_i2c_gt911(tp_io_handle, &tp_cfg, &tp));
|
||||
const lvgl_port_touch_cfg_t touch_cfg = {
|
||||
.disp = lv_display_get_default(),
|
||||
.handle = tp,
|
||||
};
|
||||
lvgl_port_add_touch(&touch_cfg);
|
||||
ESP_LOGI(TAG, "Touch panel initialized successfully");
|
||||
}
|
||||
void InitializeCamera() {
|
||||
esp_video_init_csi_config_t base_csi_config = {
|
||||
.sccb_config = {
|
||||
.init_sccb = false,
|
||||
.i2c_handle = i2c_bus_,
|
||||
.freq = 400000,
|
||||
},
|
||||
.reset_pin = GPIO_NUM_NC,
|
||||
.pwdn_pin = GPIO_NUM_NC,
|
||||
};
|
||||
|
||||
esp_video_init_config_t cam_config = {
|
||||
.csi = &base_csi_config,
|
||||
};
|
||||
|
||||
camera_ = new EspVideo(cam_config);
|
||||
}
|
||||
void InitializeButtons() {
|
||||
boot_button_.OnClick([this]() {
|
||||
auto& app = Application::GetInstance();
|
||||
// During startup (before connected), pressing BOOT button enters Wi-Fi config mode without reboot
|
||||
if (app.GetDeviceState() == kDeviceStateStarting) {
|
||||
EnterWifiConfigMode();
|
||||
return;
|
||||
}
|
||||
app.ToggleChatState();
|
||||
});
|
||||
}
|
||||
|
||||
public:
|
||||
WaveshareEsp32p4xc() :
|
||||
boot_button_(BOOT_BUTTON_GPIO) {
|
||||
InitializeCodecI2c();
|
||||
InitializeLCD();
|
||||
InitializeTouch();
|
||||
InitializeCamera();
|
||||
InitializeButtons();
|
||||
GetBacklight()->RestoreBrightness();
|
||||
}
|
||||
|
||||
virtual AudioCodec* GetAudioCodec() override {
|
||||
static BoxAudioCodec audio_codec(
|
||||
i2c_bus_,
|
||||
AUDIO_INPUT_SAMPLE_RATE,
|
||||
AUDIO_OUTPUT_SAMPLE_RATE,
|
||||
AUDIO_I2S_GPIO_MCLK,
|
||||
AUDIO_I2S_GPIO_BCLK,
|
||||
AUDIO_I2S_GPIO_WS,
|
||||
AUDIO_I2S_GPIO_DOUT,
|
||||
AUDIO_I2S_GPIO_DIN,
|
||||
AUDIO_CODEC_PA_PIN,
|
||||
AUDIO_CODEC_ES8311_ADDR,
|
||||
AUDIO_CODEC_ES7210_ADDR,
|
||||
AUDIO_INPUT_REFERENCE);
|
||||
return &audio_codec;
|
||||
}
|
||||
|
||||
virtual Display *GetDisplay() override {
|
||||
return display_;
|
||||
}
|
||||
|
||||
virtual Camera* GetCamera() override {
|
||||
return camera_;
|
||||
}
|
||||
|
||||
virtual Backlight* GetBacklight() override {
|
||||
static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
|
||||
return &backlight;
|
||||
}
|
||||
};
|
||||
|
||||
DECLARE_BOARD(WaveshareEsp32p4xc);
|
||||
@ -1,12 +0,0 @@
|
||||
{
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-s3-touch-lcd-3.49",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
{
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-s3-touch-lcd-4b",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32c6",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-c6-touch-amoled-1.8",
|
||||
"name": "esp32-c6-lcd-1.69",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_ESP_WAKE_WORD=y"
|
||||
]
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32c6",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-c6-touch-amoled-1.32",
|
||||
"name": "esp32-c6-touch-amoled-1.32",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_ESP_WAKE_WORD=y"
|
||||
]
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32c6",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-c6-touch-amoled-1.43",
|
||||
"name": "esp32-c6-touch-amoled-1.43",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_ESP_WAKE_WORD=y"
|
||||
]
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32c6",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-c6-lcd-1.69",
|
||||
"name": "esp32-c6-touch-amoled-1.8",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_ESP_WAKE_WORD=y"
|
||||
]
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-c6-touch-amoled-2.06",
|
||||
"name": "esp32-c6-touch-amoled-2.06",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_ESP_WAKE_WORD=y"
|
||||
]
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32c6",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-c6-touch-lcd-1.83",
|
||||
"name": "esp32-c6-touch-lcd-1.83",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y"
|
||||
@ -12,32 +12,32 @@
|
||||
|
||||
| Product ID | Dependency | tested |
|
||||
|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------|--------|
|
||||
| [10.1-DSI-TOUCH-A](https://www.waveshare.com/10.1-dsi-touch-a.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/1/0/10.1-dsi-touch-a-1.jpg"> | [waveshare/esp_lcd_jd9365_10_1](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_jd9365_10_1) | ✅ |
|
||||
| [101M-8001280-IPS-CT-K](https://www.waveshare.com/101m-8001280-ips-ct-k.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/1/0/101m-8001280-ips-ct-k-1.jpg"> | [waveshare/esp_lcd_jd9365_10_1](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_jd9365_10_1) | ✅ |
|
||||
| [10.1-DSI-TOUCH-A](https://www.waveshare.com/10.1-dsi-touch-a.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/1/0/10.1-dsi-touch-a-1.jpg"> | [waveshare/esp_lcd_jd9365_10_1](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_jd9365_10_1) | ✅ |
|
||||
| [101M-8001280-IPS-CT-K](https://www.waveshare.com/101m-8001280-ips-ct-k.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/1/0/101m-8001280-ips-ct-k-1.jpg"> | [waveshare/esp_lcd_jd9365_10_1](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_jd9365_10_1) | ✅ |
|
||||
|
||||
### Common Raspberry adapter screen
|
||||
|
||||
**These displays are supported on [ESP32-P4-NANO BSP](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/bsp/esp32_p4_nano), but not on xiaozhi-esp32**
|
||||
**These displays are supported on [ESP32-P4-NANO BSP](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/bsp/esp32_p4_nano), but not on xiaozhi-esp32**
|
||||
|
||||
<details open>
|
||||
<summary>View full display</summary>
|
||||
|
||||
| Product ID | Dependency | tested |
|
||||
|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------|--------|
|
||||
| [2.8inch DSI LCD](https://www.waveshare.com/2.8inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/thumbnail/122x122/9df78eab33525d08d6e5fb8d27136e95/2/_/2.8inch-dsi-lcd-3.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [3.4inch DSI LCD (C)](https://www.waveshare.com/3.4inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/3/_/3.4inch-dsi-lcd-c-1.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [4inch DSI LCD (C)](https://www.waveshare.com/4inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/4/i/4inch-dsi-lcd-c-1.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [4inch DSI LCD](https://www.waveshare.com/4inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/4/i/4inch-dsi-lcd-1.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [5inch DSI LCD (D)](https://www.waveshare.com/5inch-dsi-lcd-d.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/5/i/5inch-dsi-lcd-d-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [6.25inch DSI LCD](https://www.waveshare.com/6.25inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/6/_/6.25inch-dsi-lcd-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [5inch DSI LCD (C)](https://www.waveshare.com/5inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/5/i/5inch-dsi-lcd-c-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [7inch DSI LCD (C)](https://www.waveshare.com/7inch-dsi-lcd-c-with-case-a.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/7/i/7inch-dsi-lcd-c-4.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [7.9inch DSI LCD](https://www.waveshare.com/7.9inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/7/_/7.9inch-dsi-lcd-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [7inch DSI LCD (E)](https://www.waveshare.com/7inch-dsi-lcd-e.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/7/i/7inch-dsi-lcd-e-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [8inch DSI LCD (C)](https://www.waveshare.com/8inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/8/i/8inch-dsi-lcd-c-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [10.1inch DSI LCD (C)](https://www.waveshare.com/10.1inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/1/0/10.1inch-dsi-lcd-c-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [8.8inch DSI LCD](https://www.waveshare.com/8.8inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/8/_/8.8inch-dsi-lcd-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [11.9inch DSI LCD](https://www.waveshare.com/11.9inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/1/1/11.9inch-dsi-lcd-3.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [7-DSI-TOUCH-A](https://www.waveshare.com/7-dsi-touch-a.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/7/-/7-dsi-touch-a-1.jpg"> | [waveshare/esp_lcd_ili9881c](https://github.com/waveshareteam/Waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_ili9881c) | 🕒 |
|
||||
| [2.8inch DSI LCD](https://www.waveshare.com/2.8inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/thumbnail/122x122/9df78eab33525d08d6e5fb8d27136e95/2/_/2.8inch-dsi-lcd-3.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [3.4inch DSI LCD (C)](https://www.waveshare.com/3.4inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/3/_/3.4inch-dsi-lcd-c-1.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [4inch DSI LCD (C)](https://www.waveshare.com/4inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/4/i/4inch-dsi-lcd-c-1.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [4inch DSI LCD](https://www.waveshare.com/4inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/4/i/4inch-dsi-lcd-1.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [5inch DSI LCD (D)](https://www.waveshare.com/5inch-dsi-lcd-d.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/5/i/5inch-dsi-lcd-d-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [6.25inch DSI LCD](https://www.waveshare.com/6.25inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/6/_/6.25inch-dsi-lcd-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [5inch DSI LCD (C)](https://www.waveshare.com/5inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/5/i/5inch-dsi-lcd-c-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [7inch DSI LCD (C)](https://www.waveshare.com/7inch-dsi-lcd-c-with-case-a.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/7/i/7inch-dsi-lcd-c-4.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [7.9inch DSI LCD](https://www.waveshare.com/7.9inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/7/_/7.9inch-dsi-lcd-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [7inch DSI LCD (E)](https://www.waveshare.com/7inch-dsi-lcd-e.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/7/i/7inch-dsi-lcd-e-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [8inch DSI LCD (C)](https://www.waveshare.com/8inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/8/i/8inch-dsi-lcd-c-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [10.1inch DSI LCD (C)](https://www.waveshare.com/10.1inch-dsi-lcd-c.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/1/0/10.1inch-dsi-lcd-c-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [8.8inch DSI LCD](https://www.waveshare.com/8.8inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/8/_/8.8inch-dsi-lcd-2.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [11.9inch DSI LCD](https://www.waveshare.com/11.9inch-dsi-lcd.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/1/1/11.9inch-dsi-lcd-3.jpg"> | [waveshare/esp_lcd_dsi](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_dsi) | 🕒 |
|
||||
| [7-DSI-TOUCH-A](https://www.waveshare.com/7-dsi-touch-a.htm) <br/><img style="width: 150px; height: auto; display: block; margin: 0 auto;" src="https://www.waveshare.com/media/catalog/product/cache/1/image/800x800/9df78eab33525d08d6e5fb8d27136e95/7/-/7-dsi-touch-a-1.jpg"> | [waveshare/esp_lcd_ili9881c](https://github.com/waveshareteam/waveshare-ESP32-components/tree/master/display/lcd/esp_lcd_ili9881c) | 🕒 |
|
||||
|
||||
</details>
|
||||
@ -1,11 +1,11 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32p4",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-p4-nano-10.1-a",
|
||||
"name": "esp32-p4-nano-10.1-a",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
|
||||
"CONFIG_LCD_TYPE_800_1280_10_1_INCH_A=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
@ -4,7 +4,6 @@
|
||||
#include "display/lcd_display.h"
|
||||
// #include "display/no_display.h"
|
||||
#include "button.h"
|
||||
#include "config.h"
|
||||
|
||||
#include "esp_video.h"
|
||||
#include "esp_video_init.h"
|
||||
@ -15,7 +14,8 @@
|
||||
#include "esp_ldo_regulator.h"
|
||||
|
||||
#include "esp_lcd_mipi_dsi.h"
|
||||
#include "esp_lcd_jd9365_10_1.h"
|
||||
#include "esp_lcd_jd9365.h"
|
||||
#include "config.h"
|
||||
|
||||
#include <esp_log.h>
|
||||
#include <driver/i2c_master.h>
|
||||
@ -33,11 +33,7 @@ protected:
|
||||
|
||||
virtual void SetBrightnessImpl(uint8_t brightness) override {
|
||||
uint8_t i2c_address = 0x45; // 7-bit address
|
||||
#if CONFIG_LCD_TYPE_800_1280_10_1_INCH
|
||||
uint8_t reg = 0x86;
|
||||
#elif CONFIG_LCD_TYPE_800_1280_10_1_INCH_A
|
||||
uint8_t reg = 0x96;
|
||||
#endif
|
||||
uint8_t data[2] = {reg, brightness};
|
||||
|
||||
i2c_master_dev_handle_t dev_handle;
|
||||
@ -105,6 +101,23 @@ private:
|
||||
}
|
||||
|
||||
void InitializeLCD() {
|
||||
uint8_t chip_addr = 0x45;
|
||||
uint8_t write_cmds[4][2] = {{0x95, 0x11}, {0x95, 0x17}, {0x96, 0x00}, {0x96, 0xFF}};
|
||||
i2c_device_config_t i2c_dev_conf = {
|
||||
.dev_addr_length = I2C_ADDR_BIT_LEN_7,
|
||||
.device_address = chip_addr,
|
||||
.scl_speed_hz = 100000,
|
||||
};
|
||||
i2c_master_dev_handle_t dev_handle = NULL;
|
||||
if (i2c_master_bus_add_device(codec_i2c_bus_, &i2c_dev_conf, &dev_handle) == ESP_OK)
|
||||
{
|
||||
for (uint8_t i = 0; i < 4; i++)
|
||||
{
|
||||
i2c_master_transmit(dev_handle, write_cmds[i], 2, 50);
|
||||
}
|
||||
i2c_master_bus_rm_device(dev_handle);
|
||||
}
|
||||
|
||||
bsp_enable_dsi_phy_power();
|
||||
esp_lcd_panel_io_handle_t io = NULL;
|
||||
esp_lcd_panel_handle_t disp_panel = NULL;
|
||||
@ -143,15 +156,13 @@ private:
|
||||
};
|
||||
|
||||
jd9365_vendor_config_t vendor_config = {
|
||||
|
||||
.init_cmds = lcd_init_cmds,
|
||||
.init_cmds_size = sizeof(lcd_init_cmds) / sizeof(lcd_init_cmds[0]),
|
||||
.mipi_config = {
|
||||
.dsi_bus = mipi_dsi_bus,
|
||||
.dpi_config = &dpi_config,
|
||||
.lane_num = 2,
|
||||
},
|
||||
.flags = {
|
||||
.use_mipi_interface = 1,
|
||||
},
|
||||
};
|
||||
|
||||
const esp_lcd_panel_dev_config_t lcd_dev_config = {
|
||||
224
main/boards/waveshare/esp32-p4-nano/lcd_init_cmds.h
Normal file
224
main/boards/waveshare/esp32-p4-nano/lcd_init_cmds.h
Normal file
@ -0,0 +1,224 @@
|
||||
static const jd9365_lcd_init_cmd_t lcd_init_cmds[] = {
|
||||
{0xE0, (uint8_t[]){0x00}, 1, 0},
|
||||
{0xE1, (uint8_t[]){0x93}, 1, 0},
|
||||
{0xE2, (uint8_t[]){0x65}, 1, 0},
|
||||
{0xE3, (uint8_t[]){0xF8}, 1, 0},
|
||||
{0x80, (uint8_t[]){0x01}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x00, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x01, (uint8_t[]){0x38}, 1, 0},
|
||||
{0x03, (uint8_t[]){0x10}, 1, 0},
|
||||
{0x04, (uint8_t[]){0x38}, 1, 0},
|
||||
|
||||
{0x0C, (uint8_t[]){0x74}, 1, 0},
|
||||
|
||||
{0x17, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x18, (uint8_t[]){0xAF}, 1, 0},
|
||||
{0x19, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x1A, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x1B, (uint8_t[]){0xAF}, 1, 0},
|
||||
{0x1C, (uint8_t[]){0x00}, 1, 0},
|
||||
|
||||
{0x35, (uint8_t[]){0x26}, 1, 0},
|
||||
|
||||
{0x37, (uint8_t[]){0x09}, 1, 0},
|
||||
|
||||
{0x38, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x39, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x3A, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x3C, (uint8_t[]){0x78}, 1, 0},
|
||||
{0x3D, (uint8_t[]){0xFF}, 1, 0},
|
||||
{0x3E, (uint8_t[]){0xFF}, 1, 0},
|
||||
{0x3F, (uint8_t[]){0x7F}, 1, 0},
|
||||
|
||||
{0x40, (uint8_t[]){0x06}, 1, 0},
|
||||
{0x41, (uint8_t[]){0xA0}, 1, 0},
|
||||
{0x42, (uint8_t[]){0x81}, 1, 0},
|
||||
{0x43, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x44, (uint8_t[]){0x0D}, 1, 0},
|
||||
{0x45, (uint8_t[]){0x28}, 1, 0},
|
||||
//{0x4A, (uint8_t[]){0x35}, 1, 0},//bist
|
||||
|
||||
{0x55, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x57, (uint8_t[]){0x69}, 1, 0},
|
||||
{0x59, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x5A, (uint8_t[]){0x2A}, 1, 0},
|
||||
{0x5B, (uint8_t[]){0x17}, 1, 0},
|
||||
|
||||
{0x5D, (uint8_t[]){0x7F}, 1, 0},
|
||||
{0x5E, (uint8_t[]){0x6A}, 1, 0},
|
||||
{0x5F, (uint8_t[]){0x5B}, 1, 0},
|
||||
{0x60, (uint8_t[]){0x4F}, 1, 0},
|
||||
{0x61, (uint8_t[]){0x4A}, 1, 0},
|
||||
{0x62, (uint8_t[]){0x3D}, 1, 0},
|
||||
{0x63, (uint8_t[]){0x41}, 1, 0},
|
||||
{0x64, (uint8_t[]){0x2A}, 1, 0},
|
||||
{0x65, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x66, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x67, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x68, (uint8_t[]){0x62}, 1, 0},
|
||||
{0x69, (uint8_t[]){0x52}, 1, 0},
|
||||
{0x6A, (uint8_t[]){0x59}, 1, 0},
|
||||
{0x6B, (uint8_t[]){0x4C}, 1, 0},
|
||||
{0x6C, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x6D, (uint8_t[]){0x3A}, 1, 0},
|
||||
{0x6E, (uint8_t[]){0x26}, 1, 0},
|
||||
{0x6F, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x70, (uint8_t[]){0x7F}, 1, 0},
|
||||
{0x71, (uint8_t[]){0x6A}, 1, 0},
|
||||
{0x72, (uint8_t[]){0x5B}, 1, 0},
|
||||
{0x73, (uint8_t[]){0x4F}, 1, 0},
|
||||
{0x74, (uint8_t[]){0x4A}, 1, 0},
|
||||
{0x75, (uint8_t[]){0x3D}, 1, 0},
|
||||
{0x76, (uint8_t[]){0x41}, 1, 0},
|
||||
{0x77, (uint8_t[]){0x2A}, 1, 0},
|
||||
{0x78, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x79, (uint8_t[]){0x43}, 1, 0},
|
||||
{0x7A, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x7B, (uint8_t[]){0x62}, 1, 0},
|
||||
{0x7C, (uint8_t[]){0x52}, 1, 0},
|
||||
{0x7D, (uint8_t[]){0x59}, 1, 0},
|
||||
{0x7E, (uint8_t[]){0x4C}, 1, 0},
|
||||
{0x7F, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x80, (uint8_t[]){0x3A}, 1, 0},
|
||||
{0x81, (uint8_t[]){0x26}, 1, 0},
|
||||
{0x82, (uint8_t[]){0x00}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x00, (uint8_t[]){0x42}, 1, 0},
|
||||
{0x01, (uint8_t[]){0x42}, 1, 0},
|
||||
{0x02, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x03, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x04, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x05, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x06, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x07, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x08, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x09, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x0A, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x0B, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x0C, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x0D, (uint8_t[]){0x47}, 1, 0},
|
||||
{0x0E, (uint8_t[]){0x47}, 1, 0},
|
||||
{0x0F, (uint8_t[]){0x45}, 1, 0},
|
||||
{0x10, (uint8_t[]){0x45}, 1, 0},
|
||||
{0x11, (uint8_t[]){0x4B}, 1, 0},
|
||||
{0x12, (uint8_t[]){0x4B}, 1, 0},
|
||||
{0x13, (uint8_t[]){0x49}, 1, 0},
|
||||
{0x14, (uint8_t[]){0x49}, 1, 0},
|
||||
{0x15, (uint8_t[]){0x5F}, 1, 0},
|
||||
|
||||
{0x16, (uint8_t[]){0x41}, 1, 0},
|
||||
{0x17, (uint8_t[]){0x41}, 1, 0},
|
||||
{0x18, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x19, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x1A, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x1B, (uint8_t[]){0x5E}, 1, 0},
|
||||
{0x1C, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x1D, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x1E, (uint8_t[]){0x5F}, 1, 0},
|
||||
{0x1F, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x20, (uint8_t[]){0x57}, 1, 0},
|
||||
{0x21, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x22, (uint8_t[]){0x77}, 1, 0},
|
||||
{0x23, (uint8_t[]){0x46}, 1, 0},
|
||||
{0x24, (uint8_t[]){0x46}, 1, 0},
|
||||
{0x25, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x26, (uint8_t[]){0x44}, 1, 0},
|
||||
{0x27, (uint8_t[]){0x4A}, 1, 0},
|
||||
{0x28, (uint8_t[]){0x4A}, 1, 0},
|
||||
{0x29, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x2A, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x2B, (uint8_t[]){0x5F}, 1, 0},
|
||||
|
||||
{0x2C, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x2D, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x2E, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x2F, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x30, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x31, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x32, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x33, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x34, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x35, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x36, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x37, (uint8_t[]){0x37}, 1, 0},
|
||||
{0x38, (uint8_t[]){0x37}, 1, 0},
|
||||
{0x39, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x3A, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x3B, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x3C, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x3D, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x3E, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x3F, (uint8_t[]){0x06}, 1, 0},
|
||||
{0x40, (uint8_t[]){0x06}, 1, 0},
|
||||
{0x41, (uint8_t[]){0x1F}, 1, 0},
|
||||
|
||||
{0x42, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x43, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x44, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x45, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x46, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x47, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x48, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x49, (uint8_t[]){0x1E}, 1, 0},
|
||||
{0x4A, (uint8_t[]){0x1F}, 1, 0},
|
||||
{0x4B, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x4C, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x4D, (uint8_t[]){0x37}, 1, 0},
|
||||
{0x4E, (uint8_t[]){0x37}, 1, 0},
|
||||
{0x4F, (uint8_t[]){0x09}, 1, 0},
|
||||
{0x50, (uint8_t[]){0x09}, 1, 0},
|
||||
{0x51, (uint8_t[]){0x0B}, 1, 0},
|
||||
{0x52, (uint8_t[]){0x0B}, 1, 0},
|
||||
{0x53, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x54, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x55, (uint8_t[]){0x07}, 1, 0},
|
||||
{0x56, (uint8_t[]){0x07}, 1, 0},
|
||||
{0x57, (uint8_t[]){0x1F}, 1, 0},
|
||||
|
||||
{0x58, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x5B, (uint8_t[]){0x30}, 1, 0},
|
||||
{0x5C, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x5D, (uint8_t[]){0x34}, 1, 0},
|
||||
{0x5E, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x5F, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x63, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x64, (uint8_t[]){0x6A}, 1, 0},
|
||||
{0x67, (uint8_t[]){0x73}, 1, 0},
|
||||
{0x68, (uint8_t[]){0x07}, 1, 0},
|
||||
{0x69, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x6A, (uint8_t[]){0x6A}, 1, 0},
|
||||
{0x6B, (uint8_t[]){0x08}, 1, 0},
|
||||
|
||||
{0x6C, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x6D, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x6E, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x6F, (uint8_t[]){0x88}, 1, 0},
|
||||
|
||||
{0x75, (uint8_t[]){0xFF}, 1, 0},
|
||||
{0x77, (uint8_t[]){0xDD}, 1, 0},
|
||||
{0x78, (uint8_t[]){0x2C}, 1, 0},
|
||||
{0x79, (uint8_t[]){0x15}, 1, 0},
|
||||
{0x7A, (uint8_t[]){0x17}, 1, 0},
|
||||
{0x7D, (uint8_t[]){0x14}, 1, 0},
|
||||
{0x7E, (uint8_t[]){0x82}, 1, 0},
|
||||
|
||||
{0xE0, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x00, (uint8_t[]){0x0E}, 1, 0},
|
||||
{0x02, (uint8_t[]){0xB3}, 1, 0},
|
||||
{0x09, (uint8_t[]){0x61}, 1, 0},
|
||||
{0x0E, (uint8_t[]){0x48}, 1, 0},
|
||||
{0x37, (uint8_t[]){0x58}, 1, 0}, // 全志
|
||||
{0x2B, (uint8_t[]){0x0F}, 1, 0}, // 全志
|
||||
|
||||
{0xE0, (uint8_t[]){0x00}, 1, 0},
|
||||
|
||||
{0xE6, (uint8_t[]){0x02}, 1, 0},
|
||||
{0xE7, (uint8_t[]){0x0C}, 1, 0},
|
||||
|
||||
{0x11, (uint8_t[]){0x00}, 1, 120},
|
||||
|
||||
{0x29, (uint8_t[]){0x00}, 1, 20},
|
||||
};
|
||||
17
main/boards/waveshare/esp32-p4-wifi6-touch-lcd/README.md
Normal file
17
main/boards/waveshare/esp32-p4-wifi6-touch-lcd/README.md
Normal file
@ -0,0 +1,17 @@
|
||||
# Waveshare ESP32-P4-WIFI6-Touch-LCD
|
||||
|
||||
|
||||
**ESP32-P4-WIFI6-Touch-LCD** series is the ESP32-P4 +ESP32-C6 screen development board launched by waveshare
|
||||
|
||||
## Configuration
|
||||
|
||||
Configuration in `menuconfig`.
|
||||
|
||||
Selection Board Type `Xiaozhi Assistant --> Board Type`
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-4B
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-7B
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-3.4C
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-4C
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-7
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-8
|
||||
- Waveshare ESP32-P4-WIFI6-Touch-LCD-10.1
|
||||
91
main/boards/waveshare/esp32-p4-wifi6-touch-lcd/config.h
Normal file
91
main/boards/waveshare/esp32-p4-wifi6-touch-lcd/config.h
Normal file
@ -0,0 +1,91 @@
|
||||
#ifndef _BOARD_CONFIG_H_
|
||||
#define _BOARD_CONFIG_H_
|
||||
|
||||
#include <driver/gpio.h>
|
||||
|
||||
#define AUDIO_INPUT_SAMPLE_RATE 24000
|
||||
#define AUDIO_OUTPUT_SAMPLE_RATE 24000
|
||||
|
||||
#define AUDIO_INPUT_REFERENCE true
|
||||
|
||||
#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_13
|
||||
#define AUDIO_I2S_GPIO_WS GPIO_NUM_10
|
||||
#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_12
|
||||
#define AUDIO_I2S_GPIO_DIN GPIO_NUM_11
|
||||
#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_9
|
||||
|
||||
#define AUDIO_CODEC_PA_PIN GPIO_NUM_53
|
||||
#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_7
|
||||
#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_8
|
||||
#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR
|
||||
#define AUDIO_CODEC_ES7210_ADDR ES7210_CODEC_DEFAULT_ADDR
|
||||
|
||||
#define BOOT_BUTTON_GPIO GPIO_NUM_35
|
||||
|
||||
#if CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4B
|
||||
#define DISPLAY_WIDTH (720)
|
||||
#define DISPLAY_HEIGHT (720)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_27
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_26
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
|
||||
#define LCD_MIPI_DSI_LANE_BITRATE_MBPS (480)
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7B
|
||||
#define DISPLAY_WIDTH (1024)
|
||||
#define DISPLAY_HEIGHT (600)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_33
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_32
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
|
||||
#define LCD_MIPI_DSI_LANE_BITRATE_MBPS (900)
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_3_4C
|
||||
#define DISPLAY_WIDTH (800)
|
||||
#define DISPLAY_HEIGHT (800)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_27
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_26
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
|
||||
#define LCD_MIPI_DSI_LANE_BITRATE_MBPS (1500)
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4C
|
||||
#define DISPLAY_WIDTH (720)
|
||||
#define DISPLAY_HEIGHT (720)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_27
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_26
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT true
|
||||
#define LCD_MIPI_DSI_LANE_BITRATE_MBPS (1500)
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7
|
||||
#define DISPLAY_WIDTH (720)
|
||||
#define DISPLAY_HEIGHT (1280)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_27
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_26
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false
|
||||
#define LCD_MIPI_DSI_LANE_BITRATE_MBPS (1000)
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_8
|
||||
#define DISPLAY_WIDTH (800)
|
||||
#define DISPLAY_HEIGHT (1280)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_27
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_26
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false
|
||||
#define LCD_MIPI_DSI_LANE_BITRATE_MBPS (1500)
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_10_1
|
||||
#define DISPLAY_WIDTH (800)
|
||||
#define DISPLAY_HEIGHT (1280)
|
||||
#define PIN_NUM_LCD_RST GPIO_NUM_27
|
||||
#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_26
|
||||
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false
|
||||
#define LCD_MIPI_DSI_LANE_BITRATE_MBPS (1500)
|
||||
#endif
|
||||
|
||||
#define LCD_BIT_PER_PIXEL (16)
|
||||
#define DELAY_TIME_MS (3000)
|
||||
#define LCD_MIPI_DSI_LANE_NUM (2) // 2 data lanes
|
||||
|
||||
#define MIPI_DSI_PHY_PWR_LDO_CHAN (3)
|
||||
#define MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV (2500)
|
||||
|
||||
#define DISPLAY_SWAP_XY false
|
||||
#define DISPLAY_MIRROR_X false
|
||||
#define DISPLAY_MIRROR_Y false
|
||||
|
||||
#define DISPLAY_OFFSET_X 0
|
||||
#define DISPLAY_OFFSET_Y 0
|
||||
|
||||
|
||||
#endif // _BOARD_CONFIG_H_
|
||||
104
main/boards/waveshare/esp32-p4-wifi6-touch-lcd/config.json
Normal file
104
main/boards/waveshare/esp32-p4-wifi6-touch-lcd/config.json
Normal file
@ -0,0 +1,104 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32p4",
|
||||
"builds": [
|
||||
{
|
||||
"name": "esp32-p4-wifi6-touch-lcd-4b",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0",
|
||||
"CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y",
|
||||
"CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4B=y",
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "esp32-p4-wifi6-touch-lcd-7b",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0",
|
||||
"CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y",
|
||||
"CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7B=y",
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "esp32-p4-wifi6-touch-lcd-3.4c",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0",
|
||||
"CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y",
|
||||
"CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_3_4C=y",
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "esp32-p4-wifi6-touch-lcd-4c",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0",
|
||||
"CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y",
|
||||
"CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4C=y",
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "esp32-p4-wifi6-touch-lcd-7",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0",
|
||||
"CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y",
|
||||
"CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7=y",
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "esp32-p4-wifi6-touch-lcd-8",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0",
|
||||
"CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y",
|
||||
"CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_8=y",
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "esp32-p4-wifi6-touch-lcd-10.1",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0",
|
||||
"CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y",
|
||||
"CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_10_1=y",
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y",
|
||||
"CONFIG_CAMERA_OV5647=y",
|
||||
"CONFIG_CAMERA_OV5647_AUTO_DETECT_MIPI_INTERFACE_SENSOR=y",
|
||||
"CONFIG_CAMERA_OV5647_MIPI_RAW8_800X800_50FPS=y",
|
||||
"CONFIG_XIAOZHI_ENABLE_CAMERA_ENDIANNESS_SWAP=y"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -4,7 +4,6 @@
|
||||
#include "display/lcd_display.h"
|
||||
// #include "display/no_display.h"
|
||||
#include "button.h"
|
||||
#include "config.h"
|
||||
|
||||
#include "esp_video.h"
|
||||
#include "esp_video_init.h"
|
||||
@ -14,21 +13,34 @@
|
||||
#include "esp_lcd_mipi_dsi.h"
|
||||
#include "esp_ldo_regulator.h"
|
||||
|
||||
#if CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4B
|
||||
#include "esp_lcd_st7703.h"
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7B
|
||||
#include "esp_lcd_ek79007.h"
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_3_4C || CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4C \
|
||||
|| CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_8 || CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_10_1
|
||||
#include "esp_lcd_jd9365.h"
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7
|
||||
#include "esp_lcd_ili9881c.h"
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
#include "lcd_init_cmds.h"
|
||||
|
||||
#include <esp_log.h>
|
||||
#include <driver/i2c_master.h>
|
||||
#include <esp_lvgl_port.h>
|
||||
#include "esp_lcd_touch_gt911.h"
|
||||
#define TAG "WaveshareEsp32p47b"
|
||||
#define TAG "WaveshareEsp32p4"
|
||||
|
||||
class WaveshareEsp32p47b : public WifiBoard {
|
||||
class WaveshareEsp32p4 : public WifiBoard {
|
||||
private:
|
||||
i2c_master_bus_handle_t i2c_bus_;
|
||||
Button boot_button_;
|
||||
LcdDisplay *display_;
|
||||
EspVideo* camera_ = nullptr;
|
||||
|
||||
|
||||
esp_err_t i2c_device_probe(uint8_t addr) {
|
||||
return i2c_master_probe(i2c_bus_, addr, 100);
|
||||
}
|
||||
@ -74,16 +86,58 @@ private:
|
||||
esp_lcd_dsi_bus_config_t bus_config = {
|
||||
.bus_id = 0,
|
||||
.num_data_lanes = 2,
|
||||
.lane_bit_rate_mbps = 900,
|
||||
.lane_bit_rate_mbps = LCD_MIPI_DSI_LANE_BITRATE_MBPS,
|
||||
};
|
||||
esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus);
|
||||
|
||||
ESP_LOGI(TAG, "Install MIPI DSI LCD control panel");
|
||||
// we use DBI interface to send LCD commands and parameters
|
||||
esp_lcd_dbi_io_config_t dbi_config = EK79007_PANEL_IO_DBI_CONFIG();
|
||||
esp_lcd_dbi_io_config_t dbi_config = {
|
||||
.virtual_channel = 0,
|
||||
.lcd_cmd_bits = 8,
|
||||
.lcd_param_bits = 8,
|
||||
};
|
||||
esp_lcd_new_panel_io_dbi(mipi_dsi_bus, &dbi_config, &io);
|
||||
|
||||
#if CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4B
|
||||
esp_lcd_dpi_panel_config_t dpi_config = {
|
||||
.dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT,
|
||||
.dpi_clock_freq_mhz = 46,
|
||||
.pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
|
||||
.num_fbs = 1,
|
||||
.video_timing = {
|
||||
.h_size = 720,
|
||||
.v_size = 720,
|
||||
.hsync_pulse_width = 20,
|
||||
.hsync_back_porch = 80,
|
||||
.hsync_front_porch = 80,
|
||||
.vsync_pulse_width = 4,
|
||||
.vsync_back_porch = 12,
|
||||
.vsync_front_porch = 30,
|
||||
},
|
||||
.flags = {
|
||||
.use_dma2d = true,
|
||||
},
|
||||
};
|
||||
st7703_vendor_config_t vendor_config = {
|
||||
|
||||
.mipi_config = {
|
||||
.dsi_bus = mipi_dsi_bus,
|
||||
.dpi_config = &dpi_config,
|
||||
},
|
||||
.flags = {
|
||||
.use_mipi_interface = 1,
|
||||
},
|
||||
};
|
||||
|
||||
const esp_lcd_panel_dev_config_t lcd_dev_config = {
|
||||
.reset_gpio_num = PIN_NUM_LCD_RST,
|
||||
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
|
||||
.bits_per_pixel = 16,
|
||||
.vendor_config = &vendor_config,
|
||||
};
|
||||
esp_lcd_new_panel_st7703(io, &lcd_dev_config, &disp_panel);
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7B
|
||||
esp_lcd_dpi_panel_config_t dpi_config = {
|
||||
.dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT,
|
||||
.dpi_clock_freq_mhz = 52,
|
||||
.pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
|
||||
@ -116,19 +170,123 @@ private:
|
||||
.vendor_config = &vendor_config,
|
||||
};
|
||||
esp_lcd_new_panel_ek79007(io, &lcd_dev_config, &disp_panel);
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_3_4C || CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_4C
|
||||
esp_lcd_dpi_panel_config_t dpi_config = {
|
||||
.dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT,
|
||||
.dpi_clock_freq_mhz = 46,
|
||||
.pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
|
||||
.num_fbs = 1,
|
||||
.video_timing = {
|
||||
.h_size = DISPLAY_WIDTH,
|
||||
.v_size = DISPLAY_HEIGHT,
|
||||
.hsync_pulse_width = 20,
|
||||
.hsync_back_porch = 20,
|
||||
.hsync_front_porch = 40,
|
||||
.vsync_pulse_width = 4,
|
||||
.vsync_back_porch = 12,
|
||||
.vsync_front_porch = 24,
|
||||
},
|
||||
.flags = {
|
||||
.use_dma2d = true,
|
||||
},
|
||||
};
|
||||
jd9365_vendor_config_t vendor_config = {
|
||||
.init_cmds = lcd_init_cmds,
|
||||
.init_cmds_size = sizeof(lcd_init_cmds) / sizeof(lcd_init_cmds[0]),
|
||||
.mipi_config = {
|
||||
.dsi_bus = mipi_dsi_bus,
|
||||
.dpi_config = &dpi_config,
|
||||
.lane_num = 2,
|
||||
},
|
||||
};
|
||||
|
||||
const esp_lcd_panel_dev_config_t lcd_dev_config = {
|
||||
.reset_gpio_num = PIN_NUM_LCD_RST,
|
||||
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
|
||||
.bits_per_pixel = 16,
|
||||
.vendor_config = &vendor_config,
|
||||
};
|
||||
esp_lcd_new_panel_jd9365(io, &lcd_dev_config, &disp_panel);
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_8 || CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_10_1
|
||||
esp_lcd_dpi_panel_config_t dpi_config = {
|
||||
.dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT,
|
||||
.dpi_clock_freq_mhz = 52,
|
||||
.pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
|
||||
.num_fbs = 1,
|
||||
.video_timing = {
|
||||
.h_size = DISPLAY_WIDTH,
|
||||
.v_size = DISPLAY_HEIGHT,
|
||||
.hsync_pulse_width = 20,
|
||||
.hsync_back_porch = 20,
|
||||
.hsync_front_porch = 40,
|
||||
.vsync_pulse_width = 4,
|
||||
.vsync_back_porch = 10,
|
||||
.vsync_front_porch = 30,
|
||||
},
|
||||
.flags = {
|
||||
.use_dma2d = true,
|
||||
},
|
||||
};
|
||||
jd9365_vendor_config_t vendor_config = {
|
||||
.init_cmds = lcd_init_cmds,
|
||||
.init_cmds_size = sizeof(lcd_init_cmds) / sizeof(lcd_init_cmds[0]),
|
||||
.mipi_config = {
|
||||
.dsi_bus = mipi_dsi_bus,
|
||||
.dpi_config = &dpi_config,
|
||||
.lane_num = 2,
|
||||
},
|
||||
};
|
||||
|
||||
const esp_lcd_panel_dev_config_t lcd_dev_config = {
|
||||
.reset_gpio_num = PIN_NUM_LCD_RST,
|
||||
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
|
||||
.bits_per_pixel = 16,
|
||||
.vendor_config = &vendor_config,
|
||||
};
|
||||
esp_lcd_new_panel_jd9365(io, &lcd_dev_config, &disp_panel);
|
||||
#elif CONFIG_BOARD_TYPE_WAVESHARE_ESP32_P4_WIFI6_TOUCH_LCD_7
|
||||
esp_lcd_dpi_panel_config_t dpi_config = {
|
||||
.dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT,
|
||||
.dpi_clock_freq_mhz = 80,
|
||||
.pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
|
||||
.num_fbs = 1,
|
||||
.video_timing = {
|
||||
.h_size = DISPLAY_WIDTH,
|
||||
.v_size = DISPLAY_HEIGHT,
|
||||
.hsync_pulse_width = 50,
|
||||
.hsync_back_porch = 239,
|
||||
.hsync_front_porch = 33,
|
||||
.vsync_pulse_width = 30,
|
||||
.vsync_back_porch = 20,
|
||||
.vsync_front_porch = 2,
|
||||
},
|
||||
.flags = {
|
||||
.use_dma2d = true,
|
||||
},
|
||||
};
|
||||
ili9881c_vendor_config_t vendor_config = {
|
||||
.init_cmds = lcd_init_cmds,
|
||||
.init_cmds_size = sizeof(lcd_init_cmds) / sizeof(lcd_init_cmds[0]),
|
||||
.mipi_config = {
|
||||
.dsi_bus = mipi_dsi_bus,
|
||||
.dpi_config = &dpi_config,
|
||||
.lane_num = 2,
|
||||
},
|
||||
};
|
||||
|
||||
const esp_lcd_panel_dev_config_t lcd_dev_config = {
|
||||
.reset_gpio_num = PIN_NUM_LCD_RST,
|
||||
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
|
||||
.bits_per_pixel = 16,
|
||||
.vendor_config = &vendor_config,
|
||||
};
|
||||
esp_lcd_new_panel_ili9881c(io, &lcd_dev_config, &disp_panel);
|
||||
#endif
|
||||
esp_lcd_panel_reset(disp_panel);
|
||||
esp_lcd_panel_init(disp_panel);
|
||||
|
||||
display_ = new MipiLcdDisplay(io, disp_panel, DISPLAY_WIDTH, DISPLAY_HEIGHT,
|
||||
DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
|
||||
|
||||
lv_display_t *disp = lv_display_get_default();
|
||||
if (disp) {
|
||||
lv_disp_set_rotation(disp, LV_DISPLAY_ROTATION_180);
|
||||
ESP_LOGI(TAG, "Display rotated 180 degrees");
|
||||
} else {
|
||||
ESP_LOGE(TAG, "Failed to get default display for rotation");
|
||||
}
|
||||
}
|
||||
void InitializeTouch()
|
||||
{
|
||||
@ -204,7 +362,7 @@ private:
|
||||
}
|
||||
|
||||
public:
|
||||
WaveshareEsp32p47b() :
|
||||
WaveshareEsp32p4() :
|
||||
boot_button_(BOOT_BUTTON_GPIO) {
|
||||
InitializeCodecI2c();
|
||||
InitializeLCD();
|
||||
@ -246,4 +404,4 @@ public:
|
||||
|
||||
};
|
||||
|
||||
DECLARE_BOARD(WaveshareEsp32p47b);
|
||||
DECLARE_BOARD(WaveshareEsp32p4);
|
||||
1073
main/boards/waveshare/esp32-p4-wifi6-touch-lcd/lcd_init_cmds.h
Normal file
1073
main/boards/waveshare/esp32-p4-wifi6-touch-lcd/lcd_init_cmds.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-s3-audio-board",
|
||||
"name": "esp32-s3-audio-board",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
|
||||
"CONFIG_CAMERA_OV2640=y",
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-s3-touch-amoled-1.32",
|
||||
"name": "esp32-s3-epaper-1.54",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
|
||||
"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/8m.csv\""
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-s3-touch-amoled-1.75",
|
||||
"name": "esp32-s3-rlcd-4.2",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y"
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-s3-epaper-1.54",
|
||||
"name": "esp32-s3-touch-amoled-1.32",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y",
|
||||
"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v2/8m.csv\""
|
||||
13
main/boards/waveshare/esp32-s3-touch-amoled-1.75/config.json
Normal file
13
main/boards/waveshare/esp32-s3-touch-amoled-1.75/config.json
Normal file
@ -0,0 +1,13 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "esp32-s3-touch-amoled-1.75",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
13
main/boards/waveshare/esp32-s3-touch-amoled-2.06/config.json
Normal file
13
main/boards/waveshare/esp32-s3-touch-amoled-2.06/config.json
Normal file
@ -0,0 +1,13 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "esp32-s3-touch-amoled-2.06",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
@ -1,8 +1,9 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
"name": "waveshare-s3-touch-lcd-1.83",
|
||||
"name": "esp32-s3-touch-lcd-1.83",
|
||||
"sdkconfig_append": [
|
||||
"CONFIG_USE_WECHAT_MESSAGE_STYLE=n",
|
||||
"CONFIG_USE_DEVICE_AEC=y"
|
||||
@ -1,4 +1,5 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
@ -1,4 +1,5 @@
|
||||
{
|
||||
"manufacturer": "waveshare",
|
||||
"target": "esp32s3",
|
||||
"builds": [
|
||||
{
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user