forked from xiaozhi/xiaozhi-esp32
b7db68457c
* 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
99 lines
3.1 KiB
C++
99 lines
3.1 KiB
C++
#include "dual_network_board.h"
|
|
#include "application.h"
|
|
#include "display.h"
|
|
#include "assets/lang_config.h"
|
|
#include "settings.h"
|
|
#include <esp_log.h>
|
|
|
|
static const char *TAG = "DualNetworkBoard";
|
|
|
|
DualNetworkBoard::DualNetworkBoard(gpio_num_t ml307_tx_pin, gpio_num_t ml307_rx_pin, gpio_num_t ml307_dtr_pin, int32_t default_net_type)
|
|
: Board(),
|
|
ml307_tx_pin_(ml307_tx_pin),
|
|
ml307_rx_pin_(ml307_rx_pin),
|
|
ml307_dtr_pin_(ml307_dtr_pin) {
|
|
|
|
// 从Settings加载网络类型
|
|
network_type_ = LoadNetworkTypeFromSettings(default_net_type);
|
|
|
|
// 只初始化当前网络类型对应的板卡
|
|
InitializeCurrentBoard();
|
|
}
|
|
|
|
NetworkType DualNetworkBoard::LoadNetworkTypeFromSettings(int32_t default_net_type) {
|
|
Settings settings("network", true);
|
|
int network_type = settings.GetInt("type", default_net_type); // 默认使用ML307 (1)
|
|
return network_type == 1 ? NetworkType::ML307 : NetworkType::WIFI;
|
|
}
|
|
|
|
void DualNetworkBoard::SaveNetworkTypeToSettings(NetworkType type) {
|
|
Settings settings("network", true);
|
|
int network_type = (type == NetworkType::ML307) ? 1 : 0;
|
|
settings.SetInt("type", network_type);
|
|
}
|
|
|
|
void DualNetworkBoard::InitializeCurrentBoard() {
|
|
if (network_type_ == NetworkType::ML307) {
|
|
ESP_LOGI(TAG, "Initialize ML307 board");
|
|
current_board_ = std::make_unique<Ml307Board>(ml307_tx_pin_, ml307_rx_pin_, ml307_dtr_pin_);
|
|
} else {
|
|
ESP_LOGI(TAG, "Initialize WiFi board");
|
|
current_board_ = std::make_unique<WifiBoard>();
|
|
}
|
|
}
|
|
|
|
void DualNetworkBoard::SwitchNetworkType() {
|
|
auto display = GetDisplay();
|
|
if (network_type_ == NetworkType::WIFI) {
|
|
SaveNetworkTypeToSettings(NetworkType::ML307);
|
|
display->ShowNotification(Lang::Strings::SWITCH_TO_4G_NETWORK);
|
|
} else {
|
|
SaveNetworkTypeToSettings(NetworkType::WIFI);
|
|
display->ShowNotification(Lang::Strings::SWITCH_TO_WIFI_NETWORK);
|
|
}
|
|
vTaskDelay(pdMS_TO_TICKS(1000));
|
|
auto& app = Application::GetInstance();
|
|
app.Reboot();
|
|
}
|
|
|
|
|
|
std::string DualNetworkBoard::GetBoardType() {
|
|
return current_board_->GetBoardType();
|
|
}
|
|
|
|
void DualNetworkBoard::StartNetwork() {
|
|
auto display = Board::GetInstance().GetDisplay();
|
|
|
|
if (network_type_ == NetworkType::WIFI) {
|
|
display->SetStatus(Lang::Strings::CONNECTING);
|
|
} else {
|
|
display->SetStatus(Lang::Strings::DETECTING_MODULE);
|
|
}
|
|
current_board_->StartNetwork();
|
|
}
|
|
|
|
void DualNetworkBoard::SetNetworkEventCallback(NetworkEventCallback callback) {
|
|
// Forward the callback to the current board
|
|
current_board_->SetNetworkEventCallback(std::move(callback));
|
|
}
|
|
|
|
NetworkInterface* DualNetworkBoard::GetNetwork() {
|
|
return current_board_->GetNetwork();
|
|
}
|
|
|
|
const char* DualNetworkBoard::GetNetworkStateIcon() {
|
|
return current_board_->GetNetworkStateIcon();
|
|
}
|
|
|
|
void DualNetworkBoard::SetPowerSaveLevel(PowerSaveLevel level) {
|
|
current_board_->SetPowerSaveLevel(level);
|
|
}
|
|
|
|
std::string DualNetworkBoard::GetBoardJson() {
|
|
return current_board_->GetBoardJson();
|
|
}
|
|
|
|
std::string DualNetworkBoard::GetDeviceStatusJson() {
|
|
return current_board_->GetDeviceStatusJson();
|
|
}
|