This commit is contained in:
DTTerastar 2021-03-29 23:37:37 -04:00
parent af5ff43523
commit 703982daf6
1 changed files with 3 additions and 3 deletions

View File

@ -113,7 +113,6 @@ unsigned long getUptimeSeconds(void)
bool sendTelemetry(int totalSeen = -1, int totalReported = -1, int totalAdverts = -1) bool sendTelemetry(int totalSeen = -1, int totalReported = -1, int totalAdverts = -1)
{ {
StaticJsonDocument<512> tele; StaticJsonDocument<512> tele;
tele["room"] = room;
tele["ip"] = localIp; tele["ip"] = localIp;
tele["hostname"] = WiFi.getHostname(); tele["hostname"] = WiFi.getHostname();
tele["uptime"] = getUptimeSeconds(); tele["uptime"] = getUptimeSeconds();
@ -431,14 +430,15 @@ void firmwareUpdate()
return; return;
int httpCode = http.sendRequest("HEAD"); int httpCode = http.sendRequest("HEAD");
if (httpCode != 302 || http.getLocation().indexOf(String(VERSION)) > 0) if (httpCode < 300 || httpCode > 400 || http.getLocation().indexOf(String(VERSION)) > 0)
{ {
Serial.printf("Not updating from: %s\n", http.getLocation().c_str());
http.end(); http.end();
return; return;
} }
updateInProgress = true; updateInProgress = true;
Serial.printf("Updating from %s\n", firmwareUrl.c_str()); Serial.printf("Updating from: %s\n", firmwareUrl.c_str());
mqttClient.disconnect(true); mqttClient.disconnect(true);
httpUpdate.setLedPin(LED_BUILTIN, LED_BUILTIN_ON); httpUpdate.setLedPin(LED_BUILTIN, LED_BUILTIN_ON);