florian/ESPGadget
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implement ota updater plus minor fixes

Browse Source
This commit is contained in:
Florian Overkamp
2019-11-10 20:51:26 +01:00
parent f00091ec99
commit 65a1a3027b
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
10_wifi_conf.ino
View File

@@ -29,13 +29,13 @@ void wifi_associate() {
WifiManager.setConfigPortalTimeout(300); // If no configuration is done in 5 mins, exit/restart quietly
if (WifiManager.autoConnect(apname)) { // @@@FIXME@@@ we should really set a PSK for the AP (but in my brief testing it crashed the ESP, so what's up with that)
settings.ip = WiFi.localIP().toString();
PRINTLN_SERIAL("Figured out my network \O/");
PRINTLN_SERIAL("Figured out my network \\O/");
//wificlient.setFingerprint(WTR_SHA1);
net.setInsecure(); // Do not check fingerprint
net.setTimeout(15000); // 15 Seconds
PRINT_SERIAL("Setting time using SNTP");
/* PRINT_SERIAL("Setting time using SNTP");
configTime(-5 * 3600, 0, "pool.ntp.org", "time.nist.gov");
now = time(nullptr);
while (now < 1510592825) {
@@ -47,7 +47,7 @@ void wifi_associate() {
struct tm timeinfo;
gmtime_r(&now, &timeinfo);
PRINT_SERIAL("Current time: ");
APPENDLN_SERIAL(asctime(&timeinfo));
APPENDLN_SERIAL(asctime(&timeinfo)); */
}
}
@@ -66,22 +66,27 @@ void wifi_loop() {
unsigned long ota_check = millis()/1000;
if((ota_lastcheck == 0) || ((ota_check - ota_lastcheck) > OTA_UPDATE_INTERVAL)) {
PRINTLN_SERIAL("Checking for OTA update");
/*
// Check for firmware upgrades
t_httpUpdate_return ret = ESPhttpUpdate.update(wificlient, WTR_SERVER, WTR_SRVPORT, "/fw/", nodeversion);
String version = settings.name;
version.concat("-v");
version.concat(FW_VERSION);
t_httpUpdate_return ret = ESPhttpUpdate.update(net, OTA_SERVER, OTA_PORT, OTA_URI, version);
switch(ret) {
case HTTP_UPDATE_FAILED: // HTTP 403, 404
Serial.printf("Firmware upgrade available, but update failed (%d): %s", ESPhttpUpdate.getLastError(), ESPhttpUpdate.getLastErrorString().c_str());
PRINT_SERIAL("Firmware upgrade available, but update failed ");
APPEND_SERIAL(" (ERR ");
APPEND_SERIAL(String(ESPhttpUpdate.getLastError()));
APPEND_SERIAL(") ");
APPENDLN_SERIAL(ESPhttpUpdate.getLastErrorString().c_str());
break;
case HTTP_UPDATE_NO_UPDATES: // HTTP 304
Serial.println("No firmware upgrade available");
PRINTLN_SERIAL("No firmware upgrade available");
break;
case HTTP_UPDATE_OK: // HTTP 200
Serial.println("Firmware upgrade available, upgraded ok."); // may not called we reboot the ESP
PRINTLN_SERIAL("Firmware upgrade available, upgraded ok."); // may not called we reboot the ESP
break;
}
*/
ota_lastcheck = ota_check;
}
}