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
59 lines
2.1 KiB
C++
59 lines
2.1 KiB
C++
#ifndef _OTA_H
|
|
#define _OTA_H
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
|
|
#include <esp_err.h>
|
|
#include "board.h"
|
|
|
|
class Ota {
|
|
public:
|
|
Ota();
|
|
~Ota();
|
|
|
|
esp_err_t CheckVersion();
|
|
esp_err_t Activate();
|
|
bool HasActivationChallenge() { return has_activation_challenge_; }
|
|
bool HasNewVersion() { return has_new_version_; }
|
|
bool HasMqttConfig() { return has_mqtt_config_; }
|
|
bool HasWebsocketConfig() { return has_websocket_config_; }
|
|
bool HasActivationCode() { return has_activation_code_; }
|
|
bool HasServerTime() { return has_server_time_; }
|
|
bool StartUpgrade(std::function<void(int progress, size_t speed)> callback);
|
|
static bool Upgrade(const std::string& firmware_url, std::function<void(int progress, size_t speed)> callback);
|
|
void MarkCurrentVersionValid();
|
|
|
|
const std::string& GetFirmwareVersion() const { return firmware_version_; }
|
|
const std::string& GetCurrentVersion() const { return current_version_; }
|
|
const std::string& GetFirmwareUrl() const { return firmware_url_; }
|
|
const std::string& GetActivationMessage() const { return activation_message_; }
|
|
const std::string& GetActivationCode() const { return activation_code_; }
|
|
std::string GetCheckVersionUrl();
|
|
|
|
private:
|
|
std::string activation_message_;
|
|
std::string activation_code_;
|
|
bool has_new_version_ = false;
|
|
bool has_mqtt_config_ = false;
|
|
bool has_websocket_config_ = false;
|
|
bool has_server_time_ = false;
|
|
bool has_activation_code_ = false;
|
|
bool has_serial_number_ = false;
|
|
bool has_activation_challenge_ = false;
|
|
std::string current_version_;
|
|
std::string firmware_version_;
|
|
std::string firmware_url_;
|
|
std::string activation_challenge_;
|
|
std::string serial_number_;
|
|
int activation_timeout_ms_ = 30000;
|
|
|
|
std::function<void(int progress, size_t speed)> upgrade_callback_;
|
|
std::vector<int> ParseVersion(const std::string& version);
|
|
bool IsNewVersionAvailable(const std::string& currentVersion, const std::string& newVersion);
|
|
std::string GetActivationPayload();
|
|
std::unique_ptr<Http> SetupHttp();
|
|
};
|
|
|
|
#endif // _OTA_H
|