mirror of
https://github.com/78/xiaozhi-esp32.git
synced 2026-07-21 02:05:52 +00:00
3e78cd73bd
* Migrate board builds to ESP-IDF 6.0.1 * Document upstream IDF 6 CI blockers * Use IDF 6 patched registry components * Fix board-specific ESP-IDF 6 build errors * Fix remaining ESP-IDF 6 board builds * Document final ESP-IDF 6 matrix results [skip ci] * update IDF 6 component releases * rebase IDF 6 migration and use upstream SSCMA * Enhance audio input management in AudioService - Introduced AS_EVENT_AUDIO_INPUT_STOP_REQUEST to manage audio input stopping more effectively. - Updated AudioService::Start() to clear the new stop request event. - Modified AudioService::AudioInputTask() to handle the stop request and ensure proper input disabling. - Adjusted AdcPdmAudioCodec::Start() to reflect lazy input opening, ensuring start/stop operations run in the same task. * Refactor audio codec management and configuration - Added output_device_opened_ flag to track the state of the output device in Es8388 and Es8389 codecs. - Updated EnableOutput method to prevent unnecessary device reopening and added mute functionality to manage audio output more effectively. - Enhanced error handling in Es8311AudioCodec by ensuring proper closure and deletion of the codec device. - Adjusted sample rates in board configurations for atk-dnesp32s3-box2 to 24000 Hz and introduced AUDIO_CODEC_USE_MCLK for improved clock management. * Update build configurations and documentation for ESP-IDF 6 compatibility - Added container specification for the build workflow using espressif/idf:v6.0.1. - Updated the version of the espressif/esp_video component to ^2.3.0. - Enhanced documentation to clarify the support status of ESP32-P4 variants, specifying that legacy Rev < 3 variants are excluded from the IDF 6 matrix. - Adjusted board configurations to include IDF version constraints and necessary SDK configurations for legacy support. - Improved handling of YUV formats in EspVideo to maintain compatibility with previous versions. * Implement playback drained event handling in Application - Added MAIN_EVENT_PLAYBACK_DRAINED to manage playback state transitions. - Introduced callbacks for playback drained events in AudioService to trigger listening state changes. - Refactored Application::Run() to handle deferred listening start based on playback queue status. - Enhanced audio processing logic to prevent audio truncation during state changes. - Updated related methods to ensure proper wake word detection configuration during listening mode. * Fix variant selection shell in CI * Update project version to 2.4.0 and adjust component dependencies - Bump project version in CMakeLists.txt to 2.4.0. - Change espressif/esp_video component version to ^2.0.1 in idf_component.yml. - Modify AUDIO_INPUT_REFERENCE setting in config.h to false for m5stack-core-s3. - Remove unnecessary infinite loops in xmini_c3_board.cc during initialization. --------- Co-authored-by: Xiaoxia <terrence.huang@tenclass.com>
240 lines
8.1 KiB
C++
240 lines
8.1 KiB
C++
#include "wifi_board.h"
|
|
#include "codecs/box_audio_codec.h"
|
|
#include "display/lcd_display.h"
|
|
#include "application.h"
|
|
#include "button.h"
|
|
#include "led/single_led.h"
|
|
#include "pin_config.h"
|
|
#include "esp_video.h"
|
|
|
|
#include "config.h"
|
|
|
|
#include <esp_log.h>
|
|
#include <driver/i2c_master.h>
|
|
#include "esp_lcd_gc9503.h"
|
|
#include <esp_lcd_panel_io.h>
|
|
#include <esp_lcd_panel_ops.h>
|
|
#include <esp_lcd_panel_io_additions.h>
|
|
|
|
#include "esp_io_expander_tca9554.h"
|
|
|
|
#define TAG "ESP_S3_LCD_EV_Board"
|
|
|
|
class ESP_S3_LCD_EV_Board : public WifiBoard {
|
|
private:
|
|
i2c_master_bus_handle_t codec_i2c_bus_;
|
|
Button boot_button_;
|
|
LcdDisplay* display_;
|
|
EspVideo* camera_;
|
|
|
|
//add support ev board lcd
|
|
esp_io_expander_handle_t expander = NULL;
|
|
|
|
void InitializeRGB_GC9503V_Display() {
|
|
ESP_LOGI(TAG, "Init GC9503V");
|
|
|
|
esp_lcd_panel_io_handle_t panel_io = nullptr;
|
|
|
|
//add support ev board lcd
|
|
gpio_config_t io_conf = {
|
|
.pin_bit_mask = BIT64(GC9503V_PIN_NUM_VSYNC),
|
|
.mode = GPIO_MODE_OUTPUT,
|
|
.pull_up_en = GPIO_PULLUP_ENABLE,
|
|
};
|
|
|
|
gpio_config(&io_conf);
|
|
gpio_set_level(GC9503V_PIN_NUM_VSYNC, 1);
|
|
|
|
ESP_LOGI(TAG, "Install 3-wire SPI panel IO");
|
|
spi_line_config_t line_config = {
|
|
.cs_io_type = IO_TYPE_EXPANDER,
|
|
.cs_expander_pin = GC9503V_LCD_IO_SPI_CS_1,
|
|
.scl_io_type = IO_TYPE_EXPANDER,
|
|
.scl_expander_pin = GC9503V_LCD_IO_SPI_SCL_1,
|
|
.sda_io_type = IO_TYPE_EXPANDER,
|
|
.sda_expander_pin = GC9503V_LCD_IO_SPI_SDO_1,
|
|
.io_expander = expander,
|
|
};
|
|
|
|
esp_lcd_panel_io_3wire_spi_config_t io_config = GC9503_PANEL_IO_3WIRE_SPI_CONFIG(line_config, 0);
|
|
int espok = esp_lcd_new_panel_io_3wire_spi(&io_config, &panel_io);
|
|
ESP_LOGI(TAG, "Install 3-wire SPI panel IO:%d",espok);
|
|
|
|
ESP_LOGI(TAG, "Install RGB LCD panel driver");
|
|
esp_lcd_panel_handle_t panel_handle = NULL;
|
|
esp_lcd_rgb_panel_config_t rgb_config = {
|
|
.clk_src = LCD_CLK_SRC_PLL160M,
|
|
//.timings = GC9503_376_960_PANEL_60HZ_RGB_TIMING(),
|
|
//add support ev board
|
|
.timings = GC9503_480_480_PANEL_60HZ_RGB_TIMING(),
|
|
.data_width = 16, // RGB565 in parallel mode, thus 16bit in width
|
|
.in_color_format = LCD_COLOR_FMT_RGB565,
|
|
.out_color_format = LCD_COLOR_FMT_RGB565,
|
|
.num_fbs = GC9503V_LCD_RGB_BUFFER_NUMS,
|
|
.bounce_buffer_size_px = GC9503V_LCD_H_RES * GC9503V_LCD_RGB_BOUNCE_BUFFER_HEIGHT,
|
|
.dma_burst_size = 64,
|
|
.hsync_gpio_num = GC9503V_PIN_NUM_HSYNC,
|
|
.vsync_gpio_num = GC9503V_PIN_NUM_VSYNC,
|
|
.de_gpio_num = GC9503V_PIN_NUM_DE,
|
|
.pclk_gpio_num = GC9503V_PIN_NUM_PCLK,
|
|
.disp_gpio_num = GC9503V_PIN_NUM_DISP_EN,
|
|
.data_gpio_nums = {
|
|
GC9503V_PIN_NUM_DATA0,
|
|
GC9503V_PIN_NUM_DATA1,
|
|
GC9503V_PIN_NUM_DATA2,
|
|
GC9503V_PIN_NUM_DATA3,
|
|
GC9503V_PIN_NUM_DATA4,
|
|
GC9503V_PIN_NUM_DATA5,
|
|
GC9503V_PIN_NUM_DATA6,
|
|
GC9503V_PIN_NUM_DATA7,
|
|
GC9503V_PIN_NUM_DATA8,
|
|
GC9503V_PIN_NUM_DATA9,
|
|
GC9503V_PIN_NUM_DATA10,
|
|
GC9503V_PIN_NUM_DATA11,
|
|
GC9503V_PIN_NUM_DATA12,
|
|
GC9503V_PIN_NUM_DATA13,
|
|
GC9503V_PIN_NUM_DATA14,
|
|
GC9503V_PIN_NUM_DATA15,
|
|
},
|
|
.flags= {
|
|
.fb_in_psram = true, // allocate frame buffer in PSRAM
|
|
}
|
|
};
|
|
|
|
ESP_LOGI(TAG, "Initialize RGB LCD panel");
|
|
|
|
gc9503_vendor_config_t vendor_config = {
|
|
.rgb_config = &rgb_config,
|
|
.flags = {
|
|
.mirror_by_cmd = 0,
|
|
.auto_del_panel_io = 1,
|
|
},
|
|
};
|
|
esp_lcd_panel_dev_config_t panel_config = {};
|
|
panel_config.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB;
|
|
// The GC9503V accepts 18-bit panel data while the RGB framebuffer is RGB565.
|
|
panel_config.bits_per_pixel = 18;
|
|
panel_config.reset_gpio_num = GPIO_NUM_NC;
|
|
panel_config.vendor_config = &vendor_config;
|
|
(esp_lcd_new_panel_gc9503(panel_io, &panel_config, &panel_handle));
|
|
(esp_lcd_panel_reset(panel_handle));
|
|
(esp_lcd_panel_init(panel_handle));
|
|
|
|
display_ = new RgbLcdDisplay(panel_io, panel_handle,
|
|
DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X,
|
|
DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
|
|
}
|
|
|
|
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,
|
|
.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_));
|
|
|
|
//add support ev board lcd amp
|
|
//初始化扩展io口
|
|
esp_io_expander_new_i2c_tca9554(codec_i2c_bus_, 0x20, &expander);
|
|
/* Setup power amplifier pin, set default to enable */
|
|
esp_io_expander_set_dir(expander, BSP_POWER_AMP_IO, IO_EXPANDER_OUTPUT);
|
|
esp_io_expander_set_level(expander, BSP_POWER_AMP_IO, true);
|
|
|
|
}
|
|
|
|
void InitializeButtons() {
|
|
boot_button_.OnClick([this]() {
|
|
auto& app = Application::GetInstance();
|
|
if (app.GetDeviceState() == kDeviceStateStarting) {
|
|
EnterWifiConfigMode();
|
|
return;
|
|
}
|
|
});
|
|
boot_button_.OnPressDown([this]() {
|
|
Application::GetInstance().StartListening();
|
|
});
|
|
boot_button_.OnPressUp([this]() {
|
|
Application::GetInstance().StopListening();
|
|
});
|
|
}
|
|
|
|
#ifdef CONFIG_ESP_VIDEO_ENABLE_USB_UVC_VIDEO_DEVICE
|
|
void InitializeCamera() {
|
|
esp_video_init_usb_uvc_config_t usb_uvc_config = {
|
|
.uvc = {
|
|
.uvc_dev_num = 1,
|
|
.task_stack = 4096,
|
|
.task_priority = 5,
|
|
.task_affinity = -1,
|
|
},
|
|
.usb = {
|
|
.init_usb_host_lib = true,
|
|
.task_stack = 4096,
|
|
.task_priority = 5,
|
|
.task_affinity = -1,
|
|
},
|
|
};
|
|
|
|
esp_video_init_config_t video_config = {
|
|
.usb_uvc = &usb_uvc_config,
|
|
};
|
|
|
|
camera_ = new EspVideo(video_config);
|
|
}
|
|
#endif // CONFIG_ESP_VIDEO_ENABLE_USB_UVC_VIDEO_DEVICE
|
|
|
|
public:
|
|
ESP_S3_LCD_EV_Board() : boot_button_(BOOT_BUTTON_GPIO) {
|
|
InitializeCodecI2c();
|
|
InitializeButtons();
|
|
InitializeRGB_GC9503V_Display();
|
|
#ifdef CONFIG_ESP_VIDEO_ENABLE_USB_UVC_VIDEO_DEVICE
|
|
InitializeCamera();
|
|
#endif // CONFIG_ESP_VIDEO_ENABLE_USB_UVC_VIDEO_DEVICE
|
|
}
|
|
|
|
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,
|
|
GPIO_NUM_NC,
|
|
AUDIO_CODEC_ES8311_ADDR,
|
|
AUDIO_CODEC_ES7210_ADDR,
|
|
true);
|
|
return &audio_codec;
|
|
}
|
|
|
|
virtual Display* GetDisplay() override {
|
|
return display_;
|
|
}
|
|
|
|
//添加彩灯显示状态，如果亮度太暗可以去更改默认亮度值 DEFAULT_BRIGHTNESS 在led的sigle_led.cc中
|
|
virtual Led* GetLed() override {
|
|
static SingleLed led(BUILTIN_LED_GPIO);
|
|
return &led;
|
|
}
|
|
|
|
#ifdef CONFIG_ESP_VIDEO_ENABLE_USB_UVC_VIDEO_DEVICE
|
|
virtual Camera* GetCamera() override {
|
|
return camera_;
|
|
}
|
|
#endif // CONFIG_ESP_VIDEO_ENABLE_USB_UVC_VIDEO_DEVICE
|
|
|
|
};
|
|
|
|
DECLARE_BOARD(ESP_S3_LCD_EV_Board);
|