Skip to content

Commit

Permalink
V 4.65.4
Browse files Browse the repository at this point in the history
  • Loading branch information
InnuendoPi committed Nov 15, 2024
1 parent cc15c15 commit cfbc49a
Show file tree
Hide file tree
Showing 9 changed files with 394 additions and 389 deletions.
9 changes: 5 additions & 4 deletions 8_SYSTEM.ino
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ void setTicker()

void setupTime()
{
#ifdef ESP32
// #ifdef ESP32
// configTzTime(ntpZone, ntpServer);
// #elif ESP8266
// configTime(ntpZone, ntpServer);
// #endif
configTzTime(ntpZone, ntpServer);
#elif ESP8266
configTime(ntpZone, ntpServer);
#endif
getLocalTime(&timeinfo);
// 1 Minute vor Winterzeit 27.10.2024 2:59:00 1729994340
// 1 Minute vor Sommerzeit 31.03.2024 1:59:00 1711846740
Expand Down
14 changes: 9 additions & 5 deletions 9_WebUpdate.ino
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ bool upTools(String url, String fname, WiFiClientSecure &clientup)
fsUploadFile = LittleFS.open("/" + fname, "r");
if (fsUploadFile.size() == startlen)
{
sprintf(line, "Framwork/Tools update %s getSize: %d fileSize: %d", fname.c_str(), startlen, fsUploadFile.size());
sprintf(line, "Framework/Tools update %s getSize: %d fileSize: %d", fname.c_str(), startlen, fsUploadFile.size());
debugLog(UPDATELOG, line);
DEBUG_INFO("SYS", "%s", line);
}
else
{
sprintf(line, "Framwork/Tools update Fehler %s getSize: %d fileSize: %d", fname.c_str(), startlen, fsUploadFile.size());
sprintf(line, "Framework/Tools update Fehler %s getSize: %d fileSize: %d", fname.c_str(), startlen, fsUploadFile.size());
debugLog(UPDATELOG, line);
DEBUG_ERROR("SYS", "%s", line);
}
Expand All @@ -57,7 +57,7 @@ bool upTools(String url, String fname, WiFiClientSecure &clientup)
}
else
{
sprintf(line, "Framwork/Tools2 update Fehler %s %s", fname.c_str(), https.errorToString(httpCode).c_str());
sprintf(line, "Framework/Tools update Fehler %s %s", fname.c_str(), https.errorToString(httpCode).c_str());
debugLog(UPDATELOG, line);
DEBUG_ERROR("SYS", "%s", line);
https.end();
Expand All @@ -66,7 +66,7 @@ bool upTools(String url, String fname, WiFiClientSecure &clientup)
}
else
{
sprintf(line, "Framwork/Tools3 update Fehler https start %s", fname.c_str());
sprintf(line, "Framework/Tools update Fehler https start %s", fname.c_str());
debugLog(UPDATELOG, line);
DEBUG_INFO("SYS", "%s", line);
return false;
Expand Down Expand Up @@ -103,9 +103,11 @@ void upFirm()

void updateTools()
{
setTagLevel("SYS", INNU_INFO);
configTzTime(ntpZone, ntpServer);
getLocalTime(&timeinfo);

strftime(zeit, sizeof(zeit), "%H:%M:%S", &timeinfo);

WiFiClientSecure clientup;
clientup.setInsecure();
fsUploadFile = LittleFS.open(LOGUPDATETOOLS, "r");
Expand Down Expand Up @@ -194,6 +196,8 @@ void updateSys()
setTagLevel("SYS", INNU_INFO);
configTzTime(ntpZone, ntpServer);
getLocalTime(&timeinfo);
strftime(zeit, sizeof(zeit), "%H:%M:%S", &timeinfo);

char line[120];
fsUploadFile = LittleFS.open(LOGUPDATESYS, "r");
int8_t anzahlVersuche = 0;
Expand Down
Binary file modified build/MQTTDevice4.ino.bin
Binary file not shown.
Binary file modified build/MQTTDevice4.mklittlefs.bin
Binary file not shown.
758 changes: 379 additions & 379 deletions build/compile_commands.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion index_htm.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const char index_htm_gz[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x08, 0x1d, 0xd5, 0x36, 0x67, 0x04, 0x00, 0x69, 0x6e,
0x1f, 0x8b, 0x08, 0x08, 0xe5, 0xd8, 0x36, 0x67, 0x04, 0x00, 0x69, 0x6e,
0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x00, 0xed, 0x5d, 0xfd, 0x5a,
0xf3, 0x34, 0x14, 0xbf, 0x95, 0x5a, 0x15, 0x36, 0xdd, 0x06, 0x1b, 0x2f,
0x3e, 0x3a, 0x28, 0x3c, 0x08, 0x53, 0x51, 0x04, 0x64, 0xf3, 0xfb, 0x03,
Expand Down
Binary file modified tools/Firmware.zip
Binary file not shown.
Binary file modified tools/MQTTDevice4.ino.bin
Binary file not shown.
Binary file modified tools/MQTTDevice4.mklittlefs.bin
Binary file not shown.

0 comments on commit cfbc49a

Please sign in to comment.