diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 46cd3a3..69ab780 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -303,6 +303,12 @@ elseif(CONFIG_BOARD_TYPE_WAVESHARE_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_ESP32_C6_TOUCH_AMOLED_2_16) + set(MANUFACTURER "waveshare") + set(BOARD_TYPE "esp32-c6-touch-amoled-2.16") + 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_S3_TOUCH_LCD_4B) set(MANUFACTURER "waveshare") set(BOARD_TYPE "esp32-s3-touch-lcd-4b") diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index b4daf42..f807aeb 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -281,6 +281,9 @@ choice BOARD_TYPE 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_ESP32_C6_TOUCH_AMOLED_2_16 + bool "Waveshare ESP32-C6-Touch-AMOLED-2.16" + depends on IDF_TARGET_ESP32C6 config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_75 bool "Waveshare ESP32-S3-Touch-AMOLED-1.75" depends on IDF_TARGET_ESP32S3 diff --git a/main/boards/waveshare/esp32-c6-touch-amoled-2.16/README.md b/main/boards/waveshare/esp32-c6-touch-amoled-2.16/README.md new file mode 100644 index 0000000..4f2acff --- /dev/null +++ b/main/boards/waveshare/esp32-c6-touch-amoled-2.16/README.md @@ -0,0 +1,48 @@ +# 产品链接 + +[微雪电子 ESP32-C6-Touch-AMOLED-2.16](https://www.waveshare.net/shop/ESP32-C6-Touch-AMOLED-2.16.htm) + +# 编译配置命令 + +**克隆工程** + +```bash +git clone https://github.com/78/xiaozhi-esp32.git +``` + +**进入工程** + +```bash +cd xiaozhi-esp32 +``` + +**配置编译目标为 ESP32C6** + +```bash +idf.py set-target esp32c6 +``` + +**打开 menuconfig** + +```bash +idf.py menuconfig +``` + +**选择板子** + +```bash +Xiaozhi Assistant -> Board Type -> Waveshare ESP32-C6-Touch-AMOLED-2.16 +``` + +**编译** + +```ba +idf.py build +``` + +**下载并打开串口终端** + +```bash +idf.py build flash monitor +``` + diff --git a/main/boards/waveshare/esp32-c6-touch-amoled-2.16/config.h b/main/boards/waveshare/esp32-c6-touch-amoled-2.16/config.h new file mode 100644 index 0000000..3a2d1dc --- /dev/null +++ b/main/boards/waveshare/esp32-c6-touch-amoled-2.16/config.h @@ -0,0 +1,46 @@ +#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 false +#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_19 +#define AUDIO_I2S_GPIO_WS GPIO_NUM_22 +#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_20 +#define AUDIO_I2S_GPIO_DIN GPIO_NUM_21 +#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_23 + +#define AUDIO_CODEC_PA_PIN GPIO_NUM_NC +#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_8 +#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_7 +#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR +#define AUDIO_CODEC_ES7210_ADDR ES7210_CODEC_DEFAULT_ADDR + +#define BOOT_BUTTON_GPIO GPIO_NUM_9 + + +#define LCD_CS GPIO_NUM_15 +#define LCD_PCLK GPIO_NUM_0 +#define LCD_D0 GPIO_NUM_1 +#define LCD_D1 GPIO_NUM_2 +#define LCD_D2 GPIO_NUM_3 +#define LCD_D3 GPIO_NUM_4 +#define LCD_RST GPIO_NUM_NC + +#define TP_RST_GPIO GPIO_NUM_11 +#define TP_INT_GPIO GPIO_NUM_5 + +#define LCD_H_RES 480 +#define LCD_V_RES 480 + +#define DISPLAY_MIRROR_X false +#define DISPLAY_MIRROR_Y false +#define DISPLAY_SWAP_XY false + +#define DISPLAY_OFFSET_X 0 +#define DISPLAY_OFFSET_Y 0 + +#endif // _BOARD_CONFIG_H_ diff --git a/main/boards/waveshare/esp32-c6-touch-amoled-2.16/config.json b/main/boards/waveshare/esp32-c6-touch-amoled-2.16/config.json new file mode 100644 index 0000000..aff7144 --- /dev/null +++ b/main/boards/waveshare/esp32-c6-touch-amoled-2.16/config.json @@ -0,0 +1,14 @@ +{ + "manufacturer": "waveshare", + "target": "esp32c6", + "builds": [ + { + "name": "esp32-c6-touch-amoled-2.16", + "sdkconfig_append": [ + "CONFIG_USE_ESP_WAKE_WORD=y", + "CONFIG_USE_DEFAULT_MESSAGE_STYLE=y", + "CONFIG_USE_MULTILINE_CHAT_MESSAGE=y" + ] + } + ] +} \ No newline at end of file diff --git a/main/boards/waveshare/esp32-c6-touch-amoled-2.16/esp32-c6-touch-amoled-2.16.cc b/main/boards/waveshare/esp32-c6-touch-amoled-2.16/esp32-c6-touch-amoled-2.16.cc new file mode 100644 index 0000000..7053b04 --- /dev/null +++ b/main/boards/waveshare/esp32-c6-touch-amoled-2.16/esp32-c6-touch-amoled-2.16.cc @@ -0,0 +1,352 @@ +#include "display/lcd_display.h" +#include "esp_lcd_sh8601.h" +#include "wifi_board.h" + +#include "application.h" +#include "axp2101.h" +#include "button.h" +#include "codecs/box_audio_codec.h" +#include "config.h" +#include "i2c_device.h" +#include "led/single_led.h" +#include "mcp_server.h" +#include "power_save_timer.h" + +#include +#include +#include +#include +#include +#include +#include "settings.h" + +#include +#include +#include + +#define TAG "WaveshareEsp32c6TouchAMOLED2inch16" + +class Pmic : public Axp2101 { +public: + Pmic(i2c_master_bus_handle_t i2c_bus, uint8_t addr) : Axp2101(i2c_bus, addr) { + WriteReg(0x22, 0b110); // PWRON > OFFLEVEL as POWEROFF Source enable + WriteReg(0x27, 0x10); // hold 4s to power off + + // Disable All DCs but DC1 + WriteReg(0x80, 0x01); + // Disable All LDOs + WriteReg(0x90, 0x00); + WriteReg(0x91, 0x00); + + // Set DC1 to 3.3V + WriteReg(0x82, (3300 - 1500) / 100); + + // Set ALDO1 to 3.3V + WriteReg(0x92, (3300 - 500) / 100); + WriteReg(0x93, (3300 - 500) / 100); + WriteReg(0x94, (3300 - 500) / 100); + WriteReg(0x95, (3300 - 500) / 100); + + // Enable ALDO1(MIC) + WriteReg(0x90, 0x0F); + + WriteReg(0x64, 0x02); // CV charger voltage setting to 4.1V + + WriteReg(0x61, 0x02); // set Main battery precharge current to 50mA + WriteReg(0x62, 0x0A); // set Main battery charger current to 400mA ( 0x08-200mA, + // 0x09-300mA, 0x0A-400mA ) + WriteReg(0x63, 0x01); // set Main battery term charge current to 25mA + } + + void Pmic_SetAldo3(bool enable) { + uint8_t reg = ReadReg(0x90); + if (enable) { + reg |= 0x04; + } else { + reg &= ~0x04; + } + WriteReg(0x90, reg); + } + + void Pmic_SetAldo2(bool enable) { + uint8_t reg = ReadReg(0x90); + if (enable) { + reg |= 0x02; + } else { + reg &= ~0x02; + } + WriteReg(0x90, reg); + } +}; + +static const sh8601_lcd_init_cmd_t vendor_specific_init[] = { + {0x11, (uint8_t[]){0x00}, 0, 120}, + {0xC4, (uint8_t[]){0x80}, 1, 0}, + {0x44, (uint8_t[]){0x01, 0xD1}, 2, 0}, + {0x35, (uint8_t[]){0x00}, 1, 0}, + {0x36, (uint8_t[]){0xA0}, 1, 0}, + {0x53, (uint8_t[]){0x20}, 1, 10}, + {0x63, (uint8_t[]){0xFF}, 1, 10}, + {0x51, (uint8_t[]){0x00}, 1, 10}, + {0x2A, (uint8_t[]){0x00, 0x16, 0x01, 0xAF}, 4, 0}, + {0x2B, (uint8_t[]){0x00, 0x00, 0x01, 0xF5}, 4, 0}, + {0x29, (uint8_t[]){0x00}, 0, 10}, + {0x51, (uint8_t[]){0xFF}, 1, 0}, +}; + +// 在waveshare_amoled_2_16类之前添加新的显示类 +class CustomLcdDisplay : public SpiLcdDisplay { +public: + static void rounder_event_cb(lv_event_t* e) { + lv_area_t* area = (lv_area_t*)lv_event_get_param(e); + uint16_t x1 = area->x1; + uint16_t x2 = area->x2; + + uint16_t y1 = area->y1; + uint16_t y2 = area->y2; + + // round the start of coordinate down to the nearest 2M number + area->x1 = (x1 >> 1) << 1; + area->y1 = (y1 >> 1) << 1; + // round the end of coordinate up to the nearest 2N+1 number + area->x2 = ((x2 >> 1) << 1) + 1; + area->y2 = ((y2 >> 1) << 1) + 1; + } + + CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle, esp_lcd_panel_handle_t panel_handle, + int width, int height, int offset_x, int offset_y, bool mirror_x, + bool mirror_y, bool swap_xy) + : SpiLcdDisplay(io_handle, panel_handle, width, height, offset_x, offset_y, mirror_x, + mirror_y, swap_xy) {} + + virtual void SetupUI() override { + // Call parent SetupUI() first to create all lvgl objects + SpiLcdDisplay::SetupUI(); + + DisplayLockGuard lock(this); + lv_obj_set_style_pad_left(top_bar_, 60, 0); + lv_obj_set_style_pad_right(top_bar_, 60, 0); + lv_display_add_event_cb(display_, rounder_event_cb, LV_EVENT_INVALIDATE_AREA, NULL); + } +}; + +class CustomBacklight : public Backlight { +public: + CustomBacklight(esp_lcd_panel_io_handle_t panel_io) : Backlight(), panel_io_(panel_io) {} + +protected: + esp_lcd_panel_io_handle_t panel_io_; + + virtual void SetBrightnessImpl(uint8_t brightness) override { + auto display = Board::GetInstance().GetDisplay(); + DisplayLockGuard lock(display); + uint8_t data[1] = {((uint8_t)((255 * brightness) / 100))}; + int lcd_cmd = 0x51; + lcd_cmd &= 0xff; + lcd_cmd <<= 8; + lcd_cmd |= 0x02UL << 24; + esp_lcd_panel_io_tx_param(panel_io_, lcd_cmd, &data, sizeof(data)); + } +}; + +class WaveshareEsp32c6TouchAMOLED2inch16 : public WifiBoard { +private: + i2c_master_bus_handle_t i2c_bus_; + Pmic* pmic_ = nullptr; + Button boot_button_; + CustomLcdDisplay* display_; + CustomBacklight* backlight_; + PowerSaveTimer* power_save_timer_; + + void InitializePowerSaveTimer() { + power_save_timer_ = new PowerSaveTimer(-1, 120, 1200); + power_save_timer_->OnEnterSleepMode([this]() { + GetDisplay()->SetPowerSaveMode(true); + GetBacklight()->SetBrightness(20); + }); + power_save_timer_->OnExitSleepMode([this]() { + GetDisplay()->SetPowerSaveMode(false); + GetBacklight()->RestoreBrightness(); + }); + power_save_timer_->OnShutdownRequest([this]() { pmic_->PowerOff(); }); + power_save_timer_->SetEnabled(true); + } + + void InitializeCodecI2c() { + // Initialize I2C peripheral + i2c_master_bus_config_t i2c_bus_cfg = { + .i2c_port = I2C_NUM_0, + .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN, + .scl_io_num = AUDIO_CODEC_I2C_SCL_PIN, + .clk_source = I2C_CLK_SRC_DEFAULT, + .flags = + { + .enable_internal_pullup = 1, + }, + }; + ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_)); + } + + void InitializeAxp2101() { + ESP_LOGI(TAG, "Init AXP2101"); + pmic_ = new Pmic(i2c_bus_, 0x34); + } + + void InitializeSpi() { + spi_bus_config_t buscfg = {}; + buscfg.sclk_io_num = LCD_PCLK; + buscfg.data0_io_num = LCD_D0; + buscfg.data1_io_num = LCD_D1; + buscfg.data2_io_num = LCD_D2; + buscfg.data3_io_num = LCD_D3; + buscfg.max_transfer_sz = LCD_H_RES * LCD_V_RES * sizeof(uint16_t); + ESP_ERROR_CHECK(spi_bus_initialize(SPI2_HOST, &buscfg, SPI_DMA_CH_AUTO)); + } + + void InitializeButtons() { + boot_button_.OnClick([this]() { + auto& app = Application::GetInstance(); + if (app.GetDeviceState() == kDeviceStateStarting) { + EnterWifiConfigMode(); + return; + } + app.ToggleChatState(); + }); + } + + int DisplayPort_DispReset() { + pmic_->Pmic_SetAldo3(1); + vTaskDelay(pdMS_TO_TICKS(100)); + pmic_->Pmic_SetAldo3(0); + vTaskDelay(pdMS_TO_TICKS(100)); + pmic_->Pmic_SetAldo3(1); + vTaskDelay(pdMS_TO_TICKS(100)); + return ESP_OK; + } + + void InitializeSH8601Display() { + 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 = + SH8601_PANEL_IO_QSPI_CONFIG(LCD_CS, nullptr, nullptr); + ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI2_HOST, &io_config, &panel_io)); + + // 初始化液晶屏驱动芯片 + ESP_LOGD(TAG, "Install LCD driver"); + const sh8601_vendor_config_t vendor_config = { + .init_cmds = &vendor_specific_init[0], + .init_cmds_size = sizeof(vendor_specific_init) / sizeof(sh8601_lcd_init_cmd_t), + .flags = { + .use_qspi_interface = 1, + }}; + + esp_lcd_panel_dev_config_t panel_config = {}; + panel_config.reset_gpio_num = LCD_RST; + panel_config.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB; + panel_config.bits_per_pixel = 16; + panel_config.vendor_config = (void*)&vendor_config; + ESP_ERROR_CHECK(esp_lcd_new_panel_sh8601(panel_io, &panel_config, &panel)); + ESP_ERROR_CHECK(DisplayPort_DispReset()); + ESP_ERROR_CHECK(esp_lcd_panel_init(panel)); + display_ = new CustomLcdDisplay(panel_io, panel, LCD_H_RES, LCD_V_RES, DISPLAY_OFFSET_X, + DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, + DISPLAY_SWAP_XY); + backlight_ = new CustomBacklight(panel_io); + backlight_->RestoreBrightness(); + } + + void InitializeTouch() { + esp_lcd_touch_handle_t tp; + esp_lcd_touch_config_t tp_cfg = { + .x_max = LCD_H_RES - 1, + .y_max = LCD_V_RES - 1, + .rst_gpio_num = TP_RST_GPIO, + .int_gpio_num = TP_INT_GPIO, + .levels = + { + .reset = 0, + .interrupt = 0, + }, + .flags = + { + .swap_xy = 1, + .mirror_x = 0, + .mirror_y = 1, + }, + }; + 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_CST9217_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_cst9217(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 InitializeTools() { + auto& mcp_server = McpServer::GetInstance(); + mcp_server.AddTool("self.system.reconfigure_wifi", + "End this conversation and enter WiFi configuration mode.\n" + "**CAUTION** You must ask the user to confirm this action.", + PropertyList(), [this](const PropertyList& properties) { + EnterWifiConfigMode(); + return true; + }); + } + +public: + WaveshareEsp32c6TouchAMOLED2inch16() : boot_button_(BOOT_BUTTON_GPIO) { + InitializePowerSaveTimer(); + InitializeCodecI2c(); + InitializeAxp2101(); + InitializeSpi(); + InitializeSH8601Display(); + InitializeTouch(); + InitializeButtons(); + InitializeTools(); + } + + 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 Backlight* GetBacklight() override { return backlight_; } + + virtual bool GetBatteryLevel(int& level, bool& charging, bool& discharging) override { + static bool last_discharging = false; + charging = pmic_->IsCharging(); + discharging = pmic_->IsDischarging(); + if (discharging != last_discharging) { + power_save_timer_->SetEnabled(discharging); + last_discharging = discharging; + } + + level = pmic_->GetBatteryLevel(); + return true; + } + + virtual void SetPowerSaveLevel(PowerSaveLevel level) override { + if (level != PowerSaveLevel::LOW_POWER) { + power_save_timer_->WakeUp(); + } + WifiBoard::SetPowerSaveLevel(level); + } +}; + +DECLARE_BOARD(WaveshareEsp32c6TouchAMOLED2inch16);