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
60 lines
1.8 KiB
C++
60 lines
1.8 KiB
C++
#ifndef DUAL_NETWORK_BOARD_H
|
||
#define DUAL_NETWORK_BOARD_H
|
||
|
||
#include "board.h"
|
||
#include "wifi_board.h"
|
||
#include "ml307_board.h"
|
||
#include <memory>
|
||
|
||
//enum NetworkType
|
||
enum class NetworkType {
|
||
WIFI,
|
||
ML307
|
||
};
|
||
|
||
// 双网络板卡类，可以在WiFi和ML307之间切换
|
||
class DualNetworkBoard : public Board {
|
||
private:
|
||
// 使用基类指针存储当前活动的板卡
|
||
std::unique_ptr<Board> current_board_;
|
||
NetworkType network_type_ = NetworkType::ML307; // Default to ML307
|
||
|
||
// ML307的引脚配置
|
||
gpio_num_t ml307_tx_pin_;
|
||
gpio_num_t ml307_rx_pin_;
|
||
gpio_num_t ml307_dtr_pin_;
|
||
|
||
// 从Settings加载网络类型
|
||
NetworkType LoadNetworkTypeFromSettings(int32_t default_net_type);
|
||
|
||
// 保存网络类型到Settings
|
||
void SaveNetworkTypeToSettings(NetworkType type);
|
||
|
||
// 初始化当前网络类型对应的板卡
|
||
void InitializeCurrentBoard();
|
||
|
||
public:
|
||
DualNetworkBoard(gpio_num_t ml307_tx_pin, gpio_num_t ml307_rx_pin, gpio_num_t ml307_dtr_pin = GPIO_NUM_NC, int32_t default_net_type = 1);
|
||
virtual ~DualNetworkBoard() = default;
|
||
|
||
// 切换网络类型
|
||
void SwitchNetworkType();
|
||
|
||
// 获取当前网络类型
|
||
NetworkType GetNetworkType() const { return network_type_; }
|
||
|
||
// 获取当前活动的板卡引用
|
||
Board& GetCurrentBoard() const { return *current_board_; }
|
||
|
||
// 重写Board接口
|
||
virtual std::string GetBoardType() override;
|
||
virtual void StartNetwork() override;
|
||
virtual void SetNetworkEventCallback(NetworkEventCallback callback) override;
|
||
virtual NetworkInterface* GetNetwork() override;
|
||
virtual const char* GetNetworkStateIcon() override;
|
||
virtual void SetPowerSaveLevel(PowerSaveLevel level) override;
|
||
virtual std::string GetBoardJson() override;
|
||
virtual std::string GetDeviceStatusJson() override;
|
||
};
|
||
|
||
#endif // DUAL_NETWORK_BOARD_H
|