jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 05:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add progress debug messages

Browse Source
This commit is contained in:
fvanroie 2020-03-10 01:18:08 +01:00
parent 63c12ad571
commit 297b7d3760
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/hasp_ota.cpp
View File

@ -10,13 +10,33 @@
#define F_OTA_URL F("otaurl") #define F_OTA_URL F("otaurl")
std::string otaUrl = "http://ota.local"; std::string otaUrl = "http://10.1.0.3";
int8_t prevUpdateValue = -1;
void otaProgress(uint8_t val)
{
String type;
uint8_t deltaValue;
if(ArduinoOTA.getCommand() == U_FLASH) {
type = F("Firmware");
deltaValue = 4;
} else { // U_SPIFFS
deltaValue = 2;
type = F("Filesystem");
}
if(val - prevUpdateValue >= deltaValue) {
debugPrintln(String(F("OTA: ")) + type + F(" update in progress... ") + val + "%");
prevUpdateValue = val;
}
}
void otaSetup(JsonObject settings) void otaSetup(JsonObject settings)
{ {
if(!settings[F_OTA_URL].isNull()) { if(!settings[F_OTA_URL].isNull()) {
char buffer[127]; char buffer[128];
otaUrl = settings[F_OTA_URL].as<String>().c_str(); otaUrl = settings[F_OTA_URL].as<String>().c_str();
sprintf_P(buffer, PSTR("ORA url: %s"), otaUrl.c_str()); sprintf_P(buffer, PSTR("ORA url: %s"), otaUrl.c_str());
debugPrintln(buffer); debugPrintln(buffer);
@ -26,17 +46,27 @@ void otaSetup(JsonObject settings)
// ArduinoOTA.setPassword(configPassword); // ArduinoOTA.setPassword(configPassword);
ArduinoOTA.onStart([]() { ArduinoOTA.onStart([]() {
debugPrintln(F("OTA: update start")); if(ArduinoOTA.getCommand() == U_FLASH) {
} else { // U_SPIFFS
// NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end()
}
debugPrintln(F("OTA: Start update"));
dispatchCommand("page 0"); dispatchCommand("page 0");
// haspSetAttr("p[0].b[1].txt", "\"ESP OTA Update\""); // haspSetAttr("p[0].b[1].txt", "\"ESP OTA Update\"");
}); });
ArduinoOTA.onEnd([]() { ArduinoOTA.onEnd([]() {
dispatchCommand("page 0"); prevUpdateValue = -1;
debugPrintln(F("OTA: update complete")); otaProgress(100);
dispatchPage("0");
// haspSetAttr("p[0].b[1].txt", "\"ESP OTA Update\\rComplete!\""); // haspSetAttr("p[0].b[1].txt", "\"ESP OTA Update\\rComplete!\"");
dispatchCommand(F("reboot")); dispatchReboot(true);
}); });
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) { ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
if(total != 0) {
int8_t val = progress * 100 / total;
otaProgress(val);
}
// haspSetAttr("p[0].b[1].txt", "\"ESP OTA Update\\rProgress: " + String(progress / (total / 100)) + "%\""); // haspSetAttr("p[0].b[1].txt", "\"ESP OTA Update\\rProgress: " + String(progress / (total / 100)) + "%\"");
}); });
ArduinoOTA.onError([](ota_error_t error) { ArduinoOTA.onError([](ota_error_t error) {
@ -61,5 +91,5 @@ void otaSetup(JsonObject settings)
void otaLoop(bool wifiIsConnected) void otaLoop(bool wifiIsConnected)
{ {
ArduinoOTA.handle(); // Arduino OTA loop ArduinoOTA.handle();
} }