andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 17:29:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

sync with 1.9 changes

Browse Source
This commit is contained in:
Paul
2019-09-01 14:38:42 +02:00
parent 8f26fb655e
commit 81a188a52a
7 changed files with 21 additions and 2775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MyESP.cpp
View File

@@ -2658,7 +2658,7 @@ void MyESP::_addMQTTLog(const char * topic, const char * payload) {
// myDebug("Publish [#%d] %s (%d) %s (%d)", logCount, topic, strlen(topic), payload, strlen(payload)); // for debugging
// find the topic
while ((_hasValue(MQTT_log[logPointer].topic) && logPointer < MYESP_MQTTLOG_MAX)) {
while ((logPointer < MYESP_MQTTLOG_MAX) && (_hasValue(MQTT_log[logPointer].topic))) {
if (strcmp(MQTT_log[logPointer].topic, topic) == 0) {
found = true;
break;

3
src/TelnetSpy.cpp
View File

@@ -573,8 +573,7 @@ void TelnetSpy::handle() {
return;
}
if (!listening) {
if ((WiFi.status() == WL_DISCONNECTED) && (WiFi.getMode() & WIFI_AP)) {
if ((WiFi.status() == WL_DISCONNECTED) && (WiFi.getMode() & WIFI_AP)) {
if (usedSer) {
usedSer->println("[TELNET] in AP mode"); // added by Proddy
}

25
src/TimeLib.cpp
View File

@@ -105,28 +105,28 @@ void refreshCache(time_t t) {
}
int day(time_t t) { // the day for the given time (0-6)
refreshCache(t);
return tm.Day;
refreshCache(t);
return tm.Day;
}
int month(time_t t) { // the month for the given time
refreshCache(t);
return tm.Month;
int month(time_t t) { // the month for the given time
refreshCache(t);
return tm.Month;
}
int second(time_t t) { // the second for the given time
refreshCache(t);
return tm.Second;
int second(time_t t) { // the second for the given time
refreshCache(t);
return tm.Second;
}
int minute(time_t t) { // the minute for the given time
refreshCache(t);
return tm.Minute;
refreshCache(t);
return tm.Minute;
}
int hour(time_t t) { // the hour for the given time
refreshCache(t);
return tm.Hour;
refreshCache(t);
return tm.Hour;
}
int year(time_t t) { // the year for the given time
@@ -140,4 +140,3 @@ void setTime(time_t t) {
Status = timeSet;
prevMillis = millis(); // restart counting from now (thanks to Korman for this fix)
}