mirror of
https://github.com/78/xiaozhi-esp32.git
synced 2026-07-21 02:05:52 +00:00
* 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>
152 lines
5.1 KiB
C++
152 lines
5.1 KiB
C++
#include <driver/i2c_master.h>
|
|
#include <esp_lcd_panel_ops.h>
|
|
#include <esp_lcd_panel_vendor.h>
|
|
#include <esp_log.h>
|
|
|
|
#include "application.h"
|
|
#include "assets/lang_config.h"
|
|
#include "boards/common/wifi_board.h"
|
|
#include "button.h"
|
|
#include "codecs/no_audio_codec.h"
|
|
#include "config.h"
|
|
#include "display/oled_display.h"
|
|
#include "lamp_controller.h"
|
|
#include "led/single_led.h"
|
|
#include "mcp_server.h"
|
|
#include "system_reset.h"
|
|
|
|
#define TAG "Hu087Board"
|
|
|
|
class Hu087Board : public WifiBoard {
|
|
private:
|
|
i2c_master_bus_handle_t display_i2c_bus_;
|
|
esp_lcd_panel_io_handle_t panel_io_ = nullptr;
|
|
esp_lcd_panel_handle_t panel_ = nullptr;
|
|
Display* display_ = nullptr;
|
|
Button touch_button_;
|
|
|
|
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,
|
|
.scl_speed_hz = 400 * 1000,
|
|
.control_phase_bytes = 1,
|
|
.dc_bit_offset = 6,
|
|
.lcd_cmd_bits = 8,
|
|
.lcd_param_bits = 8,
|
|
.on_color_trans_done = nullptr,
|
|
.user_ctx = nullptr,
|
|
.flags =
|
|
{
|
|
.dc_low_on_data = 0,
|
|
.disable_control_phase = 0,
|
|
},
|
|
};
|
|
|
|
ESP_ERROR_CHECK(
|
|
esp_lcd_new_panel_io_i2c(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 = GPIO_NUM_NC;
|
|
panel_config.bits_per_pixel = 1;
|
|
|
|
esp_lcd_panel_ssd1306_config_t ssd1306_config = {
|
|
.height = static_cast<uint8_t>(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 initializeAmpCtrl() {
|
|
gpio_config_t io_conf = {
|
|
.pin_bit_mask = (1ULL << AUDIO_I2S_SPK_GPIO_CTLR), // Select GPIO 2
|
|
.mode = GPIO_MODE_OUTPUT, // Set as output
|
|
.pull_up_en = GPIO_PULLUP_ENABLE, // Disable pull-up
|
|
.pull_down_en = GPIO_PULLDOWN_DISABLE, // Disable pull-down
|
|
.intr_type = GPIO_INTR_DISABLE // Disable interrupts
|
|
};
|
|
gpio_config(&io_conf);
|
|
gpio_set_level(AUDIO_I2S_SPK_GPIO_CTLR, 1);
|
|
};
|
|
|
|
void InitializeButtons() {
|
|
touch_button_.OnClick([this]() {
|
|
auto& app = Application::GetInstance();
|
|
if (app.GetDeviceState() == kDeviceStateStarting) {
|
|
EnterWifiConfigMode();
|
|
return;
|
|
}
|
|
app.ToggleChatState();
|
|
});
|
|
|
|
touch_button_.OnLongPress([this]() {
|
|
auto codec = GetAudioCodec();
|
|
auto volume = codec->output_volume() + 10;
|
|
if (volume > 100) {
|
|
volume = 100;
|
|
} // Need to implement logic to lower volume
|
|
codec->SetOutputVolume(volume);
|
|
GetDisplay()->ShowNotification(Lang::Strings::VOLUME +
|
|
std::to_string(volume));
|
|
});
|
|
}
|
|
|
|
public:
|
|
Hu087Board() : touch_button_(TOUCH_BUTTON_GPIO) {
|
|
InitializeDisplayI2c();
|
|
InitializeSsd1306Display();
|
|
InitializeButtons();
|
|
initializeAmpCtrl(); // Could control the amp ctrl pin throught voice
|
|
// detection i guess
|
|
}
|
|
|
|
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, I2S_STD_SLOT_RIGHT, AUDIO_I2S_MIC_GPIO_SCK,
|
|
AUDIO_I2S_MIC_GPIO_WS, AUDIO_I2S_MIC_GPIO_DIN, I2S_STD_SLOT_RIGHT);
|
|
return &audio_codec;
|
|
}
|
|
|
|
virtual Display* GetDisplay() override { return display_; }
|
|
};
|
|
|
|
DECLARE_BOARD(Hu087Board);
|