jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 05:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

v5.12.0c - Fix intermittent sleep exception

Browse Source 
5.12.0c
 * Fix intermittent exception when dns lookup is used while
sleep is enabled
This commit is contained in:
arendst 2018-02-20 16:19:48 +01:00
parent 6b3584ef86
commit 4c75873027
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sonoff/_releasenotes.ino
View File

@ -1,4 +1,7 @@
/* 5.12.0b /* 5.12.0c
* Fix intermittent exception when dns lookup is used while sleep is enabled
*
* 5.12.0b
* Add serial debug info * Add serial debug info
* Add Multichannel Gas sensor using MultiChannel_Gas_Sensor library (#1245) * Add Multichannel Gas sensor using MultiChannel_Gas_Sensor library (#1245)
* Add optional usage of %d or %X suffices in MQTT client to append chipid (#1871) * Add optional usage of %d or %X suffices in MQTT client to append chipid (#1871)
@ -19,7 +22,7 @@
* 5.12.0a * 5.12.0a
* Change platformio option sonoff-ds18x20 to sonoff-xxl enabling ds18x20 and all other sensors in one image * Change platformio option sonoff-ds18x20 to sonoff-xxl enabling ds18x20 and all other sensors in one image
* Fix providing web page configuratin option for Friendly Name when no device (relay or light) is configured (#1850) * Fix providing web page configuratin option for Friendly Name when no device (relay or light) is configured (#1850)
* Change default paremeters in user_config.h to undefined for easy installation (#1851) * Change default parameters in user_config.h to undefined for easy installation (#1851)
* Change max user configurable hold time from 10 to 25 seconds (#1851) * Change max user configurable hold time from 10 to 25 seconds (#1851)
* *
* 5.12.0 20180209 * 5.12.0 20180209

2
sonoff/sonoff.ino
View File

@ -25,7 +25,7 @@
- Select IDE Tools - Flash Size: "1M (no SPIFFS)" - Select IDE Tools - Flash Size: "1M (no SPIFFS)"
====================================================*/ ====================================================*/
#define VERSION 0x050C0002 // 5.12.0b #define VERSION 0x050C0003 // 5.12.0c
// Location specific includes // Location specific includes
#include <core_version.h> // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0) #include <core_version.h> // Arduino_Esp8266 version information (ARDUINO_ESP8266_RELEASE and ARDUINO_ESP8266_RELEASE_2_3_0)

21
sonoff/support.ino
View File

@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
IPAddress syslog_host_addr; // Syslog host IP address IPAddress syslog_host_addr; // Syslog host IP address
unsigned long syslog_host_refresh = 0; uint32_t syslog_host_hash = 0; // Syslog host name hash
/*********************************************************************************************\ /*********************************************************************************************\
* Watchdog extension (https://github.com/esp8266/Arduino/issues/1532) * Watchdog extension (https://github.com/esp8266/Arduino/issues/1532)
@ -414,6 +414,15 @@ void SetSerialBaudrate(int baudrate)
} }
} }
uint32_t GetHash(const char *buffer, size_t size)
{
uint32_t hash = 0;
for (uint16_t i = 0; i <= size; i++) {
hash += (uint8_t)*buffer++ * (i +1);
}
return hash;
}
/*********************************************************************************************\ /*********************************************************************************************\
* Wifi * Wifi
\*********************************************************************************************/ \*********************************************************************************************/
@ -1245,7 +1254,7 @@ void RtcSecond()
uint32_t dstoffset; uint32_t dstoffset;
TIME_T tmpTime; TIME_T tmpTime;
if ((ntp_sync_minute > 59) && (3 == RtcTime.minute)) ntp_sync_minute = 1; // If sync prepare for a new cycle if ((ntp_sync_minute > 59) && (RtcTime.minute > 2)) ntp_sync_minute = 1; // If sync prepare for a new cycle
uint8_t offset = (uptime < 30) ? RtcTime.second : (((ESP.getChipId() & 0xF) * 3) + 3) ; // First try ASAP to sync. If fails try once every 60 seconds based on chip id uint8_t offset = (uptime < 30) ? RtcTime.second : (((ESP.getChipId() & 0xF) * 3) + 3) ; // First try ASAP to sync. If fails try once every 60 seconds based on chip id
if ((WL_CONNECTED == WiFi.status()) && (offset == RtcTime.second) && ((RtcTime.year < 2016) || (ntp_sync_minute == RtcTime.minute))) { if ((WL_CONNECTED == WiFi.status()) && (offset == RtcTime.second) && ((RtcTime.year < 2016) || (ntp_sync_minute == RtcTime.minute))) {
ntp_time = sntp_get_current_timestamp(); ntp_time = sntp_get_current_timestamp();
@ -1396,9 +1405,9 @@ void Syslog()
// Destroys log_data // Destroys log_data
char syslog_preamble[64]; // Hostname + Id char syslog_preamble[64]; // Hostname + Id
if ((static_cast<uint32_t>(syslog_host_addr) == 0) || ((millis() - syslog_host_refresh) > 60000)) { if (syslog_host_hash != GetHash(Settings.syslog_host, strlen(Settings.syslog_host))) {
WiFi.hostByName(Settings.syslog_host, syslog_host_addr); syslog_host_hash = GetHash(Settings.syslog_host, strlen(Settings.syslog_host));
syslog_host_refresh = millis(); WiFi.hostByName(Settings.syslog_host, syslog_host_addr); // If sleep enabled this might result in exception so try to do it once using hash
} }
if (PortUdp.beginPacket(syslog_host_addr, Settings.syslog_port)) { if (PortUdp.beginPacket(syslog_host_addr, Settings.syslog_port)) {
snprintf_P(syslog_preamble, sizeof(syslog_preamble), PSTR("%s ESP-"), my_hostname); snprintf_P(syslog_preamble, sizeof(syslog_preamble), PSTR("%s ESP-"), my_hostname);