From 99a4fc94bfb12ba6e6d9b72377f4878cf91fc5b6 Mon Sep 17 00:00:00 2001 From: Terrence Date: Sat, 25 Oct 2025 22:34:21 +0800 Subject: [PATCH] Normalize board type macros --- main/CMakeLists.txt | 93 +++++----- main/Kconfig.projbuild | 147 ++++++++------- main/boards/kevin-box-1/config.h | 39 ---- main/boards/kevin-box-1/config.json | 9 - main/boards/kevin-box-1/kevin_box_board.cc | 205 --------------------- main/boards/m5stack-tab5/sdkconfig.tab5 | 6 +- main/boards/sensecap-watcher/README.md | 2 +- main/boards/sensecap-watcher/README_en.md | 2 +- 8 files changed, 124 insertions(+), 379 deletions(-) delete mode 100644 main/boards/kevin-box-1/config.h delete mode 100644 main/boards/kevin-box-1/config.json delete mode 100644 main/boards/kevin-box-1/kevin_box_board.cc diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 4eec5248..c9da16ec 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -99,10 +99,6 @@ elseif(CONFIG_BOARD_TYPE_ESP_BOX_LITE) 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_KEVIN_BOX_1) - set(BOARD_TYPE "kevin-box-1") - set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) - set(BUILTIN_ICON_FONT font_awesome_14_1) elseif(CONFIG_BOARD_TYPE_KEVIN_BOX_2) set(BOARD_TYPE "kevin-box-2") set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) @@ -124,22 +120,22 @@ elseif(CONFIG_BOARD_TYPE_KEVIN_YUYING_313LCD) 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_LICHUANG_DEV) +elseif(CONFIG_BOARD_TYPE_LICHUANG_DEV_S3) set(BOARD_TYPE "lichuang-dev") 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_LICHUANG_C3_DEV) +elseif(CONFIG_BOARD_TYPE_LICHUANG_DEV_C3) set(BOARD_TYPE "lichuang-c3-dev") 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_MAGICLICK_2P4) +elseif(CONFIG_BOARD_TYPE_MAGICLICK_S3_2P4) set(BOARD_TYPE "magiclick-2p4") 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_MAGICLICK_2P5) +elseif(CONFIG_BOARD_TYPE_MAGICLICK_S3_2P5) set(BOARD_TYPE "magiclick-2p5") set(BUILTIN_TEXT_FONT font_puhui_basic_16_4) set(BUILTIN_ICON_FONT font_awesome_16_4) @@ -164,21 +160,21 @@ elseif(CONFIG_BOARD_TYPE_M5STACK_CORE_TAB5) 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_ATOMS3_ECHO_BASE) +elseif(CONFIG_BOARD_TYPE_M5STACK_ATOM_S3_ECHO_BASE) set(BOARD_TYPE "atoms3-echo-base") 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_ATOMS3R_ECHO_BASE) +elseif(CONFIG_BOARD_TYPE_M5STACK_ATOM_S3R_ECHO_BASE) set(BOARD_TYPE "atoms3r-echo-base") 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_ATOMS3R_CAM_M12_ECHO_BASE) +elseif(CONFIG_BOARD_TYPE_M5STACK_ATOM_S3R_CAM_M12_ECHO_BASE) set(BOARD_TYPE "atoms3r-cam-m12-echo-base") -elseif(CONFIG_BOARD_TYPE_ATOM_ECHOS3R) +elseif(CONFIG_BOARD_TYPE_M5STACK_ATOM_ECHOS3R) set(BOARD_TYPE "atom-echos3r") -elseif(CONFIG_BOARD_TYPE_ATOMMATRIX_ECHO_BASE) +elseif(CONFIG_BOARD_TYPE_M5STACK_ATOM_MATRIX_ECHO_BASE) set(BOARD_TYPE "atommatrix-echo-base") elseif(CONFIG_BOARD_TYPE_XMINI_C3_V3) set(BOARD_TYPE "xmini-c3-v3") @@ -192,7 +188,7 @@ elseif(CONFIG_BOARD_TYPE_XMINI_C3) set(BOARD_TYPE "xmini-c3") set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) set(BUILTIN_ICON_FONT font_awesome_14_1) -elseif(CONFIG_BOARD_TYPE_ESP32S3_KORVO2_V3) +elseif(CONFIG_BOARD_TYPE_ESP_KORVO2_V3) set(BOARD_TYPE "esp32s3-korvo2-v3") set(BUILTIN_TEXT_FONT font_puhui_basic_20_4) set(BUILTIN_ICON_FONT font_awesome_20_4) @@ -213,97 +209,97 @@ elseif(CONFIG_BOARD_TYPE_ECHOEAR) set(BUILTIN_TEXT_FONT font_puhui_20_4) set(BUILTIN_ICON_FONT font_awesome_20_4) set(DEFAULT_EMOJI_COLLECTION twemoji_64) -elseif(CONFIG_BOARD_TYPE_ESP32S3_AUDIO_BOARD) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_AUDIO_BOARD) set(BOARD_TYPE "waveshare-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_ESP32S3_Touch_AMOLED_1_8) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_8) 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_ESP32S3_Touch_AMOLED_2_06) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_2_06) set(BOARD_TYPE "waveshare-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_ESP32S3_Touch_LCD_4B) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_4B) set(BOARD_TYPE "waveshare-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_ESP32S3_Touch_AMOLED_1_75) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_75) set(BOARD_TYPE "waveshare-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_ESP32S3_Touch_LCD_1_83) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_83) set(BOARD_TYPE "waveshare-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_ESP32S3_Touch_LCD_1_85C) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_85C) 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_ESP32S3_Touch_LCD_1_85) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_85) 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_ESP32S3_Touch_LCD_1_46) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_46) 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_ESP32S3_Touch_LCD_3_5) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_5) 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_ESP32S3_Touch_LCD_3_5B) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_5B) set(BOARD_TYPE "waveshare-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_ESP32S3_Touch_LCD_3_49) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_49) set(BOARD_TYPE "waveshare-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_ESP32C6_LCD_1_69) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_LCD_1_69) set(BOARD_TYPE "waveshare-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_ESP32C6_Touch_AMOLED_1_43) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_43) set(BOARD_TYPE "waveshare-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_ESP32P4_NANO) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_NANO) set(BOARD_TYPE "waveshare-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_ESP32P4_WIFI6_Touch_LCD_4B) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_4B) set(BOARD_TYPE "waveshare-p4-wifi6-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_ESP32P4_WIFI6_Touch_LCD_7B) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_7B) set(BOARD_TYPE "waveshare-p4-wifi6-touch-lcd-7b") 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_ESP32P4_WIFI6_Touch_LCD_XC) +elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_XC) set(BOARD_TYPE "waveshare-p4-wifi6-touch-lcd-xc") 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_ESP32P4_Function_EV_Board) +elseif(CONFIG_BOARD_TYPE_ESP_P4_FUNCTION_EV_BOARD) set(BOARD_TYPE "esp-p4-function-ev-board") elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_WIFI_LCD) set(BOARD_TYPE "bread-compact-wifi-lcd") @@ -334,6 +330,11 @@ elseif(CONFIG_BOARD_TYPE_LILYGO_T_DISPLAY_S3_PRO_MVSRLORA) 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_LILYGO_T_DISPLAY_S3_PRO_MVSRLORA_NO_BATTERY) + set(BOARD_TYPE "lilygo-t-display-s3-pro-mvsrlora") + 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_LILYGO_T_DISPLAY_P4) set(BOARD_TYPE "lilygo-t-display-p4") set(BUILTIN_TEXT_FONT font_puhui_basic_30_4) @@ -389,40 +390,40 @@ elseif(CONFIG_BOARD_TYPE_DU_CHATX) 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_ESP32S3_Taiji_Pi) +elseif(CONFIG_BOARD_TYPE_TAIJI_PI_S3) set(BOARD_TYPE "taiji-pi-s3") 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_XINGZHI_Cube_0_85TFT_WIFI) +elseif(CONFIG_BOARD_TYPE_XINGZHI_CUBE_0_85TFT_WIFI) set(BOARD_TYPE "xingzhi-cube-0.85tft-wifi") 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_XINGZHI_Cube_0_85TFT_ML307) +elseif(CONFIG_BOARD_TYPE_XINGZHI_CUBE_0_85TFT_ML307) set(BOARD_TYPE "xingzhi-cube-0.85tft-ml307") 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_XINGZHI_Cube_0_96OLED_WIFI) +elseif(CONFIG_BOARD_TYPE_XINGZHI_CUBE_0_96OLED_WIFI) set(BOARD_TYPE "xingzhi-cube-0.96oled-wifi") set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) set(BUILTIN_ICON_FONT font_awesome_14_1) -elseif(CONFIG_BOARD_TYPE_XINGZHI_Cube_0_96OLED_ML307) +elseif(CONFIG_BOARD_TYPE_XINGZHI_CUBE_0_96OLED_ML307) set(BOARD_TYPE "xingzhi-cube-0.96oled-ml307") set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) set(BUILTIN_ICON_FONT font_awesome_14_1) -elseif(CONFIG_BOARD_TYPE_XINGZHI_Cube_1_54TFT_WIFI) +elseif(CONFIG_BOARD_TYPE_XINGZHI_CUBE_1_54TFT_WIFI) set(BOARD_TYPE "xingzhi-cube-1.54tft-wifi") 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_XINGZHI_Cube_1_54TFT_ML307) +elseif(CONFIG_BOARD_TYPE_XINGZHI_CUBE_1_54TFT_ML307) set(BOARD_TYPE "xingzhi-cube-1.54tft-ml307") 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_SENSECAP_WATCHER) +elseif(CONFIG_BOARD_TYPE_SEEED_STUDIO_SENSECAP_WATCHER) set(BOARD_TYPE "sensecap-watcher") set(BUILTIN_TEXT_FONT font_puhui_basic_30_4) set(BUILTIN_ICON_FONT font_awesome_20_4) @@ -439,11 +440,11 @@ elseif(CONFIG_BOARD_TYPE_GENJUTECH_S3_1_54TFT) 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_ESP32_CGC) +elseif(CONFIG_BOARD_TYPE_CGC) set(BOARD_TYPE "esp32-cgc") set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) set(BUILTIN_ICON_FONT font_awesome_14_1) -elseif(CONFIG_BOARD_TYPE_ESP32_CGC_144) +elseif(CONFIG_BOARD_TYPE_CGC_144) set(BOARD_TYPE "esp32-cgc-144") set(BUILTIN_TEXT_FONT font_puhui_basic_14_1) set(BUILTIN_ICON_FONT font_awesome_14_1) @@ -472,12 +473,12 @@ elseif(CONFIG_BOARD_TYPE_ZHENGCHEN_1_54TFT_ML307) 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_ESP32_S3_1_54_MUMA) +elseif(CONFIG_BOARD_TYPE_SPOTPEAR_ESP32_S3_1_54_MUMA) set(BOARD_TYPE "sp-esp32-s3-1.54-muma") 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_ESP32_S3_1_28_BOX) +elseif(CONFIG_BOARD_TYPE_SPOTPEAR_ESP32_S3_1_28_BOX) set(BOARD_TYPE "sp-esp32-s3-1.28-box") set(BUILTIN_TEXT_FONT font_puhui_basic_16_4) set(BUILTIN_ICON_FONT font_awesome_16_4) @@ -520,7 +521,7 @@ elseif(CONFIG_BOARD_TYPE_YUNLIAO_S3) 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_WTP4C5MP07S) +elseif(CONFIG_BOARD_TYPE_WIRELESS_TAG_WTP4C5MP07S) set(BOARD_TYPE "wireless-tag-wtp4c5mp07s") set(BUILTIN_TEXT_FONT font_puhui_basic_30_4) set(BUILTIN_ICON_FONT font_awesome_30_4) diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 085c9098..25440f53 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -144,32 +144,32 @@ choice BOARD_TYPE config BOARD_TYPE_XMINI_C3 bool "Xmini C3" depends on IDF_TARGET_ESP32C3 - config BOARD_TYPE_ESP32S3_KORVO2_V3 - bool "ESP32S3 KORVO2 V3" + config BOARD_TYPE_ESP_KORVO2_V3 + bool "Espressif Korvo2 V3" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_ESP_SPARKBOT - bool "ESP-SparkBot" + bool "Espressif SparkBot" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_ESP_SPOT_S3 - bool "ESP-Spot-S3" + bool "Espressif Spot-S3" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_ESP_HI - bool "ESP-HI" + bool "Espressif ESP-HI" depends on IDF_TARGET_ESP32C3 - config BOARD_TYPE_ECHOEAR - bool "EchoEar" - depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_ESP_BOX_3 - bool "ESP BOX 3" + bool "Espressif ESP-BOX-3" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_ESP_BOX - bool "ESP BOX" + bool "Espressif ESP-BOX" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_ESP_BOX_LITE - bool "ESP BOX Lite" + bool "Espressif ESP-BOX-Lite" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_KEVIN_BOX_1 - bool "Kevin Box 1" + config BOARD_TYPE_ESP_P4_FUNCTION_EV_BOARD + bool "Espressif ESP-P4-Function-EV-Board" + depends on IDF_TARGET_ESP32P4 + config BOARD_TYPE_ECHOEAR + bool "EchoEar" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_KEVIN_BOX_2 bool "Kevin Box 2" @@ -183,19 +183,19 @@ choice BOARD_TYPE config BOARD_TYPE_KEVIN_SP_V4_DEV bool "Kevin SP V4" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32_CGC - bool "ESP32 CGC" - depends on IDF_TARGET_ESP32 - config BOARD_TYPE_ESP32_CGC_144 - bool "ESP32 CGC 144" - depends on IDF_TARGET_ESP32 config BOARD_TYPE_KEVIN_YUYING_313LCD bool "鱼鹰科技 3.13LCD" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_LICHUANG_DEV + config BOARD_TYPE_CGC + bool "CGC" + depends on IDF_TARGET_ESP32 + config BOARD_TYPE_CGC_144 + bool "CGC 144" + depends on IDF_TARGET_ESP32 + config BOARD_TYPE_LICHUANG_DEV_S3 bool "立创·实战派 ESP32-S3" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_LICHUANG_C3_DEV + config BOARD_TYPE_LICHUANG_DEV_C3 bool "立创·实战派 ESP32-C3" depends on IDF_TARGET_ESP32C3 config BOARD_TYPE_DF_K10 @@ -204,10 +204,10 @@ choice BOARD_TYPE config BOARD_TYPE_DF_S3_AI_CAM bool "DFRobot ESP32-S3 AI智能摄像头模块" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_MAGICLICK_2P4 + config BOARD_TYPE_MAGICLICK_S3_2P4 bool "神奇按钮 Magiclick_2.4" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_MAGICLICK_2P5 + config BOARD_TYPE_MAGICLICK_S3_2P5 bool "神奇按钮 Magiclick_2.5" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_MAGICLICK_C3 @@ -222,77 +222,75 @@ choice BOARD_TYPE config BOARD_TYPE_M5STACK_CORE_TAB5 bool "M5Stack Tab5" depends on IDF_TARGET_ESP32P4 - config BOARD_TYPE_ATOMS3_ECHO_BASE - bool "AtomS3 + Echo Base" + config BOARD_TYPE_M5STACK_ATOM_S3_ECHO_BASE + bool "M5Stack AtomS3 + Echo Base" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ATOMS3R_ECHO_BASE - bool "AtomS3R + Echo Base" + config BOARD_TYPE_M5STACK_ATOM_S3R_ECHO_BASE + bool "M5Stack AtomS3R + Echo Base" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ATOMS3R_CAM_M12_ECHO_BASE - bool "AtomS3R CAM/M12 + Echo Base" + config BOARD_TYPE_M5STACK_ATOM_S3R_CAM_M12_ECHO_BASE + bool "M5Stack AtomS3R CAM/M12 + Echo Base" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ATOM_ECHOS3R - bool "AtomEchoS3R" + config BOARD_TYPE_M5STACK_ATOM_ECHOS3R + bool "M5Stack AtomEchoS3R" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ATOMMATRIX_ECHO_BASE - bool "AtomMatrix + Echo Base" + config BOARD_TYPE_M5STACK_ATOM_MATRIX_ECHO_BASE + bool "M5Stack AtomMatrix + Echo Base" depends on IDF_TARGET_ESP32 - config BOARD_TYPE_ESP32S3_AUDIO_BOARD + config BOARD_TYPE_WAVESHARE_S3_AUDIO_BOARD bool "Waveshare ESP32-S3-Audio-Board" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_8 + config BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_8 bool "Waveshare ESP32-S3-Touch-AMOLED-1.8" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_AMOLED_2_06 + config BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_2_06 bool "Waveshare ESP32-S3-Touch-AMOLED-2.06" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75 + config BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_75 bool "Waveshare ESP32-S3-Touch-AMOLED-1.75" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_LCD_1_83 + config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_83 bool "Waveshare ESP32-S3-Touch-LCD-1.83" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_LCD_4B + config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_4B bool "Waveshare ESP32-S3-Touch-LCD-4B" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_LCD_1_85C + config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_85C bool "Waveshare ESP32-S3-Touch-LCD-1.85C" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_LCD_1_85 + config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_85 bool "Waveshare ESP32-S3-Touch-LCD-1.85" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_LCD_1_46 + config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_1_46 bool "Waveshare ESP32-S3-Touch-LCD-1.46" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32C6_LCD_1_69 + config BOARD_TYPE_WAVESHARE_C6_LCD_1_69 bool "Waveshare ESP32-C6-LCD-1.69" depends on IDF_TARGET_ESP32C6 - config BOARD_TYPE_ESP32C6_Touch_AMOLED_1_43 + config BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_43 bool "Waveshare ESP32-C6-Touch-AMOLOED-1.43" depends on IDF_TARGET_ESP32C6 - config BOARD_TYPE_ESP32S3_Touch_LCD_3_49 + config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_49 bool "Waveshare ESP32-S3-Touch-LCD-3.49" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_LCD_3_5 + config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_5 bool "Waveshare ESP32-S3-Touch-LCD-3.5" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Touch_LCD_3_5B + config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_5B bool "Waveshare ESP32-S3-Touch-LCD-3.5B" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32P4_NANO + config BOARD_TYPE_WAVESHARE_P4_NANO bool "Waveshare ESP32-P4-NANO" depends on IDF_TARGET_ESP32P4 - config BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_4B + config BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_4B bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-4B" - config BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_7B + depends on IDF_TARGET_ESP32P4 + config BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_7B bool "Waveshare ESP32-P4-WIFI6-Touch-LCD-7B" depends on IDF_TARGET_ESP32P4 - config BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_XC + 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" depends on IDF_TARGET_ESP32P4 - config BOARD_TYPE_ESP_P4_Function_EV_Board - bool "ESP-P4-Function-EV-Board" - depends on IDF_TARGET_ESP32P4 config BOARD_TYPE_TUDOUZI bool "土豆子" depends on IDF_TARGET_ESP32S3 @@ -344,29 +342,29 @@ choice BOARD_TYPE config BOARD_TYPE_DU_CHATX bool "嘟嘟开发板CHATX(wifi)" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32S3_Taiji_Pi + config BOARD_TYPE_TAIJI_PI_S3 bool "太极小派esp32s3" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_XINGZHI_Cube_0_85TFT_WIFI + config BOARD_TYPE_XINGZHI_CUBE_0_85TFT_WIFI bool "无名科技星智0.85(WIFI)" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_XINGZHI_Cube_0_85TFT_ML307 + config BOARD_TYPE_XINGZHI_CUBE_0_85TFT_ML307 bool "无名科技星智0.85(ML307)" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_XINGZHI_Cube_0_96OLED_WIFI + config BOARD_TYPE_XINGZHI_CUBE_0_96OLED_WIFI bool "无名科技星智0.96(WIFI)" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_XINGZHI_Cube_0_96OLED_ML307 + config BOARD_TYPE_XINGZHI_CUBE_0_96OLED_ML307 bool "无名科技星智0.96(ML307)" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_XINGZHI_Cube_1_54TFT_WIFI + config BOARD_TYPE_XINGZHI_CUBE_1_54TFT_WIFI bool "无名科技星智1.54(WIFI)" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_XINGZHI_Cube_1_54TFT_ML307 + config BOARD_TYPE_XINGZHI_CUBE_1_54TFT_ML307 bool "无名科技星智1.54(ML307)" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_SENSECAP_WATCHER - bool "SenseCAP Watcher" + config BOARD_TYPE_SEEED_STUDIO_SENSECAP_WATCHER + bool "Seeed Studio SenseCAP Watcher" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_DOIT_S3_AIBOX bool "四博智联AI陪伴盒子" @@ -392,10 +390,10 @@ choice BOARD_TYPE config BOARD_TYPE_MINSI_K08_DUAL bool "敏思科技K08(DUAL)" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32_S3_1_54_MUMA + config BOARD_TYPE_SPOTPEAR_ESP32_S3_1_54_MUMA bool "Spotpear ESP32-S3-1.54-MUMA" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_ESP32_S3_1_28_BOX + config BOARD_TYPE_SPOTPEAR_ESP32_S3_1_28_BOX bool "Spotpear ESP32-S3-1.28-BOX" depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_OTTO_ROBOT @@ -417,14 +415,13 @@ choice BOARD_TYPE config BOARD_TYPE_LABPLUS_LEDONG_V2 bool "labplus ledong_v2 board" depends on IDF_TARGET_ESP32S3 - depends on IDF_TARGET_ESP32S3 config BOARD_TYPE_SURFER_C3_1_14TFT bool "Surfer-C3-1.14TFT" depends on IDF_TARGET_ESP32C3 config BOARD_TYPE_YUNLIAO_S3 bool "小智云聊-S3" depends on IDF_TARGET_ESP32S3 - config BOARD_TYPE_WTP4C5MP07S + config BOARD_TYPE_WIRELESS_TAG_WTP4C5MP07S bool "Wireless-Tag WTP4C5MP07S" depends on IDF_TARGET_ESP32P4 endchoice @@ -474,7 +471,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_ESP32_CGC || BOARD_TYPE_ESP32P4_NANO || BOARD_TYPE_ESP32P4_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_WAVESHARE_P4_NANO || BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_XC || BOARD_TYPE_BREAD_COMPACT_WIFI_CAM prompt "LCD Type" default LCD_ST7789_240X320 help @@ -522,7 +519,7 @@ choice DISPLAY_LCD_TYPE endchoice choice DISPLAY_ESP32S3_KORVO2_V3 - depends on BOARD_TYPE_ESP32S3_KORVO2_V3 + depends on BOARD_TYPE_ESP_KORVO2_V3 prompt "ESP32S3_KORVO2_V3 LCD Type" default ESP32S3_KORVO2_V3_LCD_ST7789 help @@ -534,7 +531,7 @@ choice DISPLAY_ESP32S3_KORVO2_V3 endchoice choice DISPLAY_ESP32S3_AUDIO_BOARD - depends on BOARD_TYPE_ESP32S3_AUDIO_BOARD + depends on BOARD_TYPE_WAVESHARE_S3_AUDIO_BOARD prompt "ESP32S3_AUDIO_BOARD LCD Type" default AUDIO_BOARD_LCD_JD9853 help @@ -634,10 +631,10 @@ 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 || BOARD_TYPE_ESP32S3_KORVO2_V3 || BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75 || BOARD_TYPE_ESP32S3_Touch_LCD_1_83\ - || BOARD_TYPE_ESP32S3_Touch_AMOLED_2_06 || BOARD_TYPE_ESP32S3_Touch_LCD_4B || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_4B || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_7B \ - || BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_XC || BOARD_TYPE_ESP_S3_LCD_EV_Board_2 || BOARD_TYPE_YUNLIAO_S3 \ - || BOARD_TYPE_ECHOEAR || BOARD_TYPE_ESP32S3_Touch_LCD_3_49) + || 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) 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. @@ -706,7 +703,7 @@ menu "Camera Configuration" endmenu menu "TAIJIPAI_S3_CONFIG" - depends on BOARD_TYPE_ESP32S3_Taiji_Pi + depends on BOARD_TYPE_TAIJI_PI_S3 choice I2S_TYPE_TAIJIPI_S3 prompt "taiji-pi-S3 I2S Type" default TAIJIPAI_I2S_TYPE_STD diff --git a/main/boards/kevin-box-1/config.h b/main/boards/kevin-box-1/config.h deleted file mode 100644 index 8bd55ad2..00000000 --- a/main/boards/kevin-box-1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef _BOARD_CONFIG_H_ -#define _BOARD_CONFIG_H_ - -#include - -#define AUDIO_INPUT_SAMPLE_RATE 24000 -#define AUDIO_OUTPUT_SAMPLE_RATE 24000 - -#define AUDIO_INPUT_REFERENCE true - -#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_42 -#define AUDIO_I2S_GPIO_WS GPIO_NUM_47 -#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_48 -#define AUDIO_I2S_GPIO_DIN GPIO_NUM_45 -#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_21 - -#define AUDIO_CODEC_PA_PIN GPIO_NUM_17 -#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_39 -#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_38 -#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR -#define AUDIO_CODEC_ES7210_ADDR ES7210_CODEC_DEFAULT_ADDR - -#define BUILTIN_LED_GPIO GPIO_NUM_8 -#define BOOT_BUTTON_GPIO GPIO_NUM_0 -#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_6 -#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_7 - -#define DISPLAY_SDA_PIN GPIO_NUM_4 -#define DISPLAY_SCL_PIN GPIO_NUM_5 -#define DISPLAY_WIDTH 128 -#define DISPLAY_HEIGHT 64 -#define DISPLAY_MIRROR_X false -#define DISPLAY_MIRROR_Y false - -#define ML307_RX_PIN GPIO_NUM_20 -#define ML307_TX_PIN GPIO_NUM_19 - - -#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/kevin-box-1/config.json b/main/boards/kevin-box-1/config.json deleted file mode 100644 index 82d8a1f7..00000000 --- a/main/boards/kevin-box-1/config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "target": "esp32s3", - "builds": [ - { - "name": "kevin-box-1", - "sdkconfig_append": [] - } - ] -} \ No newline at end of file diff --git a/main/boards/kevin-box-1/kevin_box_board.cc b/main/boards/kevin-box-1/kevin_box_board.cc deleted file mode 100644 index bb2e9125..00000000 --- a/main/boards/kevin-box-1/kevin_box_board.cc +++ /dev/null @@ -1,205 +0,0 @@ -#include "ml307_board.h" -#include "codecs/box_audio_codec.h" -#include "display/oled_display.h" -#include "application.h" -#include "button.h" -#include "config.h" -#include "led/single_led.h" -#include "assets/lang_config.h" - -#include -#include -#include -#include -#include -#include - -#define TAG "KevinBoxBoard" - -class KevinBoxBoard : public Ml307Board { -private: - i2c_master_bus_handle_t display_i2c_bus_; - i2c_master_bus_handle_t codec_i2c_bus_; - esp_lcd_panel_io_handle_t panel_io_ = nullptr; - esp_lcd_panel_handle_t panel_ = nullptr; - Display* display_ = nullptr; - Button boot_button_; - Button volume_up_button_; - Button volume_down_button_; - - void MountStorage() { - // Mount the storage partition - esp_vfs_spiffs_conf_t conf = { - .base_path = "/storage", - .partition_label = "storage", - .max_files = 5, - .format_if_mount_failed = true, - }; - esp_vfs_spiffs_register(&conf); - } - - void Enable4GModule() { - // Make GPIO15 HIGH to enable the 4G module - gpio_config_t ml307_enable_config = { - .pin_bit_mask = (1ULL << 15) | (1ULL << 18), - .mode = GPIO_MODE_OUTPUT, - .pull_up_en = GPIO_PULLUP_DISABLE, - .pull_down_en = GPIO_PULLDOWN_DISABLE, - .intr_type = GPIO_INTR_DISABLE, - }; - gpio_config(&ml307_enable_config); - gpio_set_level(GPIO_NUM_15, 1); - gpio_set_level(GPIO_NUM_18, 1); - } - - void InitializeDisplayI2c() { - i2c_master_bus_config_t bus_config = { - .i2c_port = (i2c_port_t)0, - .sda_io_num = DISPLAY_SDA_PIN, - .scl_io_num = DISPLAY_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(&bus_config, &display_i2c_bus_)); - } - - void InitializeSsd1306Display() { - // SSD1306 config - esp_lcd_panel_io_i2c_config_t io_config = { - .dev_addr = 0x3C, - .on_color_trans_done = nullptr, - .user_ctx = nullptr, - .control_phase_bytes = 1, - .dc_bit_offset = 6, - .lcd_cmd_bits = 8, - .lcd_param_bits = 8, - .flags = { - .dc_low_on_data = 0, - .disable_control_phase = 0, - }, - .scl_speed_hz = 400 * 1000, - }; - - ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c_v2(display_i2c_bus_, &io_config, &panel_io_)); - - ESP_LOGI(TAG, "Install SSD1306 driver"); - esp_lcd_panel_dev_config_t panel_config = {}; - panel_config.reset_gpio_num = -1; - panel_config.bits_per_pixel = 1; - - esp_lcd_panel_ssd1306_config_t ssd1306_config = { - .height = static_cast(DISPLAY_HEIGHT), - }; - panel_config.vendor_config = &ssd1306_config; - - ESP_ERROR_CHECK(esp_lcd_new_panel_ssd1306(panel_io_, &panel_config, &panel_)); - ESP_LOGI(TAG, "SSD1306 driver installed"); - - // Reset the display - ESP_ERROR_CHECK(esp_lcd_panel_reset(panel_)); - if (esp_lcd_panel_init(panel_) != ESP_OK) { - ESP_LOGE(TAG, "Failed to initialize display"); - display_ = new NoDisplay(); - return; - } - - // Set the display to on - ESP_LOGI(TAG, "Turning display on"); - ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel_, true)); - - display_ = new OledDisplay(panel_io_, panel_, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y); - } - - void InitializeCodecI2c() { - // Initialize I2C peripheral - i2c_master_bus_config_t i2c_bus_cfg = { - .i2c_port = (i2c_port_t)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, &codec_i2c_bus_)); - } - - void InitializeButtons() { - boot_button_.OnPressDown([this]() { - Application::GetInstance().StartListening(); - }); - boot_button_.OnPressUp([this]() { - Application::GetInstance().StopListening(); - }); - - volume_up_button_.OnClick([this]() { - auto codec = GetAudioCodec(); - auto volume = codec->output_volume() + 10; - if (volume > 100) { - volume = 100; - } - codec->SetOutputVolume(volume); - GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume)); - }); - - volume_up_button_.OnLongPress([this]() { - GetAudioCodec()->SetOutputVolume(100); - GetDisplay()->ShowNotification(Lang::Strings::MAX_VOLUME); - }); - - volume_down_button_.OnClick([this]() { - auto codec = GetAudioCodec(); - auto volume = codec->output_volume() - 10; - if (volume < 0) { - volume = 0; - } - codec->SetOutputVolume(volume); - GetDisplay()->ShowNotification(Lang::Strings::VOLUME + std::to_string(volume)); - }); - - volume_down_button_.OnLongPress([this]() { - GetAudioCodec()->SetOutputVolume(0); - GetDisplay()->ShowNotification(Lang::Strings::MUTED); - }); - } - -public: - KevinBoxBoard() : Ml307Board(ML307_TX_PIN, ML307_RX_PIN), - boot_button_(BOOT_BUTTON_GPIO), - volume_up_button_(VOLUME_UP_BUTTON_GPIO), - volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { - InitializeDisplayI2c(); - InitializeSsd1306Display(); - InitializeCodecI2c(); - MountStorage(); - Enable4GModule(); - - InitializeButtons(); - } - - virtual Led* GetLed() override { - static SingleLed led(BUILTIN_LED_GPIO); - return &led; - } - - virtual AudioCodec* GetAudioCodec() override { - static BoxAudioCodec audio_codec(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_; - } -}; - -DECLARE_BOARD(KevinBoxBoard); \ No newline at end of file diff --git a/main/boards/m5stack-tab5/sdkconfig.tab5 b/main/boards/m5stack-tab5/sdkconfig.tab5 index b017de7f..f250c40f 100644 --- a/main/boards/m5stack-tab5/sdkconfig.tab5 +++ b/main/boards/m5stack-tab5/sdkconfig.tab5 @@ -756,9 +756,9 @@ CONFIG_LANGUAGE_ZH_CN=y # CONFIG_LANGUAGE_EN_US is not set # CONFIG_LANGUAGE_JA_JP is not set CONFIG_BOARD_TYPE_M5STACK_CORE_TAB5=y -# CONFIG_BOARD_TYPE_ESP32P4_NANO is not set -# CONFIG_BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_4B is not set -# CONFIG_BOARD_TYPE_ESP32P4_WIFI6_Touch_LCD_XC is not set +# CONFIG_BOARD_TYPE_WAVESHARE_P4_NANO is not set +# CONFIG_BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_4B is not set +# CONFIG_BOARD_TYPE_WAVESHARE_P4_WIFI6_TOUCH_LCD_XC is not set # CONFIG_USE_WECHAT_MESSAGE_STYLE is not set CONFIG_USE_AFE_WAKE_WORD=y CONFIG_USE_AUDIO_PROCESSOR=y diff --git a/main/boards/sensecap-watcher/README.md b/main/boards/sensecap-watcher/README.md index b6063997..aa910109 100644 --- a/main/boards/sensecap-watcher/README.md +++ b/main/boards/sensecap-watcher/README.md @@ -27,7 +27,7 @@ Xiaozhi Assistant -> Board Type -> SenseCAP Watcher watcher 中一些额外的配置项如下，需要在menuconfig 中选择. ``` -CONFIG_BOARD_TYPE_SENSECAP_WATCHER=y +CONFIG_BOARD_TYPE_SEEED_STUDIO_SENSECAP_WATCHER=y CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions/v2/32m.csv" CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y diff --git a/main/boards/sensecap-watcher/README_en.md b/main/boards/sensecap-watcher/README_en.md index 8e95f553..27338a87 100644 --- a/main/boards/sensecap-watcher/README_en.md +++ b/main/boards/sensecap-watcher/README_en.md @@ -27,7 +27,7 @@ Xiaozhi Assistant -> Board Type -> SenseCAP Watcher There are some additional configuration options for the watcher. Please select them in menuconfig: ``` -CONFIG_BOARD_TYPE_SENSECAP_WATCHER=y +CONFIG_BOARD_TYPE_SEEED_STUDIO_SENSECAP_WATCHER=y CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions/v2/32m.csv" CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH=y