2018-02-26 00:11:31 +00:00
|
|
|
#include <OTASettingsService.h>
|
|
|
|
|
|
|
|
OTASettingsService::OTASettingsService(AsyncWebServer* server, FS* fs) : SettingsService(server, fs, OTA_SETTINGS_SERVICE_PATH, OTA_SETTINGS_FILE) {}
|
|
|
|
|
|
|
|
OTASettingsService::~OTASettingsService() {}
|
|
|
|
|
|
|
|
void OTASettingsService::begin() {
|
|
|
|
// load settings
|
|
|
|
SettingsService::begin();
|
|
|
|
|
|
|
|
// configure arduino OTA
|
|
|
|
configureArduinoOTA();
|
|
|
|
}
|
|
|
|
|
|
|
|
void OTASettingsService::loop() {
|
|
|
|
if (_enabled && _arduinoOTA){
|
|
|
|
_arduinoOTA->handle();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OTASettingsService::onConfigUpdated() {
|
|
|
|
configureArduinoOTA();
|
|
|
|
}
|
|
|
|
|
|
|
|
void OTASettingsService::readFromJsonObject(JsonObject& root) {
|
|
|
|
_enabled = root["enabled"];
|
|
|
|
_port = root["port"];
|
|
|
|
_password = root["password"] | DEFAULT_OTA_PASSWORD;
|
|
|
|
|
|
|
|
// provide defaults
|
|
|
|
if (_port < 0){
|
|
|
|
_port = DEFAULT_OTA_PORT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void OTASettingsService::writeToJsonObject(JsonObject& root) {
|
|
|
|
root["enabled"] = _enabled;
|
|
|
|
root["port"] = _port;
|
|
|
|
root["password"] = _password;
|
|
|
|
}
|
|
|
|
|
|
|
|
void OTASettingsService::configureArduinoOTA() {
|
2018-03-06 22:36:55 +00:00
|
|
|
if (_arduinoOTA){
|
|
|
|
delete _arduinoOTA;
|
|
|
|
_arduinoOTA = NULL;
|
|
|
|
}
|
2018-02-26 00:11:31 +00:00
|
|
|
if (_enabled) {
|
|
|
|
_arduinoOTA = new ArduinoOTAClass;
|
|
|
|
_arduinoOTA->setPort(_port);
|
|
|
|
_arduinoOTA->setPassword(_password.c_str());
|
|
|
|
_arduinoOTA->onStart([]() {
|
|
|
|
Serial.println("Starting");
|
|
|
|
});
|
|
|
|
_arduinoOTA->onEnd([]() {
|
|
|
|
Serial.println("\nEnd");
|
|
|
|
});
|
|
|
|
_arduinoOTA->onProgress([](unsigned int progress, unsigned int total) {
|
|
|
|
Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
|
|
|
|
});
|
|
|
|
_arduinoOTA->onError([](ota_error_t error) {
|
|
|
|
Serial.printf("Error[%u]: ", error);
|
|
|
|
if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
|
|
|
|
else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
|
|
|
|
else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
|
|
|
|
else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
|
|
|
|
else if (error == OTA_END_ERROR) Serial.println("End Failed");
|
|
|
|
});
|
|
|
|
_arduinoOTA->begin();
|
|
|
|
}
|
|
|
|
}
|