devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

fix: fix esp_afe_sr_iface_t compile error (#1423)

Browse Source 
* fix: fix esp_afe_sr_iface_t compile error

* fix: fix `MIPI_DSI_PHY_CLK_SRC_DEFAULT` compile error in IDF 5.5.2
This commit is contained in:
laride
2025-11-13 20:05:42 +08:00
committed by GitHub
parent 30970abd1f
commit 92de37e182
7 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/audio/processors/afe_audio_processor.h
View File

@@ -30,7 +30,7 @@ public:
private: private:
EventGroupHandle_t event_group_ = nullptr; EventGroupHandle_t event_group_ = nullptr;
esp_afe_sr_iface_t* afe_iface_ = nullptr; const esp_afe_sr_iface_t* afe_iface_ = nullptr;
esp_afe_sr_data_t* afe_data_ = nullptr; esp_afe_sr_data_t* afe_data_ = nullptr;
std::function<void(std::vector<int16_t>&& data)> output_callback_; std::function<void(std::vector<int16_t>&& data)> output_callback_;
std::function<void(bool speaking)> vad_state_change_callback_; std::function<void(bool speaking)> vad_state_change_callback_;

2
main/audio/wake_words/afe_wake_word.h
View File

@@ -36,7 +36,7 @@ public:
private: private:
srmodel_list_t *models_ = nullptr; srmodel_list_t *models_ = nullptr;
esp_afe_sr_iface_t* afe_iface_ = nullptr; const esp_afe_sr_iface_t* afe_iface_ = nullptr;
esp_afe_sr_data_t* afe_data_ = nullptr; esp_afe_sr_data_t* afe_data_ = nullptr;
char* wakenet_model_ = NULL; char* wakenet_model_ = NULL;
std::vector<std::string> wake_words_; std::vector<std::string> wake_words_;

1
main/boards/lilygo-t-display-p4/lilygo-t-display-p4.cc
View File

@@ -165,7 +165,6 @@ public:
esp_lcd_dsi_bus_config_t bus_config = { esp_lcd_dsi_bus_config_t bus_config = {
.bus_id = 0, .bus_id = 0,
.num_data_lanes = SCREEN_DATA_LANE_NUM, .num_data_lanes = SCREEN_DATA_LANE_NUM,
.phy_clk_src = MIPI_DSI_PHY_CLK_SRC_DEFAULT,
.lane_bit_rate_mbps = SCREEN_LANE_BIT_RATE_MBPS, .lane_bit_rate_mbps = SCREEN_LANE_BIT_RATE_MBPS,
}; };
esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus); esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus);

1
main/boards/m5stack-tab5/esp_lcd_st7123.h
View File

@@ -75,7 +75,6 @@
{ \ { \
.bus_id = 0, \ .bus_id = 0, \
.num_data_lanes = 2, \ .num_data_lanes = 2, \
.phy_clk_src = MIPI_DSI_PHY_CLK_SRC_DEFAULT, \
.lane_bit_rate_mbps = 1000, \ .lane_bit_rate_mbps = 1000, \
} }

2
main/boards/m5stack-tab5/m5stack_tab5.cc
View File

@@ -198,7 +198,6 @@ private:
esp_lcd_dsi_bus_config_t bus_config = { esp_lcd_dsi_bus_config_t bus_config = {
.bus_id = 0, .bus_id = 0,
.num_data_lanes = 2, .num_data_lanes = 2,
.phy_clk_src = MIPI_DSI_PHY_CLK_SRC_DEFAULT,
.lane_bit_rate_mbps = 900, // 900MHz .lane_bit_rate_mbps = 900, // 900MHz
}; };
ESP_ERROR_CHECK(esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus)); ESP_ERROR_CHECK(esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus));
@@ -283,7 +282,6 @@ private:
/* create MIPI DSI bus first, it will initialize the DSI PHY as well */ /* create MIPI DSI bus first, it will initialize the DSI PHY as well */
bus_config.bus_id = 0; bus_config.bus_id = 0;
bus_config.num_data_lanes = 2; // ST7123 uses 2 data lanes bus_config.num_data_lanes = 2; // ST7123 uses 2 data lanes
bus_config.phy_clk_src = MIPI_DSI_PHY_CLK_SRC_DEFAULT;
bus_config.lane_bit_rate_mbps = 965; // ST7123 lane bitrate bus_config.lane_bit_rate_mbps = 965; // ST7123 lane bitrate
ret = esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus); ret = esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus);
if (ret != ESP_OK) { if (ret != ESP_OK) {

1
main/boards/waveshare-p4-wifi6-touch-lcd-7b/esp32-p4-wifi6-touch-lcd-7b.cc
View File

@@ -66,7 +66,6 @@ private:
esp_lcd_dsi_bus_config_t bus_config = { esp_lcd_dsi_bus_config_t bus_config = {
.bus_id = 0, .bus_id = 0,
.num_data_lanes = 2, .num_data_lanes = 2,
.phy_clk_src = MIPI_DSI_PHY_CLK_SRC_DEFAULT,
.lane_bit_rate_mbps = 900, .lane_bit_rate_mbps = 900,
}; };
esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus); esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus);

1
main/boards/wireless-tag-wtp4c5mp07s/wireless-tag-wtp4c5mp07s.cc
View File

@@ -73,7 +73,6 @@ private:
esp_lcd_dsi_bus_config_t bus_config = { esp_lcd_dsi_bus_config_t bus_config = {
.bus_id = 0, .bus_id = 0,
.num_data_lanes = 2, .num_data_lanes = 2,
.phy_clk_src = MIPI_DSI_PHY_CLK_SRC_DEFAULT,
.lane_bit_rate_mbps = 900, .lane_bit_rate_mbps = 900,
}; };
esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus); esp_lcd_new_dsi_bus(&bus_config, &mipi_dsi_bus);