From 83d6fa9d26abac8d8bb85838dcbf4af6c184207e Mon Sep 17 00:00:00 2001 From: zhou <60282327+windskyxb@users.noreply.github.com> Date: Fri, 14 Feb 2025 01:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E5=90=8D=E7=A7=91?= =?UTF-8?q?=E6=8A=80ESP32S3=E6=98=9F=E6=99=BA=E5=BC=80=E5=8F=91=E6=9D=BF?= =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84TOUCH=5FBUTTON=EF=BC=9B?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=98=9F=E6=99=BA=E7=9A=84?= =?UTF-8?q?TFT=E7=89=88=E6=9C=AC=20(#155)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update CMakeLists.txt * Update Kconfig.projbuild * Add files via upload * Update CMakeLists.txt * Update Kconfig.projbuild * update * update * update * update xingzhi-cube-tft --- main/CMakeLists.txt | 2 + main/Kconfig.projbuild | 2 + main/boards/xingzhi-cube-oled/config.h | 1 - .../xingzhi-cube-oled/xingzhi-cube-oled.cc | 8 - .../compact_wifi_board_lcd.cc | 151 ++++++++++++++++++ main/boards/xingzhi-cube-tft/config.h | 40 +++++ 6 files changed, 195 insertions(+), 9 deletions(-) create mode 100644 main/boards/xingzhi-cube-tft/compact_wifi_board_lcd.cc create mode 100644 main/boards/xingzhi-cube-tft/config.h diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index e9952679..141ee1ff 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -93,6 +93,8 @@ elseif(CONFIG_BOARD_TYPE_ESP32S3_Taiji_Pi) set(BOARD_TYPE "taiji-pi-s3") elseif(CONFIG_BOARD_TYPE_XINGZHI_Cube_OLED) set(BOARD_TYPE "xingzhi-cube-oled") +elseif(CONFIG_BOARD_TYPE_XINGZHI_Cube_TFT) + set(BOARD_TYPE "xingzhi-cube-tft") endif() file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc) list(APPEND SOURCES ${BOARD_SOURCES}) diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 03225190..d9908c55 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -92,6 +92,8 @@ choice BOARD_TYPE bool "太极小派esp32s3" config BOARD_TYPE_XINGZHI_Cube_OLED bool "无名科技星智0.96" + config BOARD_TYPE_XINGZHI_Cube_TFT + bool "无名科技星智1.54" endchoice choice DISPLAY_LCD_TYPE diff --git a/main/boards/xingzhi-cube-oled/config.h b/main/boards/xingzhi-cube-oled/config.h index bf2e9357..ae6cacfa 100644 --- a/main/boards/xingzhi-cube-oled/config.h +++ b/main/boards/xingzhi-cube-oled/config.h @@ -15,7 +15,6 @@ #define BUILTIN_LED_GPIO GPIO_NUM_48 #define BOOT_BUTTON_GPIO GPIO_NUM_0 -#define TOUCH_BUTTON_GPIO GPIO_NUM_47 #define VOLUME_UP_BUTTON_GPIO GPIO_NUM_40 #define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_39 diff --git a/main/boards/xingzhi-cube-oled/xingzhi-cube-oled.cc b/main/boards/xingzhi-cube-oled/xingzhi-cube-oled.cc index a7ae74ff..8fde396c 100644 --- a/main/boards/xingzhi-cube-oled/xingzhi-cube-oled.cc +++ b/main/boards/xingzhi-cube-oled/xingzhi-cube-oled.cc @@ -21,7 +21,6 @@ class xingzhicubeoled : public WifiBoard { private: i2c_master_bus_handle_t display_i2c_bus_; Button boot_button_; - Button touch_button_; Button volume_up_button_; Button volume_down_button_; @@ -49,12 +48,6 @@ private: } app.ToggleChatState(); }); - touch_button_.OnPressDown([this]() { - Application::GetInstance().StartListening(); - }); - touch_button_.OnPressUp([this]() { - Application::GetInstance().StopListening(); - }); volume_up_button_.OnClick([this]() { auto codec = GetAudioCodec(); @@ -97,7 +90,6 @@ private: public: xingzhicubeoled() : boot_button_(BOOT_BUTTON_GPIO), - touch_button_(TOUCH_BUTTON_GPIO), volume_up_button_(VOLUME_UP_BUTTON_GPIO), volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { InitializeDisplayI2c(); diff --git a/main/boards/xingzhi-cube-tft/compact_wifi_board_lcd.cc b/main/boards/xingzhi-cube-tft/compact_wifi_board_lcd.cc new file mode 100644 index 00000000..912466af --- /dev/null +++ b/main/boards/xingzhi-cube-tft/compact_wifi_board_lcd.cc @@ -0,0 +1,151 @@ +#include "wifi_board.h" +#include "audio_codecs/no_audio_codec.h" +#include "display/lcd_display.h" +#include "system_reset.h" +#include "application.h" +#include "button.h" +#include "config.h" +#include "iot/thing_manager.h" +#include "led/single_led.h" + +#include +#include +#include +#include +#include + +#define TAG "xingzhicubetft" + +LV_FONT_DECLARE(font_puhui_16_4); +LV_FONT_DECLARE(font_awesome_16_4); + +class xingzhicubetft : public WifiBoard { +private: + + Button boot_button_; + Button volume_up_button_; + Button volume_down_button_; + LcdDisplay* display_; + + void InitializeSpi() { + spi_bus_config_t buscfg = {}; + buscfg.mosi_io_num = DISPLAY_MOSI_PIN; + buscfg.miso_io_num = GPIO_NUM_NC; + buscfg.sclk_io_num = DISPLAY_CLK_PIN; + buscfg.quadwp_io_num = GPIO_NUM_NC; + buscfg.quadhd_io_num = GPIO_NUM_NC; + buscfg.max_transfer_sz = DISPLAY_WIDTH * DISPLAY_HEIGHT * sizeof(uint16_t); + ESP_ERROR_CHECK(spi_bus_initialize(SPI3_HOST, &buscfg, SPI_DMA_CH_AUTO)); + } + + void InitializeLcdDisplay() { + esp_lcd_panel_io_handle_t panel_io = nullptr; + esp_lcd_panel_handle_t panel = nullptr; + // 液晶屏控制IO初始化 + ESP_LOGD(TAG, "Install panel IO"); + esp_lcd_panel_io_spi_config_t io_config = {}; + io_config.cs_gpio_num = DISPLAY_CS_PIN; + io_config.dc_gpio_num = DISPLAY_DC_PIN; + io_config.spi_mode = 0; + io_config.pclk_hz = 40 * 1000 * 1000; + io_config.trans_queue_depth = 10; + io_config.lcd_cmd_bits = 8; + io_config.lcd_param_bits = 8; + ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI3_HOST, &io_config, &panel_io)); + + // 初始化液晶屏驱动芯片 + ESP_LOGD(TAG, "Install LCD driver"); + esp_lcd_panel_dev_config_t panel_config = {}; + panel_config.reset_gpio_num = DISPLAY_RST_PIN; + panel_config.rgb_ele_order = DISPLAY_RGB_ORDER; + panel_config.bits_per_pixel = 16; + ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(panel_io, &panel_config, &panel)); + + esp_lcd_panel_reset(panel); + + esp_lcd_panel_init(panel); + esp_lcd_panel_invert_color(panel, DISPLAY_INVERT_COLOR); + esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY); + esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y); + display_ = new LcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT, + DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY, + { + .text_font = &font_puhui_16_4, + .icon_font = &font_awesome_16_4, + .emoji_font = DISPLAY_HEIGHT >= 240 ? font_emoji_64_init() : font_emoji_32_init(), + }); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) { + ResetWifiConfiguration(); + } + app.ToggleChatState(); + }); + volume_up_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() + 10; + if (volume > 100) { + volume = 100; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("音量 " + std::to_string(volume)); + }); + + volume_up_button_.OnLongPress([this]() { + GetAudioCodec()->SetOutputVolume(100); + GetDisplay()->ShowNotification("最大音量"); + }); + + volume_down_button_.OnClick([this]() { + auto codec = GetAudioCodec(); + auto volume = codec->output_volume() - 10; + if (volume < 0) { + volume = 0; + } + codec->SetOutputVolume(volume); + GetDisplay()->ShowNotification("音量 " + std::to_string(volume)); + }); + + volume_down_button_.OnLongPress([this]() { + GetAudioCodec()->SetOutputVolume(0); + GetDisplay()->ShowNotification("已静音"); + }); + } + + // 物联网初始化，添加对 AI 可见设备 + void InitializeIot() { + auto& thing_manager = iot::ThingManager::GetInstance(); + thing_manager.AddThing(iot::CreateThing("Speaker")); + } + +public: + xingzhicubetft() : + boot_button_(BOOT_BUTTON_GPIO), + volume_up_button_(VOLUME_UP_BUTTON_GPIO), + volume_down_button_(VOLUME_DOWN_BUTTON_GPIO) { + InitializeSpi(); + InitializeLcdDisplay(); + InitializeButtons(); + InitializeIot(); + } + + virtual Led* GetLed() override { + static SingleLed led(BUILTIN_LED_GPIO); + return &led; + } + + virtual AudioCodec* GetAudioCodec() override { + static NoAudioCodecSimplex audio_codec(AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE, + AUDIO_I2S_SPK_GPIO_BCLK, AUDIO_I2S_SPK_GPIO_LRCK, AUDIO_I2S_SPK_GPIO_DOUT, AUDIO_I2S_MIC_GPIO_SCK, AUDIO_I2S_MIC_GPIO_WS, AUDIO_I2S_MIC_GPIO_DIN); + return &audio_codec; + } + + virtual Display* GetDisplay() override { + return display_; + } +}; + +DECLARE_BOARD(xingzhicubetft); diff --git a/main/boards/xingzhi-cube-tft/config.h b/main/boards/xingzhi-cube-tft/config.h new file mode 100644 index 00000000..3b8e0ce7 --- /dev/null +++ b/main/boards/xingzhi-cube-tft/config.h @@ -0,0 +1,40 @@ +#ifndef _BOARD_CONFIG_H_ +#define _BOARD_CONFIG_H_ + +#include + +#define AUDIO_INPUT_SAMPLE_RATE 16000 +#define AUDIO_OUTPUT_SAMPLE_RATE 24000 + +#define AUDIO_I2S_MIC_GPIO_WS GPIO_NUM_4 +#define AUDIO_I2S_MIC_GPIO_SCK GPIO_NUM_5 +#define AUDIO_I2S_MIC_GPIO_DIN GPIO_NUM_6 +#define AUDIO_I2S_SPK_GPIO_DOUT GPIO_NUM_7 +#define AUDIO_I2S_SPK_GPIO_BCLK GPIO_NUM_15 +#define AUDIO_I2S_SPK_GPIO_LRCK GPIO_NUM_16 + +#define BUILTIN_LED_GPIO GPIO_NUM_48 +#define BOOT_BUTTON_GPIO GPIO_NUM_0 +#define TOUCH_BUTTON_GPIO GPIO_NUM_47 +#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_40 +#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_39 + +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_13 +#define DISPLAY_MOSI_PIN GPIO_NUM_10 +#define DISPLAY_CLK_PIN GPIO_NUM_9 +#define DISPLAY_DC_PIN GPIO_NUM_8 +#define DISPLAY_RST_PIN GPIO_NUM_18 +#define DISPLAY_CS_PIN GPIO_NUM_14 + +#define DISPLAY_WIDTH 240 +#define DISPLAY_HEIGHT 240 +#define DISPLAY_MIRROR_X false +#define DISPLAY_MIRROR_Y false +#define DISPLAY_SWAP_XY false +#define DISPLAY_INVERT_COLOR true +#define DISPLAY_RGB_ORDER LCD_RGB_ELEMENT_ORDER_RGB +#define DISPLAY_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 +#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false + +#endif // _BOARD_CONFIG_H_