mirror of
https://github.com/78/xiaozhi-esp32.git
synced 2026-01-13 16:57:17 +08:00
* Upgrade component version * update fonts component version * Handle OTA error code * Update project version to 2.1.0 and add device state machine implementation - Upgrade esp-wifi-connect to 3.0.0, allowing reconfiguring wifi without rebooting - Introduce device state machine with state change notification in new files - Remove obsolete device state event files - Update application logic to utilize new state machine - Minor adjustments in various board implementations for state handling * fix compile errors * Refactor power saving mode implementation to use PowerSaveLevel enumeration - Updated Application class to replace SetPowerSaveMode with SetPowerSaveLevel, allowing for LOW_POWER and PERFORMANCE settings. - Modified various board implementations to align with the new power save level structure. - Ensured consistent handling of power save levels across different board files, enhancing code maintainability and clarity. * Refactor power save level checks across multiple board implementations - Updated the condition for power save level checks in various board files to ensure that the power save timer only wakes up when the level is not set to LOW_POWER. - Improved consistency in handling power save levels, enhancing code clarity and maintainability. * Refactor EnterWifiConfigMode calls in board implementations - Updated calls to EnterWifiConfigMode to use the appropriate instance reference (self or board) across multiple board files. - Improved code consistency and clarity in handling device state during WiFi configuration mode entry. * Add cellular modem event handling and improve network status updates - Introduced new network events for cellular modem operations, including detecting, registration errors, and timeouts. - Enhanced the Application class to handle different network states and update the display status accordingly. - Refactored Ml307Board to implement a callback mechanism for network events, improving modularity and responsiveness. - Updated dual_network_board and board headers to support new network event callbacks, ensuring consistent handling across board implementations. * update esp-wifi-connect version * Update WiFi configuration tool messages across multiple board implementations to clarify user actions
234 lines
7.2 KiB
C++
234 lines
7.2 KiB
C++
#include "wifi_board.h"
|
|
#include "audio/codecs/es8311_audio_codec.h"
|
|
// Display
|
|
#include "display/display.h"
|
|
#include "display/lcd_display.h"
|
|
#include "lvgl_theme.h"
|
|
// Backlight
|
|
// PwmBacklight is declared in backlight headers pulled by display/lcd_display includes via lvgl stack
|
|
|
|
#include "application.h"
|
|
#include "button.h"
|
|
#include "config.h"
|
|
#include "esp32_camera.h"
|
|
|
|
#include <esp_log.h>
|
|
#include <inttypes.h>
|
|
#include <driver/i2c_master.h>
|
|
#include <esp_lvgl_port.h>
|
|
#include <soc/clk_tree_defs.h>
|
|
// SD card
|
|
#include <esp_vfs_fat.h>
|
|
#include <sdmmc_cmd.h>
|
|
#include <driver/sdmmc_host.h>
|
|
#include <driver/sdspi_host.h>
|
|
// SD power control (on-chip LDO)
|
|
#include "sd_pwr_ctrl_by_on_chip_ldo.h"
|
|
|
|
// MIPI-DSI / LCD vendor includes (library may replace some)
|
|
#include "esp_lcd_panel_ops.h"
|
|
#include "esp_lcd_mipi_dsi.h"
|
|
#include "esp_ldo_regulator.h"
|
|
#include "esp_lcd_ek79007.h"
|
|
#include "esp_lcd_touch_gt911.h"
|
|
|
|
// Library includes
|
|
#include "bsp/esp32_p4_function_ev_board.h"
|
|
#include "bsp/touch.h"
|
|
|
|
#define TAG "ESP32P4FuncEV"
|
|
|
|
class ESP32P4FunctionEvBoard : public WifiBoard
|
|
{
|
|
private:
|
|
i2c_master_bus_handle_t codec_i2c_bus_ = nullptr;
|
|
Button boot_button_;
|
|
LcdDisplay *display_ = nullptr;
|
|
esp_lcd_touch_handle_t tp_ = nullptr;
|
|
Esp32Camera* camera_ = nullptr;
|
|
|
|
void InitializeI2cBuses()
|
|
{
|
|
ESP_ERROR_CHECK(bsp_i2c_init());
|
|
codec_i2c_bus_ = bsp_i2c_get_handle();
|
|
}
|
|
|
|
// Touch I2C bus initialization is not required for this board (handled elsewhere)
|
|
void InitializeTouchI2cBus()
|
|
{
|
|
// No implementation needed
|
|
}
|
|
|
|
void InitializeLCD()
|
|
{
|
|
bsp_display_config_t config = {
|
|
.hdmi_resolution = BSP_HDMI_RES_NONE,
|
|
.dsi_bus = {
|
|
.phy_clk_src = (mipi_dsi_phy_clock_source_t)SOC_MOD_CLK_PLL_F20M,
|
|
.lane_bit_rate_mbps = 1000,
|
|
},
|
|
};
|
|
|
|
bsp_lcd_handles_t handles;
|
|
ESP_ERROR_CHECK(bsp_display_new_with_handles(&config, &handles));
|
|
|
|
display_ = new MipiLcdDisplay(handles.io, handles.panel, 1024, 600, 0, 0, true, true, false);
|
|
}
|
|
|
|
void InitializeButtons()
|
|
{
|
|
boot_button_.OnClick([this]()
|
|
{
|
|
auto& app = Application::GetInstance();
|
|
if (app.GetDeviceState() == kDeviceStateStarting) {
|
|
EnterWifiConfigMode();
|
|
return;
|
|
}
|
|
app.ToggleChatState();
|
|
});
|
|
}
|
|
|
|
void InitializeTouch()
|
|
{
|
|
ESP_ERROR_CHECK(bsp_touch_new(NULL, &tp_));
|
|
}
|
|
|
|
void InitializeSdCard()
|
|
{
|
|
ESP_LOGI(TAG, "Initializing SD card");
|
|
esp_err_t ret = bsp_sdcard_mount();
|
|
if (ret != ESP_OK) {
|
|
ESP_LOGE(TAG, "Failed to mount SD card: %s", esp_err_to_name(ret));
|
|
} else {
|
|
ESP_LOGI(TAG, "SD card mounted successfully");
|
|
}
|
|
}
|
|
|
|
void InitializeCamera()
|
|
{
|
|
ESP_LOGI(TAG, "Initializing camera");
|
|
|
|
// Use BSP camera initialization for ESP-P4
|
|
bsp_camera_cfg_t camera_cfg = {0};
|
|
esp_err_t ret = bsp_camera_start(&camera_cfg);
|
|
if (ret != ESP_OK) {
|
|
ESP_LOGE(TAG, "Failed to initialize BSP camera: %s", esp_err_to_name(ret));
|
|
ESP_LOGI(TAG, "Attempting alternative camera initialization");
|
|
|
|
// Alternative: Direct Esp32Camera initialization if BSP fails
|
|
// This provides more control over camera configuration
|
|
static esp_cam_ctlr_dvp_pin_config_t dvp_pin_config = {
|
|
.data_width = CAM_CTLR_DATA_WIDTH_8,
|
|
.data_io = {
|
|
[0] = BSP_I2C_SDA, // Reuse I2C pins if camera pins not defined
|
|
[1] = BSP_I2C_SCL,
|
|
[2] = GPIO_NUM_NC,
|
|
[3] = GPIO_NUM_NC,
|
|
[4] = GPIO_NUM_NC,
|
|
[5] = GPIO_NUM_NC,
|
|
[6] = GPIO_NUM_NC,
|
|
[7] = GPIO_NUM_NC,
|
|
},
|
|
.vsync_io = GPIO_NUM_NC,
|
|
.de_io = GPIO_NUM_NC,
|
|
.pclk_io = GPIO_NUM_NC,
|
|
.xclk_io = GPIO_NUM_NC,
|
|
};
|
|
|
|
esp_video_init_sccb_config_t sccb_config = {
|
|
.init_sccb = false, // Use existing I2C bus
|
|
.i2c_handle = codec_i2c_bus_, // Reuse the existing I2C bus
|
|
.freq = 100000,
|
|
};
|
|
|
|
esp_video_init_dvp_config_t dvp_config = {
|
|
.sccb_config = sccb_config,
|
|
.reset_pin = GPIO_NUM_NC,
|
|
.pwdn_pin = GPIO_NUM_NC,
|
|
.dvp_pin = dvp_pin_config,
|
|
.xclk_freq = 20000000, // 20MHz typical for cameras
|
|
};
|
|
|
|
esp_video_init_config_t video_config = {
|
|
.dvp = &dvp_config,
|
|
};
|
|
|
|
// Try to create camera with direct configuration
|
|
camera_ = new Esp32Camera(video_config);
|
|
ESP_LOGI(TAG, "Camera initialized with direct configuration");
|
|
} else {
|
|
ESP_LOGI(TAG, "Camera initialized successfully via BSP");
|
|
}
|
|
}
|
|
|
|
void InitializeFonts()
|
|
{
|
|
ESP_LOGI(TAG, "Initializing font support");
|
|
// Font initialization is handled by the Assets system
|
|
// The board supports loading fonts from assets partition
|
|
// Verify that fonts are properly loaded by checking theme
|
|
auto& theme_manager = LvglThemeManager::GetInstance();
|
|
auto current_theme = theme_manager.GetTheme("light");
|
|
if (current_theme != nullptr) {
|
|
auto text_font = current_theme->text_font();
|
|
if (text_font != nullptr && text_font->font() != nullptr) {
|
|
ESP_LOGI(TAG, "Custom font loaded successfully: line_height=%d", text_font->font()->line_height);
|
|
} else {
|
|
ESP_LOGW(TAG, "Custom font not loaded, using built-in font");
|
|
}
|
|
}
|
|
}
|
|
|
|
public:
|
|
|
|
ESP32P4FunctionEvBoard() : boot_button_(0)
|
|
{
|
|
InitializeI2cBuses();
|
|
// Audio is initialized by Es8311AudioCodec
|
|
InitializeLCD();
|
|
InitializeButtons();
|
|
InitializeTouch();
|
|
InitializeSdCard();
|
|
InitializeCamera();
|
|
InitializeFonts();
|
|
GetBacklight()->RestoreBrightness();
|
|
}
|
|
|
|
~ESP32P4FunctionEvBoard()
|
|
{
|
|
// Clean up display pointer
|
|
delete display_;
|
|
display_ = nullptr;
|
|
// Unmount SD card
|
|
esp_err_t ret = bsp_sdcard_unmount();
|
|
if (ret != ESP_OK) {
|
|
ESP_LOGE(TAG, "Failed to unmount SD card: %s", esp_err_to_name(ret));
|
|
}
|
|
// If other resources need cleanup, add here
|
|
}
|
|
|
|
virtual AudioCodec *GetAudioCodec() override
|
|
{
|
|
static Es8311AudioCodec audio_codec(
|
|
codec_i2c_bus_, (i2c_port_t)BSP_I2C_NUM, AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE,
|
|
BSP_I2S_MCLK, BSP_I2S_SCLK, BSP_I2S_LCLK, BSP_I2S_DOUT, BSP_I2S_DSIN,
|
|
BSP_POWER_AMP_IO, ES8311_CODEC_DEFAULT_ADDR, true, false);
|
|
return &audio_codec;
|
|
}
|
|
|
|
virtual Display *GetDisplay() override { return display_; }
|
|
|
|
virtual Backlight *GetBacklight() override
|
|
{
|
|
static PwmBacklight backlight(BSP_LCD_BACKLIGHT, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
|
|
return &backlight;
|
|
}
|
|
|
|
virtual Camera *GetCamera() override
|
|
{
|
|
return camera_;
|
|
}
|
|
};
|
|
|
|
DECLARE_BOARD(ESP32P4FunctionEvBoard);
|