2017-01-28 13:41:01 +00:00
|
|
|
/*
|
2017-05-13 12:02:10 +01:00
|
|
|
support.ino - support for Sonoff-Tasmota
|
|
|
|
|
2017-12-22 13:55:24 +00:00
|
|
|
Copyright (C) 2018 Theo Arends
|
2017-05-13 12:02:10 +01:00
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2017-01-28 13:41:01 +00:00
|
|
|
*/
|
|
|
|
|
2017-09-26 16:50:39 +01:00
|
|
|
IPAddress syslog_host_addr; // Syslog host IP address
|
|
|
|
unsigned long syslog_host_refresh = 0;
|
|
|
|
|
2017-02-28 15:01:48 +00:00
|
|
|
/*********************************************************************************************\
|
|
|
|
* Watchdog extension (https://github.com/esp8266/Arduino/issues/1532)
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
|
|
|
Ticker tickerOSWatch;
|
|
|
|
|
2018-01-13 14:53:02 +00:00
|
|
|
#define OSWATCH_RESET_TIME 120
|
2017-02-28 15:01:48 +00:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
static unsigned long oswatch_last_loop_time;
|
|
|
|
byte oswatch_blocked_loop = 0;
|
2017-02-28 15:01:48 +00:00
|
|
|
|
2017-04-03 15:38:15 +01:00
|
|
|
#ifndef USE_WS2812_DMA // Collides with Neopixelbus but solves exception
|
2017-11-19 17:02:03 +00:00
|
|
|
//void OsWatchTicker() ICACHE_RAM_ATTR;
|
2017-04-03 15:38:15 +01:00
|
|
|
#endif // USE_WS2812_DMA
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void OsWatchTicker()
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
|
|
|
unsigned long t = millis();
|
2017-10-18 17:22:34 +01:00
|
|
|
unsigned long last_run = abs(t - oswatch_last_loop_time);
|
2017-02-28 15:01:48 +00:00
|
|
|
|
|
|
|
#ifdef DEBUG_THEO
|
2017-10-18 17:22:34 +01:00
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION D_OSWATCH " FreeRam %d, rssi %d, last_run %d"), ESP.getFreeHeap(), WifiGetRssiAsQuality(WiFi.RSSI()), last_run);
|
|
|
|
AddLog(LOG_LEVEL_DEBUG);
|
2017-02-28 15:01:48 +00:00
|
|
|
#endif // DEBUG_THEO
|
2017-04-25 17:24:42 +01:00
|
|
|
if (last_run >= (OSWATCH_RESET_TIME * 1000)) {
|
2017-11-17 16:52:31 +00:00
|
|
|
// AddLog_P(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_OSWATCH " " D_BLOCKED_LOOP ". " D_RESTARTING)); // Save iram space
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcSettings.oswatch_blocked_loop = 1;
|
|
|
|
RtcSettingsSave();
|
2017-09-02 13:37:02 +01:00
|
|
|
// ESP.restart(); // normal reboot
|
2017-02-28 15:01:48 +00:00
|
|
|
ESP.reset(); // hard reset
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void OsWatchInit()
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop;
|
|
|
|
RtcSettings.oswatch_blocked_loop = 0;
|
|
|
|
oswatch_last_loop_time = millis();
|
|
|
|
tickerOSWatch.attach_ms(((OSWATCH_RESET_TIME / 3) * 1000), OsWatchTicker);
|
2017-02-28 15:01:48 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void OsWatchLoop()
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
oswatch_last_loop_time = millis();
|
2017-02-28 15:01:48 +00:00
|
|
|
// while(1) delay(1000); // this will trigger the os watch
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
String GetResetReason()
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
|
|
|
char buff[32];
|
2017-10-18 17:22:34 +01:00
|
|
|
if (oswatch_blocked_loop) {
|
2018-01-06 16:34:42 +00:00
|
|
|
strncpy_P(buff, PSTR(D_JSON_BLOCKED_LOOP), sizeof(buff));
|
2017-02-28 15:01:48 +00:00
|
|
|
return String(buff);
|
|
|
|
} else {
|
|
|
|
return ESP.getResetReason();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef DEBUG_THEO
|
2017-10-18 17:22:34 +01:00
|
|
|
void ExceptionTest(byte type)
|
2017-02-28 15:01:48 +00:00
|
|
|
{
|
2017-09-02 13:37:02 +01:00
|
|
|
/*
|
2017-02-28 15:01:48 +00:00
|
|
|
Exception (28):
|
|
|
|
epc1=0x4000bf64 epc2=0x00000000 epc3=0x00000000 excvaddr=0x00000007 depc=0x00000000
|
|
|
|
|
2017-09-02 13:37:02 +01:00
|
|
|
ctx: cont
|
2017-02-28 15:01:48 +00:00
|
|
|
sp: 3fff1f30 end: 3fff2840 offset: 01a0
|
|
|
|
|
|
|
|
>>>stack>>>
|
2017-03-19 17:19:08 +00:00
|
|
|
3fff20d0: 202c3573 756f7247 2c302070 646e4920
|
|
|
|
3fff20e0: 40236a6e 7954202c 45206570 00454358
|
|
|
|
3fff20f0: 00000010 00000007 00000000 3fff2180
|
|
|
|
3fff2100: 3fff2190 40107bfc 3fff3e4c 3fff22c0
|
|
|
|
3fff2110: 40261934 000000f0 3fff22c0 401004d8
|
|
|
|
3fff2120: 40238fcf 00000050 3fff2100 4021fc10
|
|
|
|
3fff2130: 3fff32bc 4021680c 3ffeade1 4021ff7d
|
|
|
|
3fff2140: 3fff2190 3fff2180 0000000c 7fffffff
|
|
|
|
3fff2150: 00000019 00000000 00000000 3fff21c0
|
|
|
|
3fff2160: 3fff23f3 3ffe8e08 00000000 4021ffb4
|
|
|
|
3fff2170: 3fff2190 3fff2180 0000000c 40201118
|
|
|
|
3fff2180: 3fff21c0 0000003c 3ffef840 00000007
|
|
|
|
3fff2190: 00000000 00000000 00000000 40201128
|
|
|
|
3fff21a0: 3fff23f3 000000f1 3fff23ec 4020fafb
|
|
|
|
3fff21b0: 3fff23f3 3fff21c0 3fff21d0 3fff23f6
|
|
|
|
3fff21c0: 00000000 3fff23fb 4022321b 00000000
|
2017-02-28 15:01:48 +00:00
|
|
|
|
|
|
|
Exception 28: LoadProhibited: A load referenced a page mapped with an attribute that does not permit loads
|
|
|
|
Decoding 14 results
|
|
|
|
0x40236a6e: ets_vsnprintf at ?? line ?
|
|
|
|
0x40107bfc: vsnprintf at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/libc_replacements.c line 387
|
|
|
|
0x40261934: bignum_exptmod at ?? line ?
|
|
|
|
0x401004d8: malloc at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266\umm_malloc/umm_malloc.c line 1664
|
|
|
|
0x40238fcf: wifi_station_get_connect_status at ?? line ?
|
|
|
|
0x4021fc10: operator new[](unsigned int) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/abi.cpp line 57
|
|
|
|
0x4021680c: ESP8266WiFiSTAClass::status() at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\libraries\ESP8266WiFi\src/ESP8266WiFiSTA.cpp line 569
|
|
|
|
0x4021ff7d: vsnprintf_P(char*, unsigned int, char const*, __va_list_tag) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146
|
|
|
|
0x4021ffb4: snprintf_P(char*, unsigned int, char const*, ...) at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/pgmspace.cpp line 146
|
|
|
|
0x40201118: atol at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45
|
|
|
|
0x40201128: atoi at C:\Data2\Arduino\arduino-1.8.1-esp-2.3.0\portable\packages\esp8266\hardware\esp8266\2.3.0\cores\esp8266/core_esp8266_noniso.c line 45
|
2017-10-18 17:22:34 +01:00
|
|
|
0x4020fafb: MqttDataCallback(char*, unsigned char*, unsigned int) at R:\Arduino\Work-ESP8266\Theo\sonoff\sonoff-4\sonoff/sonoff.ino line 679 (discriminator 1)
|
2017-02-28 15:01:48 +00:00
|
|
|
0x4022321b: pp_attach at ?? line ?
|
|
|
|
|
|
|
|
00:00:08 MQTT: tele/sonoff/INFO3 = {"Started":"Fatal exception:28 flag:2 (EXCEPTION) epc1:0x4000bf64 epc2:0x00000000 epc3:0x00000000 excvaddr:0x00000007 depc:0x00000000"}
|
|
|
|
*/
|
2017-04-25 17:24:42 +01:00
|
|
|
if (1 == type) {
|
2017-02-28 15:01:48 +00:00
|
|
|
char svalue[10];
|
|
|
|
snprintf_P(svalue, sizeof(svalue), PSTR("%s"), 7); // Exception 28 as number in string (7 in excvaddr)
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
14:50:52 osWatch: FreeRam 25896, rssi 68, last_run 0
|
|
|
|
14:51:02 osWatch: FreeRam 25896, rssi 58, last_run 0
|
|
|
|
14:51:03 CMND: exception 2
|
|
|
|
14:51:12 osWatch: FreeRam 25360, rssi 60, last_run 8771
|
|
|
|
14:51:22 osWatch: FreeRam 25360, rssi 62, last_run 18771
|
|
|
|
14:51:32 osWatch: FreeRam 25360, rssi 62, last_run 28771
|
|
|
|
14:51:42 osWatch: FreeRam 25360, rssi 62, last_run 38771
|
|
|
|
14:51:42 osWatch: Warning, loop blocked. Restart now
|
|
|
|
*/
|
2017-04-25 17:24:42 +01:00
|
|
|
if (2 == type) {
|
2017-02-28 15:01:48 +00:00
|
|
|
while(1) delay(1000); // this will trigger the os watch
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif // DEBUG_THEO
|
|
|
|
|
2017-03-25 16:24:11 +00:00
|
|
|
/*********************************************************************************************\
|
2018-01-30 13:14:55 +00:00
|
|
|
* Miscellaneous
|
2017-03-25 16:24:11 +00:00
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2018-01-30 13:14:55 +00:00
|
|
|
#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
|
|
|
|
// Functions not available in 2.3.0
|
|
|
|
|
|
|
|
// http://clc-wiki.net/wiki/C_standard_library:string.h:memchr
|
|
|
|
void* memchr(const void* ptr, int value, size_t num)
|
|
|
|
{
|
|
|
|
unsigned char *p = (unsigned char*)ptr;
|
|
|
|
while (num--) {
|
|
|
|
if (*p != (unsigned char)value) {
|
|
|
|
p++;
|
|
|
|
} else {
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// http://clc-wiki.net/wiki/C_standard_library:string.h:strspn
|
2018-02-01 15:18:00 +00:00
|
|
|
// Get span until any character in string
|
2018-01-30 13:14:55 +00:00
|
|
|
size_t strcspn(const char *str1, const char *str2)
|
|
|
|
{
|
|
|
|
size_t ret = 0;
|
|
|
|
while (*str1) {
|
2018-02-01 15:18:00 +00:00
|
|
|
if (strchr(str2, *str1)) { // Slow
|
2018-01-30 13:14:55 +00:00
|
|
|
return ret;
|
|
|
|
} else {
|
|
|
|
str1++;
|
|
|
|
ret++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
2018-02-01 15:18:00 +00:00
|
|
|
#endif // ARDUINO_ESP8266_RELEASE_2_3_0
|
2018-01-30 13:14:55 +00:00
|
|
|
|
2018-02-01 15:18:00 +00:00
|
|
|
// Get span until single character in string
|
|
|
|
size_t strchrspn(const char *str1, int character)
|
2018-01-30 13:14:55 +00:00
|
|
|
{
|
2018-02-01 15:18:00 +00:00
|
|
|
size_t ret = 0;
|
|
|
|
char *start = (char*)str1;
|
|
|
|
char *end = strchr(str1, character);
|
|
|
|
if (end) ret = end - start;
|
|
|
|
return ret;
|
2018-01-30 13:14:55 +00:00
|
|
|
}
|
|
|
|
|
2018-01-20 11:12:39 +00:00
|
|
|
char* dtostrfd(double number, unsigned char prec, char *s)
|
2017-09-02 13:37:02 +01:00
|
|
|
{
|
2018-01-20 11:12:39 +00:00
|
|
|
return dtostrf(number, 1, prec, s);
|
2017-09-02 13:37:02 +01:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
boolean ParseIp(uint32_t* addr, const char* str)
|
2017-03-25 16:24:11 +00:00
|
|
|
{
|
|
|
|
uint8_t *part = (uint8_t*)addr;
|
|
|
|
byte i;
|
|
|
|
|
|
|
|
*addr = 0;
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
part[i] = strtoul(str, NULL, 10); // Convert byte
|
|
|
|
str = strchr(str, '.');
|
2017-04-25 17:24:42 +01:00
|
|
|
if (str == NULL || *str == '\0') {
|
|
|
|
break; // No more separators, exit
|
|
|
|
}
|
2017-03-25 16:24:11 +00:00
|
|
|
str++; // Point to next character after separator
|
|
|
|
}
|
2017-04-25 17:24:42 +01:00
|
|
|
return (3 == i);
|
2017-03-25 16:24:11 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void MakeValidMqtt(byte option, char* str)
|
2017-06-16 13:33:49 +01:00
|
|
|
{
|
|
|
|
// option 0 = replace by underscore
|
2017-09-02 13:37:02 +01:00
|
|
|
// option 1 = delete character
|
2017-06-16 13:33:49 +01:00
|
|
|
uint16_t i = 0;
|
|
|
|
while (str[i] > 0) {
|
|
|
|
// if ((str[i] == '/') || (str[i] == '+') || (str[i] == '#') || (str[i] == ' ')) {
|
|
|
|
if ((str[i] == '+') || (str[i] == '#') || (str[i] == ' ')) {
|
|
|
|
if (option) {
|
|
|
|
uint16_t j = i;
|
|
|
|
while (str[j] > 0) {
|
|
|
|
str[j] = str[j +1];
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
i--;
|
|
|
|
} else {
|
|
|
|
str[i] = '_';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-30 16:54:19 +01:00
|
|
|
// Function to parse & check if version_str is newer than our currently installed version.
|
2017-10-18 17:22:34 +01:00
|
|
|
bool NewerVersion(char* version_str)
|
2017-06-30 16:54:19 +01:00
|
|
|
{
|
|
|
|
uint32_t version = 0;
|
|
|
|
uint8_t i = 0;
|
|
|
|
char *str_ptr;
|
|
|
|
char* version_dup = strdup(version_str); // Duplicate the version_str as strtok_r will modify it.
|
|
|
|
|
|
|
|
if (!version_dup) {
|
|
|
|
return false; // Bail if we can't duplicate. Assume bad.
|
|
|
|
}
|
|
|
|
// Loop through the version string, splitting on '.' seperators.
|
|
|
|
for (char *str = strtok_r(version_dup, ".", &str_ptr); str && i < sizeof(VERSION); str = strtok_r(NULL, ".", &str_ptr), i++) {
|
|
|
|
int field = atoi(str);
|
|
|
|
// The fields in a version string can only range from 0-255.
|
|
|
|
if ((field < 0) || (field > 255)) {
|
|
|
|
free(version_dup);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// Shuffle the accumulated bytes across, and add the new byte.
|
|
|
|
version = (version << 8) + field;
|
|
|
|
// Check alpha delimiter after 1.2.3 only
|
|
|
|
if ((2 == i) && isalpha(str[strlen(str)-1])) {
|
|
|
|
field = str[strlen(str)-1] & 0x1f;
|
|
|
|
version = (version << 8) + field;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
free(version_dup); // We no longer need this.
|
|
|
|
// A version string should have 2-4 fields. e.g. 1.2, 1.2.3, or 1.2.3a (= 1.2.3.1).
|
|
|
|
// If not, then don't consider it a valid version string.
|
|
|
|
if ((i < 2) || (i > sizeof(VERSION))) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// Keep shifting the parsed version until we hit the maximum number of tokens.
|
|
|
|
// VERSION stores the major number of the version in the most significant byte of the uint32_t.
|
|
|
|
while (i < sizeof(VERSION)) {
|
|
|
|
version <<= 8;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
// Now we should have a fully constructed version number in uint32_t form.
|
|
|
|
return (version > VERSION);
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
char* GetPowerDevice(char* dest, uint8_t idx, size_t size, uint8_t option)
|
2017-09-02 13:37:02 +01:00
|
|
|
{
|
|
|
|
char sidx[8];
|
|
|
|
|
|
|
|
strncpy_P(dest, S_RSLT_POWER, size);
|
2017-10-18 17:22:34 +01:00
|
|
|
if ((devices_present + option) > 1) {
|
2017-09-02 13:37:02 +01:00
|
|
|
snprintf_P(sidx, sizeof(sidx), PSTR("%d"), idx);
|
|
|
|
strncat(dest, sidx, size);
|
|
|
|
}
|
|
|
|
return dest;
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
char* GetPowerDevice(char* dest, uint8_t idx, size_t size)
|
2017-09-02 13:37:02 +01:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
return GetPowerDevice(dest, idx, size, 0);
|
2017-09-02 13:37:02 +01:00
|
|
|
}
|
|
|
|
|
2018-01-30 13:14:55 +00:00
|
|
|
float ConvertTemp(float c)
|
|
|
|
{
|
|
|
|
float result = c;
|
|
|
|
|
|
|
|
if (!isnan(c) && Settings.flag.temperature_conversion) {
|
|
|
|
result = c * 1.8 + 32; // Fahrenheit
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
char TempUnit()
|
|
|
|
{
|
|
|
|
return (Settings.flag.temperature_conversion) ? 'F' : 'C';
|
|
|
|
}
|
|
|
|
|
|
|
|
double FastPrecisePow(double a, double b)
|
|
|
|
{
|
|
|
|
// https://martin.ankerl.com/2012/01/25/optimized-approximative-pow-in-c-and-cpp/
|
|
|
|
// calculate approximation with fraction of the exponent
|
|
|
|
int e = (int)b;
|
|
|
|
union {
|
|
|
|
double d;
|
|
|
|
int x[2];
|
|
|
|
} u = { a };
|
|
|
|
u.x[1] = (int)((b - e) * (u.x[1] - 1072632447) + 1072632447);
|
|
|
|
u.x[0] = 0;
|
|
|
|
// exponentiation by squaring with the exponent's integer part
|
|
|
|
// double r = u.d makes everything much slower, not sure why
|
|
|
|
double r = 1.0;
|
|
|
|
while (e) {
|
|
|
|
if (e & 1) {
|
|
|
|
r *= a;
|
|
|
|
}
|
|
|
|
a *= a;
|
|
|
|
e >>= 1;
|
|
|
|
}
|
|
|
|
return r * u.d;
|
|
|
|
}
|
|
|
|
|
|
|
|
char* GetTextIndexed(char* destination, size_t destination_size, uint16_t index, const char* haystack)
|
|
|
|
{
|
|
|
|
// Returns empty string if not found
|
|
|
|
// Returns text of found
|
|
|
|
char* write = destination;
|
|
|
|
const char* read = haystack;
|
|
|
|
|
|
|
|
index++;
|
|
|
|
while (index--) {
|
|
|
|
size_t size = destination_size -1;
|
|
|
|
write = destination;
|
|
|
|
char ch = '.';
|
|
|
|
while ((ch != '\0') && (ch != '|')) {
|
|
|
|
ch = pgm_read_byte(read++);
|
|
|
|
if (size && (ch != '|')) {
|
|
|
|
*write++ = ch;
|
|
|
|
size--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (0 == ch) {
|
|
|
|
if (index) {
|
|
|
|
write = destination;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*write = '\0';
|
|
|
|
return destination;
|
|
|
|
}
|
|
|
|
|
|
|
|
int GetCommandCode(char* destination, size_t destination_size, const char* needle, const char* haystack)
|
|
|
|
{
|
|
|
|
// Returns -1 of not found
|
|
|
|
// Returns index and command if found
|
|
|
|
int result = -1;
|
|
|
|
const char* read = haystack;
|
|
|
|
char* write = destination;
|
|
|
|
|
|
|
|
while (true) {
|
|
|
|
result++;
|
|
|
|
size_t size = destination_size -1;
|
|
|
|
write = destination;
|
|
|
|
char ch = '.';
|
|
|
|
while ((ch != '\0') && (ch != '|')) {
|
|
|
|
ch = pgm_read_byte(read++);
|
|
|
|
if (size && (ch != '|')) {
|
|
|
|
*write++ = ch;
|
|
|
|
size--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*write = '\0';
|
|
|
|
if (!strcasecmp(needle, destination)) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (0 == ch) {
|
|
|
|
result = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SetSerialBaudrate(int baudrate)
|
|
|
|
{
|
|
|
|
if (Serial.baudRate() != baudrate) {
|
|
|
|
if (seriallog_level) {
|
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION D_SET_BAUDRATE_TO " %d"), baudrate);
|
|
|
|
AddLog(LOG_LEVEL_INFO);
|
|
|
|
}
|
|
|
|
delay(100);
|
|
|
|
Serial.flush();
|
2018-02-03 22:25:05 +00:00
|
|
|
Serial.begin(baudrate, serial_config);
|
2018-01-30 13:14:55 +00:00
|
|
|
delay(10);
|
|
|
|
Serial.println();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-28 13:41:01 +00:00
|
|
|
/*********************************************************************************************\
|
|
|
|
* Wifi
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2017-05-04 12:58:26 +01:00
|
|
|
#define WIFI_CONFIG_SEC 180 // seconds before restart
|
2017-01-28 13:41:01 +00:00
|
|
|
#define WIFI_CHECK_SEC 20 // seconds
|
|
|
|
#define WIFI_RETRY_SEC 30 // seconds
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint8_t wifi_counter;
|
|
|
|
uint8_t wifi_retry;
|
|
|
|
uint8_t wifi_status;
|
|
|
|
uint8_t wps_result;
|
|
|
|
uint8_t wifi_config_type = 0;
|
|
|
|
uint8_t wifi_config_counter = 0;
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
int WifiGetRssiAsQuality(int rssi)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
|
|
|
int quality = 0;
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
if (rssi <= -100) {
|
2017-01-28 13:41:01 +00:00
|
|
|
quality = 0;
|
2017-10-18 17:22:34 +01:00
|
|
|
} else if (rssi >= -50) {
|
2017-01-28 13:41:01 +00:00
|
|
|
quality = 100;
|
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
quality = 2 * (rssi + 100);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
return quality;
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
boolean WifiConfigCounter()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
if (wifi_config_counter) {
|
2018-01-18 15:19:28 +00:00
|
|
|
wifi_config_counter = WIFI_CONFIG_SEC;
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
return (wifi_config_counter);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
#include "user_interface.h"
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void WifiWpsStatusCallback(wps_cb_status status);
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void WifiWpsStatusCallback(wps_cb_status status)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
|
|
|
/* from user_interface.h:
|
|
|
|
enum wps_cb_status {
|
|
|
|
WPS_CB_ST_SUCCESS = 0,
|
|
|
|
WPS_CB_ST_FAILED,
|
|
|
|
WPS_CB_ST_TIMEOUT,
|
|
|
|
WPS_CB_ST_WEP, // WPS failed because that WEP is not supported
|
|
|
|
WPS_CB_ST_SCAN_ERR, // can not find the target WPS AP
|
|
|
|
};
|
|
|
|
*/
|
2017-10-18 17:22:34 +01:00
|
|
|
wps_result = status;
|
|
|
|
if (WPS_CB_ST_SUCCESS == wps_result) {
|
2017-01-28 13:41:01 +00:00
|
|
|
wifi_wps_disable();
|
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_WPS_FAILED_WITH_STATUS " %d"), wps_result);
|
|
|
|
AddLog(LOG_LEVEL_DEBUG);
|
|
|
|
wifi_config_counter = 2;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
boolean WifiWpsConfigDone(void)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
return (!wps_result);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
boolean WifiWpsConfigBegin(void)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
wps_result = 99;
|
2017-04-25 17:24:42 +01:00
|
|
|
if (!wifi_wps_disable()) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!wifi_wps_enable(WPS_TYPE_PBC)) {
|
|
|
|
return false; // so far only WPS_TYPE_PBC is supported (SDK 2.0.0)
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if (!wifi_set_wps_cb((wps_st_cb_t) &WifiWpsStatusCallback)) {
|
2017-04-25 17:24:42 +01:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!wifi_wps_start()) {
|
|
|
|
return false;
|
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void WifiConfig(uint8_t type)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
if (!wifi_config_type) {
|
2017-09-16 13:19:47 +01:00
|
|
|
if (type >= WIFI_RETRY) { // WIFI_RETRY and WIFI_WAIT
|
2017-04-25 17:24:42 +01:00
|
|
|
return;
|
|
|
|
}
|
2017-01-29 20:36:12 +00:00
|
|
|
#ifdef USE_EMULATION
|
2017-10-18 17:22:34 +01:00
|
|
|
UdpDisconnect();
|
2017-01-29 20:36:12 +00:00
|
|
|
#endif // USE_EMULATION
|
2017-01-28 13:41:01 +00:00
|
|
|
WiFi.disconnect(); // Solve possible Wifi hangs
|
2017-10-18 17:22:34 +01:00
|
|
|
wifi_config_type = type;
|
|
|
|
wifi_config_counter = WIFI_CONFIG_SEC; // Allow up to WIFI_CONFIG_SECS seconds for phone to provide ssid/pswd
|
|
|
|
wifi_counter = wifi_config_counter +5;
|
2017-01-28 13:41:01 +00:00
|
|
|
blinks = 1999;
|
2017-10-18 17:22:34 +01:00
|
|
|
if (WIFI_RESTART == wifi_config_type) {
|
|
|
|
restart_flag = 2;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
else if (WIFI_SMARTCONFIG == wifi_config_type) {
|
2018-02-10 14:13:27 +00:00
|
|
|
AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_1_SMARTCONFIG " " D_ACTIVE_FOR_3_MINUTES));
|
2017-01-28 13:41:01 +00:00
|
|
|
WiFi.beginSmartConfig();
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
else if (WIFI_WPSCONFIG == wifi_config_type) {
|
|
|
|
if (WifiWpsConfigBegin()) {
|
2018-02-10 14:13:27 +00:00
|
|
|
AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_3_WPSCONFIG " " D_ACTIVE_FOR_3_MINUTES));
|
2017-01-28 13:41:01 +00:00
|
|
|
} else {
|
2018-02-10 14:13:27 +00:00
|
|
|
AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_3_WPSCONFIG " " D_FAILED_TO_START));
|
2017-10-18 17:22:34 +01:00
|
|
|
wifi_config_counter = 3;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#ifdef USE_WEBSERVER
|
2017-10-18 17:22:34 +01:00
|
|
|
else if (WIFI_MANAGER == wifi_config_type) {
|
2018-02-10 14:13:27 +00:00
|
|
|
AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_WCFG_2_WIFIMANAGER " " D_ACTIVE_FOR_3_MINUTES));
|
2017-10-18 17:22:34 +01:00
|
|
|
WifiManagerBegin();
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
#endif // USE_WEBSERVER
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void WifiBegin(uint8_t flag)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
const char kWifiPhyMode[] = " BGN";
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-01-29 20:36:12 +00:00
|
|
|
#ifdef USE_EMULATION
|
2017-10-18 17:22:34 +01:00
|
|
|
UdpDisconnect();
|
2017-01-29 20:36:12 +00:00
|
|
|
#endif // USE_EMULATION
|
2018-01-06 16:34:42 +00:00
|
|
|
|
|
|
|
#ifdef ARDUINO_ESP8266_RELEASE_2_3_0 // (!strncmp_P(ESP.getSdkVersion(),PSTR("1.5.3"),5))
|
|
|
|
AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_PATCH_ISSUE_2186));
|
|
|
|
WiFi.mode(WIFI_OFF); // See https://github.com/esp8266/Arduino/issues/2186
|
|
|
|
#endif
|
|
|
|
|
2017-01-28 13:41:01 +00:00
|
|
|
WiFi.disconnect();
|
|
|
|
WiFi.mode(WIFI_STA); // Disable AP mode
|
2017-10-18 17:22:34 +01:00
|
|
|
if (Settings.sleep) {
|
2017-04-25 17:24:42 +01:00
|
|
|
WiFi.setSleepMode(WIFI_LIGHT_SLEEP); // Allow light sleep during idle times
|
|
|
|
}
|
|
|
|
// if (WiFi.getPhyMode() != WIFI_PHY_MODE_11N) {
|
|
|
|
// WiFi.setPhyMode(WIFI_PHY_MODE_11N);
|
|
|
|
// }
|
|
|
|
if (!WiFi.getAutoConnect()) {
|
|
|
|
WiFi.setAutoConnect(true);
|
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
// WiFi.setAutoReconnect(true);
|
|
|
|
switch (flag) {
|
|
|
|
case 0: // AP1
|
|
|
|
case 1: // AP2
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.sta_active = flag;
|
2017-01-28 13:41:01 +00:00
|
|
|
break;
|
|
|
|
case 2: // Toggle
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.sta_active ^= 1;
|
2017-01-28 13:41:01 +00:00
|
|
|
} // 3: Current AP
|
2017-10-18 17:22:34 +01:00
|
|
|
if (0 == strlen(Settings.sta_ssid[1])) {
|
|
|
|
Settings.sta_active = 0;
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if (Settings.ip_address[0]) {
|
|
|
|
WiFi.config(Settings.ip_address[0], Settings.ip_address[1], Settings.ip_address[2], Settings.ip_address[3]); // Set static IP
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
WiFi.hostname(my_hostname);
|
|
|
|
WiFi.begin(Settings.sta_ssid[Settings.sta_active], Settings.sta_pwd[Settings.sta_active]);
|
2017-09-13 13:19:34 +01:00
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_CONNECTING_TO_AP "%d %s " D_IN_MODE " 11%c " D_AS " %s..."),
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.sta_active +1, Settings.sta_ssid[Settings.sta_active], kWifiPhyMode[WiFi.getPhyMode() & 0x3], my_hostname);
|
|
|
|
AddLog(LOG_LEVEL_INFO);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void WifiCheckIp()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-04-25 17:24:42 +01:00
|
|
|
if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
|
2017-10-18 17:22:34 +01:00
|
|
|
wifi_counter = WIFI_CHECK_SEC;
|
|
|
|
wifi_retry = WIFI_RETRY_SEC;
|
|
|
|
AddLog_P((wifi_status != WL_CONNECTED) ? LOG_LEVEL_INFO : LOG_LEVEL_DEBUG_MORE, S_LOG_WIFI, PSTR(D_CONNECTED));
|
|
|
|
if (wifi_status != WL_CONNECTED) {
|
|
|
|
// AddLog_P(LOG_LEVEL_INFO, PSTR("Wifi: Set IP addresses"));
|
|
|
|
Settings.ip_address[1] = (uint32_t)WiFi.gatewayIP();
|
|
|
|
Settings.ip_address[2] = (uint32_t)WiFi.subnetMask();
|
|
|
|
Settings.ip_address[3] = (uint32_t)WiFi.dnsIP();
|
2017-03-25 16:24:11 +00:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
wifi_status = WL_CONNECTED;
|
2017-01-28 13:41:01 +00:00
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
wifi_status = WiFi.status();
|
|
|
|
switch (wifi_status) {
|
2017-01-28 13:41:01 +00:00
|
|
|
case WL_CONNECTED:
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_NO_IP_ADDRESS));
|
|
|
|
wifi_status = 0;
|
|
|
|
wifi_retry = WIFI_RETRY_SEC;
|
2017-01-28 13:41:01 +00:00
|
|
|
break;
|
|
|
|
case WL_NO_SSID_AVAIL:
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_NOT_REACHED));
|
|
|
|
if (WIFI_WAIT == Settings.sta_config) {
|
|
|
|
wifi_retry = WIFI_RETRY_SEC;
|
2017-09-16 13:19:47 +01:00
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
if (wifi_retry > (WIFI_RETRY_SEC / 2)) {
|
|
|
|
wifi_retry = WIFI_RETRY_SEC / 2;
|
2017-09-16 13:19:47 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
else if (wifi_retry) {
|
|
|
|
wifi_retry = 0;
|
2017-09-16 13:19:47 +01:00
|
|
|
}
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
break;
|
|
|
|
case WL_CONNECT_FAILED:
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_WRONG_PASSWORD));
|
|
|
|
if (wifi_retry > (WIFI_RETRY_SEC / 2)) {
|
|
|
|
wifi_retry = WIFI_RETRY_SEC / 2;
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
else if (wifi_retry) {
|
|
|
|
wifi_retry = 0;
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
break;
|
|
|
|
default: // WL_IDLE_STATUS and WL_DISCONNECTED
|
2017-10-18 17:22:34 +01:00
|
|
|
if (!wifi_retry || ((WIFI_RETRY_SEC / 2) == wifi_retry)) {
|
|
|
|
AddLog_P(LOG_LEVEL_INFO, S_LOG_WIFI, PSTR(D_CONNECT_FAILED_AP_TIMEOUT));
|
2017-01-28 13:41:01 +00:00
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog_P(LOG_LEVEL_DEBUG, S_LOG_WIFI, PSTR(D_ATTEMPTING_CONNECTION));
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if (wifi_retry) {
|
|
|
|
if (WIFI_RETRY_SEC == wifi_retry) {
|
|
|
|
WifiBegin(3); // Select default SSID
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if ((Settings.sta_config != WIFI_WAIT) && ((WIFI_RETRY_SEC / 2) == wifi_retry)) {
|
|
|
|
WifiBegin(2); // Select alternate SSID
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
wifi_counter = 1;
|
|
|
|
wifi_retry--;
|
2017-01-28 13:41:01 +00:00
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
WifiConfig(Settings.sta_config);
|
|
|
|
wifi_counter = 1;
|
|
|
|
wifi_retry = WIFI_RETRY_SEC;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void WifiCheck(uint8_t param)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
wifi_counter--;
|
2017-01-28 13:41:01 +00:00
|
|
|
switch (param) {
|
|
|
|
case WIFI_SMARTCONFIG:
|
|
|
|
case WIFI_MANAGER:
|
|
|
|
case WIFI_WPSCONFIG:
|
2017-10-18 17:22:34 +01:00
|
|
|
WifiConfig(param);
|
2017-01-28 13:41:01 +00:00
|
|
|
break;
|
|
|
|
default:
|
2017-10-18 17:22:34 +01:00
|
|
|
if (wifi_config_counter) {
|
|
|
|
wifi_config_counter--;
|
|
|
|
wifi_counter = wifi_config_counter +5;
|
|
|
|
if (wifi_config_counter) {
|
|
|
|
if ((WIFI_SMARTCONFIG == wifi_config_type) && WiFi.smartConfigDone()) {
|
|
|
|
wifi_config_counter = 0;
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if ((WIFI_WPSCONFIG == wifi_config_type) && WifiWpsConfigDone()) {
|
|
|
|
wifi_config_counter = 0;
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if (!wifi_config_counter) {
|
2017-04-25 17:24:42 +01:00
|
|
|
if (strlen(WiFi.SSID().c_str())) {
|
2017-10-18 17:22:34 +01:00
|
|
|
strlcpy(Settings.sta_ssid[0], WiFi.SSID().c_str(), sizeof(Settings.sta_ssid[0]));
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
|
|
|
if (strlen(WiFi.psk().c_str())) {
|
2017-10-18 17:22:34 +01:00
|
|
|
strlcpy(Settings.sta_pwd[0], WiFi.psk().c_str(), sizeof(Settings.sta_pwd[0]));
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
Settings.sta_active = 0;
|
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_WIFI D_WCFG_1_SMARTCONFIG D_CMND_SSID "1 %s, " D_CMND_PASSWORD "1 %s"), Settings.sta_ssid[0], Settings.sta_pwd[0]);
|
|
|
|
AddLog(LOG_LEVEL_INFO);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if (!wifi_config_counter) {
|
|
|
|
if (WIFI_SMARTCONFIG == wifi_config_type) {
|
2017-04-25 17:24:42 +01:00
|
|
|
WiFi.stopSmartConfig();
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
restart_flag = 2;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
if (wifi_counter <= 0) {
|
|
|
|
AddLog_P(LOG_LEVEL_DEBUG_MORE, S_LOG_WIFI, PSTR(D_CHECKING_CONNECTION));
|
|
|
|
wifi_counter = WIFI_CHECK_SEC;
|
|
|
|
WifiCheckIp();
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0) && !wifi_config_type) {
|
2018-01-10 13:10:25 +00:00
|
|
|
#ifdef BE_MINIMAL
|
|
|
|
if (1 == RtcSettings.ota_loader) {
|
|
|
|
RtcSettings.ota_loader = 0;
|
|
|
|
ota_state_flag = 3;
|
|
|
|
}
|
|
|
|
#endif // BE_MINIMAL
|
2017-01-28 13:41:01 +00:00
|
|
|
#ifdef USE_DISCOVERY
|
2017-10-18 17:22:34 +01:00
|
|
|
if (!mdns_begun) {
|
|
|
|
mdns_begun = MDNS.begin(my_hostname);
|
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS "%s"), (mdns_begun) ? D_INITIALIZED : D_FAILED);
|
|
|
|
AddLog(LOG_LEVEL_INFO);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
#endif // USE_DISCOVERY
|
|
|
|
#ifdef USE_WEBSERVER
|
2017-10-18 17:22:34 +01:00
|
|
|
if (Settings.webserver) {
|
|
|
|
StartWebserver(Settings.webserver, WiFi.localIP());
|
2017-01-28 13:41:01 +00:00
|
|
|
#ifdef USE_DISCOVERY
|
|
|
|
#ifdef WEBSERVER_ADVERTISE
|
|
|
|
MDNS.addService("http", "tcp", 80);
|
2017-09-02 13:37:02 +01:00
|
|
|
#endif // WEBSERVER_ADVERTISE
|
2017-01-28 13:41:01 +00:00
|
|
|
#endif // USE_DISCOVERY
|
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
StopWebserver();
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
2017-01-29 20:36:12 +00:00
|
|
|
#ifdef USE_EMULATION
|
2017-11-11 11:33:30 +00:00
|
|
|
if (Settings.flag2.emulation) {
|
2017-10-18 17:22:34 +01:00
|
|
|
UdpConnect();
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-01-29 20:36:12 +00:00
|
|
|
#endif // USE_EMULATION
|
2017-01-28 13:41:01 +00:00
|
|
|
#endif // USE_WEBSERVER
|
|
|
|
} else {
|
2017-01-29 20:36:12 +00:00
|
|
|
#ifdef USE_EMULATION
|
2017-10-18 17:22:34 +01:00
|
|
|
UdpDisconnect();
|
2017-01-29 20:36:12 +00:00
|
|
|
#endif // USE_EMULATION
|
2017-10-18 17:22:34 +01:00
|
|
|
mdns_begun = false;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
int WifiState()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
|
|
|
int state;
|
|
|
|
|
2017-04-25 17:24:42 +01:00
|
|
|
if ((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0)) {
|
|
|
|
state = WIFI_RESTART;
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if (wifi_config_type) {
|
|
|
|
state = wifi_config_type;
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
return state;
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void WifiConnect()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
|
|
|
WiFi.persistent(false); // Solve possible wifi init errors
|
2017-10-18 17:22:34 +01:00
|
|
|
wifi_status = 0;
|
|
|
|
wifi_retry = WIFI_RETRY_SEC;
|
|
|
|
wifi_counter = 1;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef USE_DISCOVERY
|
|
|
|
/*********************************************************************************************\
|
|
|
|
* mDNS
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
|
|
|
#ifdef MQTT_HOST_DISCOVERY
|
2017-10-18 17:22:34 +01:00
|
|
|
boolean MdnsDiscoverMqttServer()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
if (!mdns_begun) {
|
2017-04-25 17:24:42 +01:00
|
|
|
return false;
|
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-10-23 11:18:15 +01:00
|
|
|
int n = MDNS.queryService("mqtt", "tcp"); // Search for mqtt service
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-09-13 13:19:34 +01:00
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS D_QUERY_DONE " %d"), n);
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog(LOG_LEVEL_INFO);
|
2017-01-28 13:41:01 +00:00
|
|
|
|
|
|
|
if (n > 0) {
|
|
|
|
// Note: current strategy is to get the first MQTT service (even when many are found)
|
2017-10-18 17:22:34 +01:00
|
|
|
snprintf_P(Settings.mqtt_host, sizeof(Settings.mqtt_host), MDNS.IP(0).toString().c_str());
|
|
|
|
Settings.mqtt_port = MDNS.port(0);
|
2017-09-02 13:37:02 +01:00
|
|
|
|
2017-09-13 13:19:34 +01:00
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_MDNS D_MQTT_SERVICE_FOUND " %s, " D_IP_ADDRESS " %s, " D_PORT " %d"),
|
2017-10-18 17:22:34 +01:00
|
|
|
MDNS.hostname(0).c_str(), Settings.mqtt_host, Settings.mqtt_port);
|
|
|
|
AddLog(LOG_LEVEL_INFO);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return n > 0;
|
|
|
|
}
|
|
|
|
#endif // MQTT_HOST_DISCOVERY
|
|
|
|
#endif // USE_DISCOVERY
|
|
|
|
|
|
|
|
/*********************************************************************************************\
|
|
|
|
* Basic I2C routines
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
|
|
|
#ifdef USE_I2C
|
|
|
|
#define I2C_RETRY_COUNTER 3
|
|
|
|
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
uint32_t i2c_buffer = 0;
|
|
|
|
|
|
|
|
bool I2cValidRead(uint8_t addr, uint8_t reg, uint8_t size)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
byte x = I2C_RETRY_COUNTER;
|
2017-01-28 13:41:01 +00:00
|
|
|
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
i2c_buffer = 0;
|
2017-01-28 13:41:01 +00:00
|
|
|
do {
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
Wire.beginTransmission(addr); // start transmission to device
|
|
|
|
Wire.write(reg); // sends register address to read from
|
|
|
|
if (0 == Wire.endTransmission(false)) { // Try to become I2C Master, send data and collect bytes, keep master status for next request...
|
|
|
|
Wire.requestFrom((int)addr, (int)size); // send data n-bytes read
|
2017-04-25 17:24:42 +01:00
|
|
|
if (Wire.available() == size) {
|
2017-10-12 13:09:19 +01:00
|
|
|
for (byte i = 0; i < size; i++) {
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
i2c_buffer = i2c_buffer << 8 | Wire.read(); // receive DATA
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
x--;
|
|
|
|
} while (Wire.endTransmission(true) != 0 && x != 0); // end transmission
|
|
|
|
return (x);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool I2cValidRead8(uint8_t *data, uint8_t addr, uint8_t reg)
|
|
|
|
{
|
|
|
|
bool status = I2cValidRead(addr, reg, 1);
|
|
|
|
*data = (uint8_t)i2c_buffer;
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool I2cValidRead16(uint16_t *data, uint8_t addr, uint8_t reg)
|
|
|
|
{
|
|
|
|
bool status = I2cValidRead(addr, reg, 2);
|
|
|
|
*data = (uint16_t)i2c_buffer;
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool I2cValidReadS16(int16_t *data, uint8_t addr, uint8_t reg)
|
|
|
|
{
|
|
|
|
bool status = I2cValidRead(addr, reg, 2);
|
|
|
|
*data = (int16_t)i2c_buffer;
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool I2cValidRead16LE(uint16_t *data, uint8_t addr, uint8_t reg)
|
|
|
|
{
|
|
|
|
uint16_t ldata;
|
|
|
|
bool status = I2cValidRead16(&ldata, addr, reg);
|
|
|
|
*data = (ldata >> 8) | (ldata << 8);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool I2cValidReadS16_LE(int16_t *data, uint8_t addr, uint8_t reg)
|
|
|
|
{
|
|
|
|
uint16_t ldata;
|
|
|
|
bool status = I2cValidRead16LE(&ldata, addr, reg);
|
|
|
|
*data = (int16_t)ldata;
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool I2cValidRead24(int32_t *data, uint8_t addr, uint8_t reg)
|
|
|
|
{
|
|
|
|
bool status = I2cValidRead(addr, reg, 3);
|
|
|
|
*data = i2c_buffer;
|
|
|
|
return status;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint8_t I2cRead8(uint8_t addr, uint8_t reg)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
I2cValidRead(addr, reg, 1);
|
|
|
|
return (uint8_t)i2c_buffer;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint16_t I2cRead16(uint8_t addr, uint8_t reg)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
I2cValidRead(addr, reg, 2);
|
|
|
|
return (uint16_t)i2c_buffer;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
int16_t I2cReadS16(uint8_t addr, uint8_t reg)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
I2cValidRead(addr, reg, 2);
|
|
|
|
return (int16_t)i2c_buffer;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint16_t I2cRead16LE(uint8_t addr, uint8_t reg)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
I2cValidRead(addr, reg, 2);
|
|
|
|
uint16_t temp = (uint16_t)i2c_buffer;
|
2017-01-28 13:41:01 +00:00
|
|
|
return (temp >> 8) | (temp << 8);
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
int16_t I2cReadS16_LE(uint8_t addr, uint8_t reg)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
return (int16_t)I2cRead16LE(addr, reg);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
int32_t I2cRead24(uint8_t addr, uint8_t reg)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
I2cValidRead(addr, reg, 3);
|
|
|
|
return i2c_buffer;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
2017-11-11 11:33:30 +00:00
|
|
|
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
bool I2cWrite(uint8_t addr, uint8_t reg, uint32_t val, uint8_t size)
|
2017-11-07 14:57:24 +00:00
|
|
|
{
|
|
|
|
byte x = I2C_RETRY_COUNTER;
|
|
|
|
|
|
|
|
do {
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
Wire.beginTransmission((uint8_t)addr); // start transmission to device
|
|
|
|
Wire.write(reg); // sends register address to write to
|
2017-11-28 20:57:35 +00:00
|
|
|
uint8_t bytes = size;
|
|
|
|
while (bytes--) {
|
|
|
|
Wire.write((val >> (8 * bytes)) & 0xFF); // write data
|
|
|
|
}
|
2017-11-07 14:57:24 +00:00
|
|
|
x--;
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
} while (Wire.endTransmission(true) != 0 && x != 0); // end transmission
|
|
|
|
return (x);
|
2017-11-07 14:57:24 +00:00
|
|
|
}
|
|
|
|
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
bool I2cWrite8(uint8_t addr, uint8_t reg, uint16_t val)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
return I2cWrite(addr, reg, val, 1);
|
2017-11-11 11:33:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool I2cWrite16(uint8_t addr, uint8_t reg, uint16_t val)
|
|
|
|
{
|
v5.9.1j - Add Dual R2, Rewrite DS18x20 and fixes
5.9.1j
* Revert changes to xsns_05_ds18x20.ino and rename to
xsns_05_ds18x20_legacy.ino still needing library OneWire and providing
legacy JSON message:
*
"DS18x20":{"DS1":{"Type":"DS18B20","Address":"284CC48E04000079","Temperature":19.5},"DS2":{"Type":"DS18B20","Address":"283AC28304000052","Temperature":19.6}}
* Add new xdrv_05_ds18x20.ino free from library OneWire and add the
following features:
* Add support for DS1822
* Add forced setting of
12-bit resolution for selected device types (#1222)
* Add read
temperature retry counter (#1215)
* Fix lost sensors by performing
sensor probe at restart only thereby removing dynamic sensor probe
(#1215)
* Fix sensor address sorting using ascending sort on sensor
type followed by sensor address
* Rewrite JSON resulting in shorter
message allowing more sensors in default firmware image:
*
"DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6}
* Add additional define in user_config.h to select either single sensor
(defines disabled), new multi sensor (USE_DS18X20) or legacy multi
sensor (USE_DS18X20_LEGACY)
* Add support for Sonoff Dual R2 (#1249)
*
Fix ADS1115 detection (#1258)
2017-11-27 16:46:51 +00:00
|
|
|
return I2cWrite(addr, reg, val, 2);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void I2cScan(char *devs, unsigned int devs_len)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-04-25 17:24:42 +01:00
|
|
|
byte error;
|
|
|
|
byte address;
|
|
|
|
byte any = 0;
|
2017-01-28 13:41:01 +00:00
|
|
|
char tstr[10];
|
|
|
|
|
2018-01-06 16:34:42 +00:00
|
|
|
snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_DEVICES_FOUND_AT));
|
2017-01-28 13:41:01 +00:00
|
|
|
for (address = 1; address <= 127; address++) {
|
|
|
|
Wire.beginTransmission(address);
|
|
|
|
error = Wire.endTransmission();
|
2017-04-25 17:24:42 +01:00
|
|
|
if (0 == error) {
|
2017-01-28 13:41:01 +00:00
|
|
|
snprintf_P(tstr, sizeof(tstr), PSTR(" 0x%2x"), address);
|
|
|
|
strncat(devs, tstr, devs_len);
|
|
|
|
any = 1;
|
|
|
|
}
|
2017-04-25 17:24:42 +01:00
|
|
|
else if (4 == error) {
|
2018-01-06 16:34:42 +00:00
|
|
|
snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_UNKNOWN_ERROR_AT " 0x%2x\"}"), address);
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
if (any) {
|
|
|
|
strncat(devs, "\"}", devs_len);
|
|
|
|
} else {
|
2018-01-06 16:34:42 +00:00
|
|
|
snprintf_P(devs, devs_len, PSTR("{\"" D_CMND_I2CSCAN "\":\"" D_JSON_I2CSCAN_NO_DEVICES_FOUND "\"}"));
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-25 13:27:30 +01:00
|
|
|
|
|
|
|
boolean I2cDevice(byte addr)
|
|
|
|
{
|
|
|
|
for (byte address = 1; address <= 127; address++) {
|
|
|
|
Wire.beginTransmission(address);
|
|
|
|
if (!Wire.endTransmission() && (address == addr)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
#endif // USE_I2C
|
|
|
|
|
|
|
|
/*********************************************************************************************\
|
|
|
|
* Real Time Clock
|
|
|
|
*
|
|
|
|
* Sources: Time by Michael Margolis and Paul Stoffregen (https://github.com/PaulStoffregen/Time)
|
|
|
|
* Timezone by Jack Christensen (https://github.com/JChristensen/Timezone)
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
#include "sntp.h"
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SECS_PER_MIN ((uint32_t)(60UL))
|
|
|
|
#define SECS_PER_HOUR ((uint32_t)(3600UL))
|
|
|
|
#define SECS_PER_DAY ((uint32_t)(SECS_PER_HOUR * 24UL))
|
|
|
|
#define LEAP_YEAR(Y) (((1970+Y)>0) && !((1970+Y)%4) && (((1970+Y)%100) || !((1970+Y)%400)))
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
Ticker TickerRtc;
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
static const uint8_t kDaysInMonth[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; // API starts months from 1, this array starts from 0
|
2017-12-29 13:35:05 +00:00
|
|
|
static const char kMonthNamesEnglish[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint32_t utc_time = 0;
|
|
|
|
uint32_t local_time = 0;
|
|
|
|
uint32_t daylight_saving_time = 0;
|
|
|
|
uint32_t standard_time = 0;
|
|
|
|
uint32_t ntp_time = 0;
|
2017-04-25 17:24:42 +01:00
|
|
|
uint32_t midnight = 1451602800;
|
2017-10-18 17:22:34 +01:00
|
|
|
uint8_t midnight_now = 0;
|
2018-02-07 16:50:02 +00:00
|
|
|
uint8_t ntp_sync_minute = 0;
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
String GetBuildDateAndTime()
|
2017-03-08 15:20:45 +00:00
|
|
|
{
|
2017-07-15 14:07:30 +01:00
|
|
|
// "2017-03-07T11:08:02" - ISO8601:2004
|
2017-03-08 15:20:45 +00:00
|
|
|
char bdt[21];
|
2017-04-25 17:24:42 +01:00
|
|
|
char *p;
|
2017-03-08 15:20:45 +00:00
|
|
|
char mdate[] = __DATE__; // "Mar 7 2017"
|
2018-02-03 22:25:05 +00:00
|
|
|
char *smonth = mdate;
|
|
|
|
int day = 0;
|
|
|
|
int year = 0;
|
2017-09-02 13:37:02 +01:00
|
|
|
|
2018-02-03 22:25:05 +00:00
|
|
|
// sscanf(mdate, "%s %d %d", bdt, &day, &year); // Not implemented in 2.3.0 and probably too much code
|
2017-03-08 15:20:45 +00:00
|
|
|
byte i = 0;
|
2018-02-03 22:25:05 +00:00
|
|
|
for (char *str = strtok_r(mdate, " ", &p); str && i < 3; str = strtok_r(NULL, " ", &p)) {
|
2017-03-08 15:20:45 +00:00
|
|
|
switch (i++) {
|
|
|
|
case 0: // Month
|
|
|
|
smonth = str;
|
|
|
|
break;
|
|
|
|
case 1: // Day
|
|
|
|
day = atoi(str);
|
|
|
|
break;
|
|
|
|
case 2: // Year
|
|
|
|
year = atoi(str);
|
|
|
|
}
|
|
|
|
}
|
2018-02-03 22:25:05 +00:00
|
|
|
int month = (strstr(kMonthNamesEnglish, smonth) -kMonthNamesEnglish) /3 +1;
|
2017-09-02 13:37:02 +01:00
|
|
|
snprintf_P(bdt, sizeof(bdt), PSTR("%d" D_YEAR_MONTH_SEPARATOR "%02d" D_MONTH_DAY_SEPARATOR "%02d" D_DATE_TIME_SEPARATOR "%s"), year, month, day, __TIME__);
|
2017-03-08 15:20:45 +00:00
|
|
|
return String(bdt);
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
String GetDateAndTime()
|
2017-03-08 15:20:45 +00:00
|
|
|
{
|
2017-07-15 14:07:30 +01:00
|
|
|
// "2017-03-07T11:08:02" - ISO8601:2004
|
2017-03-08 15:20:45 +00:00
|
|
|
char dt[21];
|
2017-09-02 13:37:02 +01:00
|
|
|
|
|
|
|
snprintf_P(dt, sizeof(dt), PSTR("%04d" D_YEAR_MONTH_SEPARATOR "%02d" D_MONTH_DAY_SEPARATOR "%02d" D_DATE_TIME_SEPARATOR "%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"),
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcTime.year, RtcTime.month, RtcTime.day_of_month, RtcTime.hour, RtcTime.minute, RtcTime.second);
|
2017-03-08 15:20:45 +00:00
|
|
|
return String(dt);
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
String GetUtcDateAndTime()
|
2017-07-15 14:07:30 +01:00
|
|
|
{
|
|
|
|
// "2017-03-07T11:08:02" - ISO8601:2004
|
|
|
|
char dt[21];
|
|
|
|
|
|
|
|
TIME_T tmpTime;
|
2017-10-18 17:22:34 +01:00
|
|
|
BreakTime(utc_time, tmpTime);
|
|
|
|
tmpTime.year += 1970;
|
2017-07-15 14:07:30 +01:00
|
|
|
|
2017-09-02 13:37:02 +01:00
|
|
|
snprintf_P(dt, sizeof(dt), PSTR("%04d" D_YEAR_MONTH_SEPARATOR "%02d" D_MONTH_DAY_SEPARATOR "%02d" D_DATE_TIME_SEPARATOR "%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"),
|
2017-10-18 17:22:34 +01:00
|
|
|
tmpTime.year, tmpTime.month, tmpTime.day_of_month, tmpTime.hour, tmpTime.minute, tmpTime.second);
|
2017-07-15 14:07:30 +01:00
|
|
|
return String(dt);
|
|
|
|
}
|
|
|
|
|
2018-02-07 16:50:02 +00:00
|
|
|
String GetUptime()
|
|
|
|
{
|
|
|
|
char dt[16];
|
|
|
|
|
|
|
|
TIME_T ut;
|
|
|
|
BreakTime(uptime, ut);
|
|
|
|
|
|
|
|
// "P128DT14H35M44S" - ISO8601:2004 - https://en.wikipedia.org/wiki/ISO_8601 Durations
|
|
|
|
// snprintf_P(dt, sizeof(dt), PSTR("P%dDT%02dH%02dM%02dS"), ut.days, ut.hour, ut.minute, ut.second);
|
|
|
|
|
|
|
|
// "128 14:35:44" - OpenVMS
|
|
|
|
// "128T14:35:44" - Tasmota
|
|
|
|
snprintf_P(dt, sizeof(dt), PSTR("%d" D_DATE_TIME_SEPARATOR "%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d"), ut.days, ut.hour, ut.minute, ut.second);
|
|
|
|
return String(dt);
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void BreakTime(uint32_t time_input, TIME_T &tm)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
// break the given time_input into time components
|
2017-01-28 13:41:01 +00:00
|
|
|
// this is a more compact version of the C library localtime function
|
|
|
|
// note that year is offset from 1970 !!!
|
|
|
|
|
2017-04-25 17:24:42 +01:00
|
|
|
uint8_t year;
|
|
|
|
uint8_t month;
|
2017-10-18 17:22:34 +01:00
|
|
|
uint8_t month_length;
|
2017-01-28 13:41:01 +00:00
|
|
|
uint32_t time;
|
|
|
|
unsigned long days;
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
time = time_input;
|
|
|
|
tm.second = time % 60;
|
2017-01-28 13:41:01 +00:00
|
|
|
time /= 60; // now it is minutes
|
2017-10-18 17:22:34 +01:00
|
|
|
tm.minute = time % 60;
|
2017-01-28 13:41:01 +00:00
|
|
|
time /= 60; // now it is hours
|
2017-10-18 17:22:34 +01:00
|
|
|
tm.hour = time % 24;
|
2017-01-28 13:41:01 +00:00
|
|
|
time /= 24; // now it is days
|
2018-02-07 16:50:02 +00:00
|
|
|
tm.days = time;
|
2017-10-18 17:22:34 +01:00
|
|
|
tm.day_of_week = ((time + 4) % 7) + 1; // Sunday is day 1
|
2017-01-28 13:41:01 +00:00
|
|
|
|
|
|
|
year = 0;
|
|
|
|
days = 0;
|
|
|
|
while((unsigned)(days += (LEAP_YEAR(year) ? 366 : 365)) <= time) {
|
|
|
|
year++;
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
tm.year = year; // year is offset from 1970
|
2017-01-28 13:41:01 +00:00
|
|
|
|
|
|
|
days -= LEAP_YEAR(year) ? 366 : 365;
|
|
|
|
time -= days; // now it is days in this year, starting at 0
|
2017-10-18 17:22:34 +01:00
|
|
|
tm.day_of_year = time;
|
2017-01-28 13:41:01 +00:00
|
|
|
|
|
|
|
days = 0;
|
|
|
|
month = 0;
|
2017-10-18 17:22:34 +01:00
|
|
|
month_length = 0;
|
2017-01-28 13:41:01 +00:00
|
|
|
for (month = 0; month < 12; month++) {
|
2017-04-25 17:24:42 +01:00
|
|
|
if (1 == month) { // february
|
2017-01-28 13:41:01 +00:00
|
|
|
if (LEAP_YEAR(year)) {
|
2017-10-18 17:22:34 +01:00
|
|
|
month_length = 29;
|
2017-01-28 13:41:01 +00:00
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
month_length = 28;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
month_length = kDaysInMonth[month];
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
if (time >= month_length) {
|
|
|
|
time -= month_length;
|
2017-01-28 13:41:01 +00:00
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
strlcpy(tm.name_of_month, kMonthNames + (month *3), 4);
|
|
|
|
tm.month = month + 1; // jan is month 1
|
|
|
|
tm.day_of_month = time + 1; // day of month
|
|
|
|
tm.valid = (time_input > 1451602800); // 2016-01-01
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint32_t MakeTime(TIME_T &tm)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
|
|
|
// assemble time elements into time_t
|
|
|
|
// note year argument is offset from 1970
|
|
|
|
|
|
|
|
int i;
|
|
|
|
uint32_t seconds;
|
|
|
|
|
|
|
|
// seconds from 1970 till 1 jan 00:00:00 of the given year
|
2017-10-18 17:22:34 +01:00
|
|
|
seconds = tm.year * (SECS_PER_DAY * 365);
|
|
|
|
for (i = 0; i < tm.year; i++) {
|
2017-01-28 13:41:01 +00:00
|
|
|
if (LEAP_YEAR(i)) {
|
|
|
|
seconds += SECS_PER_DAY; // add extra days for leap years
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// add days for this year, months start from 1
|
2017-10-18 17:22:34 +01:00
|
|
|
for (i = 1; i < tm.month; i++) {
|
|
|
|
if ((2 == i) && LEAP_YEAR(tm.year)) {
|
2017-01-28 13:41:01 +00:00
|
|
|
seconds += SECS_PER_DAY * 29;
|
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
seconds += SECS_PER_DAY * kDaysInMonth[i-1]; // monthDay array starts from 0
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
seconds+= (tm.day_of_month - 1) * SECS_PER_DAY;
|
|
|
|
seconds+= tm.hour * SECS_PER_HOUR;
|
|
|
|
seconds+= tm.minute * SECS_PER_MIN;
|
|
|
|
seconds+= tm.second;
|
2017-01-28 13:41:01 +00:00
|
|
|
return seconds;
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint32_t RuleToTime(TimeChangeRule r, int yr)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2018-02-08 14:20:03 +00:00
|
|
|
TIME_T tm;
|
|
|
|
uint32_t t;
|
|
|
|
uint8_t m;
|
|
|
|
uint8_t w; // temp copies of r.month and r.week
|
|
|
|
|
|
|
|
m = r.month;
|
|
|
|
w = r.week;
|
|
|
|
if (0 == w) { // Last week = 0
|
|
|
|
if (++m > 12) { // for "Last", go to the next month
|
|
|
|
m = 1;
|
|
|
|
yr++;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
2018-02-08 14:20:03 +00:00
|
|
|
w = 1; // and treat as first week of next month, subtract 7 days later
|
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2018-02-08 14:20:03 +00:00
|
|
|
tm.hour = r.hour;
|
|
|
|
tm.minute = 0;
|
|
|
|
tm.second = 0;
|
|
|
|
tm.day_of_month = 1;
|
|
|
|
tm.month = m;
|
|
|
|
tm.year = yr - 1970;
|
|
|
|
t = MakeTime(tm); // First day of the month, or first day of next month for "Last" rules
|
|
|
|
BreakTime(t, tm);
|
|
|
|
t += (7 * (w - 1) + (r.dow - tm.day_of_week + 7) % 7) * SECS_PER_DAY;
|
|
|
|
if (0 == r.week) {
|
|
|
|
t -= 7 * SECS_PER_DAY; // back up a week if this is a "Last" rule
|
|
|
|
}
|
|
|
|
return t;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
String GetTime(int type)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
|
|
|
char stime[25]; // Skip newline
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint32_t time = utc_time;
|
|
|
|
if (1 == type) time = local_time;
|
|
|
|
if (2 == type) time = daylight_saving_time;
|
|
|
|
if (3 == type) time = standard_time;
|
2017-09-13 13:19:34 +01:00
|
|
|
snprintf_P(stime, sizeof(stime), sntp_get_real_time(time));
|
2017-01-28 13:41:01 +00:00
|
|
|
return String(stime);
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint32_t LocalTime()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
return local_time;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
uint32_t Midnight()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
|
|
|
return midnight;
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
boolean MidnightNow()
|
2017-05-17 21:49:22 +01:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
boolean mnflg = midnight_now;
|
2018-02-08 14:20:03 +00:00
|
|
|
if (mnflg) midnight_now = 0;
|
2017-05-17 21:49:22 +01:00
|
|
|
return mnflg;
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void RtcSecond()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-04-25 17:24:42 +01:00
|
|
|
uint32_t stdoffset;
|
|
|
|
uint32_t dstoffset;
|
2017-01-28 13:41:01 +00:00
|
|
|
TIME_T tmpTime;
|
|
|
|
|
2018-02-07 16:50:02 +00:00
|
|
|
if ((ntp_sync_minute > 59) && (3 == RtcTime.minute)) 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
|
|
|
|
if ((WL_CONNECTED == WiFi.status()) && (offset == RtcTime.second) && ((RtcTime.year < 2016) || (ntp_sync_minute == RtcTime.minute))) {
|
2017-10-18 17:22:34 +01:00
|
|
|
ntp_time = sntp_get_current_timestamp();
|
|
|
|
if (ntp_time) {
|
|
|
|
utc_time = ntp_time;
|
2018-02-08 14:20:03 +00:00
|
|
|
ntp_sync_minute = 60; // Sync so block further requests
|
2017-10-18 17:22:34 +01:00
|
|
|
BreakTime(utc_time, tmpTime);
|
|
|
|
RtcTime.year = tmpTime.year + 1970;
|
|
|
|
daylight_saving_time = RuleToTime(DaylightSavingTime, RtcTime.year);
|
|
|
|
standard_time = RuleToTime(StandardTime, RtcTime.year);
|
2018-02-08 14:20:03 +00:00
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION "(" D_UTC_TIME ") %s, (" D_DST_TIME ") %s, (" D_STD_TIME ") %s"),
|
|
|
|
GetTime(0).c_str(), GetTime(2).c_str(), GetTime(3).c_str());
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog(LOG_LEVEL_DEBUG);
|
2018-02-07 16:50:02 +00:00
|
|
|
} else {
|
2018-02-08 14:20:03 +00:00
|
|
|
ntp_sync_minute++; // Try again in next minute
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
utc_time++;
|
|
|
|
local_time = utc_time;
|
|
|
|
if (local_time > 1451602800) { // 2016-01-01
|
|
|
|
if (99 == Settings.timezone) {
|
|
|
|
if (DaylightSavingTime.hemis) {
|
|
|
|
dstoffset = StandardTime.offset * SECS_PER_MIN; // Southern hemisphere
|
|
|
|
stdoffset = DaylightSavingTime.offset * SECS_PER_MIN;
|
2017-10-08 15:51:05 +01:00
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
dstoffset = DaylightSavingTime.offset * SECS_PER_MIN; // Northern hemisphere
|
|
|
|
stdoffset = StandardTime.offset * SECS_PER_MIN;
|
2017-10-08 15:51:05 +01:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if ((utc_time >= (daylight_saving_time - stdoffset)) && (utc_time < (standard_time - dstoffset))) {
|
|
|
|
local_time += dstoffset; // Daylight Saving Time
|
2017-01-28 13:41:01 +00:00
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
local_time += stdoffset; // Standard Time
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
} else {
|
2017-10-18 17:22:34 +01:00
|
|
|
local_time += Settings.timezone * SECS_PER_HOUR;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
BreakTime(local_time, RtcTime);
|
|
|
|
if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second && RtcTime.valid) {
|
|
|
|
midnight = local_time;
|
|
|
|
midnight_now = 1;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
RtcTime.year += 1970;
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void RtcInit()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-10-18 17:22:34 +01:00
|
|
|
sntp_setservername(0, Settings.ntp_server[0]);
|
|
|
|
sntp_setservername(1, Settings.ntp_server[1]);
|
|
|
|
sntp_setservername(2, Settings.ntp_server[2]);
|
2017-01-28 13:41:01 +00:00
|
|
|
sntp_stop();
|
|
|
|
sntp_set_timezone(0); // UTC time
|
|
|
|
sntp_init();
|
2017-10-18 17:22:34 +01:00
|
|
|
utc_time = 0;
|
|
|
|
BreakTime(utc_time, RtcTime);
|
|
|
|
TickerRtc.attach(1, RtcSecond);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-11-03 17:07:25 +00:00
|
|
|
#ifndef USE_ADC_VCC
|
|
|
|
/*********************************************************************************************\
|
|
|
|
* ADC support
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2017-11-04 15:36:51 +00:00
|
|
|
void AdcShow(boolean json)
|
2017-11-03 17:07:25 +00:00
|
|
|
{
|
2017-11-04 15:36:51 +00:00
|
|
|
uint16_t analog = 0;
|
2017-11-03 17:07:25 +00:00
|
|
|
for (byte i = 0; i < 32; i++) {
|
2017-11-04 15:36:51 +00:00
|
|
|
analog += analogRead(A0);
|
2017-11-03 17:07:25 +00:00
|
|
|
delay(1);
|
|
|
|
}
|
2017-11-04 15:36:51 +00:00
|
|
|
analog >>= 5;
|
2017-11-03 17:07:25 +00:00
|
|
|
|
2017-11-04 15:36:51 +00:00
|
|
|
if (json) {
|
2017-12-29 13:35:05 +00:00
|
|
|
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"" D_JSON_ANALOG_INPUT "0\":%d"), mqtt_data, analog);
|
2017-11-03 17:07:25 +00:00
|
|
|
#ifdef USE_WEBSERVER
|
2017-11-04 15:36:51 +00:00
|
|
|
} else {
|
2017-11-07 14:57:24 +00:00
|
|
|
snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_SNS_ANALOG, mqtt_data, "", 0, analog);
|
2017-11-03 17:07:25 +00:00
|
|
|
#endif // USE_WEBSERVER
|
2017-11-04 15:36:51 +00:00
|
|
|
}
|
|
|
|
}
|
2017-11-03 17:07:25 +00:00
|
|
|
|
|
|
|
/*********************************************************************************************\
|
|
|
|
* Interface
|
|
|
|
\*********************************************************************************************/
|
|
|
|
|
|
|
|
#define XSNS_02
|
|
|
|
|
|
|
|
boolean Xsns02(byte function)
|
|
|
|
{
|
|
|
|
boolean result = false;
|
|
|
|
|
|
|
|
if (pin[GPIO_ADC0] < 99) {
|
|
|
|
switch (function) {
|
2017-12-25 16:41:12 +00:00
|
|
|
case FUNC_JSON_APPEND:
|
2017-11-04 15:36:51 +00:00
|
|
|
AdcShow(1);
|
2017-11-03 17:07:25 +00:00
|
|
|
break;
|
|
|
|
#ifdef USE_WEBSERVER
|
2017-12-25 16:41:12 +00:00
|
|
|
case FUNC_WEB_APPEND:
|
2017-11-04 15:36:51 +00:00
|
|
|
AdcShow(0);
|
2017-11-03 17:07:25 +00:00
|
|
|
break;
|
|
|
|
#endif // USE_WEBSERVER
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
#endif // USE_ADC_VCC
|
|
|
|
|
2017-01-28 13:41:01 +00:00
|
|
|
/*********************************************************************************************\
|
|
|
|
* Syslog
|
2017-11-04 15:36:51 +00:00
|
|
|
*
|
2017-11-03 17:07:25 +00:00
|
|
|
* Example:
|
|
|
|
* snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_LOG "Any value %d"), value);
|
|
|
|
* AddLog(LOG_LEVEL_DEBUG);
|
|
|
|
*
|
2017-01-28 13:41:01 +00:00
|
|
|
\*********************************************************************************************/
|
|
|
|
|
2018-01-30 13:14:55 +00:00
|
|
|
#ifdef USE_WEBSERVER
|
|
|
|
void GetLog(byte idx, char** entry_pp, size_t* len_p)
|
|
|
|
{
|
|
|
|
char* entry_p = NULL;
|
|
|
|
size_t len = 0;
|
|
|
|
|
|
|
|
if (idx) {
|
|
|
|
char* it = web_log;
|
|
|
|
do {
|
|
|
|
byte cur_idx = *it;
|
|
|
|
it++;
|
2018-02-01 15:18:00 +00:00
|
|
|
size_t tmp = strchrspn(it, '\1');
|
2018-01-30 13:14:55 +00:00
|
|
|
tmp++; // Skip terminating '\1'
|
|
|
|
if (cur_idx == idx) { // Found the requested entry
|
|
|
|
len = tmp;
|
|
|
|
entry_p = it;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
it += tmp;
|
|
|
|
} while (it < web_log + WEB_LOG_SIZE && *it != '\0');
|
|
|
|
}
|
|
|
|
*entry_pp = entry_p;
|
|
|
|
*len_p = len;
|
|
|
|
}
|
|
|
|
#endif // USE_WEBSERVER
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void Syslog()
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-09-14 13:20:27 +01:00
|
|
|
// Destroys log_data
|
|
|
|
char syslog_preamble[64]; // Hostname + Id
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-09-26 16:50:39 +01:00
|
|
|
if ((static_cast<uint32_t>(syslog_host_addr) == 0) || ((millis() - syslog_host_refresh) > 60000)) {
|
2017-10-18 17:22:34 +01:00
|
|
|
WiFi.hostByName(Settings.syslog_host, syslog_host_addr);
|
2017-09-26 16:50:39 +01:00
|
|
|
syslog_host_refresh = millis();
|
|
|
|
}
|
2017-10-18 17:22:34 +01:00
|
|
|
if (PortUdp.beginPacket(syslog_host_addr, Settings.syslog_port)) {
|
|
|
|
snprintf_P(syslog_preamble, sizeof(syslog_preamble), PSTR("%s ESP-"), my_hostname);
|
2017-09-14 13:20:27 +01:00
|
|
|
memmove(log_data + strlen(syslog_preamble), log_data, sizeof(log_data) - strlen(syslog_preamble));
|
|
|
|
log_data[sizeof(log_data) -1] = '\0';
|
|
|
|
memcpy(log_data, syslog_preamble, strlen(syslog_preamble));
|
2017-10-18 17:22:34 +01:00
|
|
|
PortUdp.write(log_data);
|
|
|
|
PortUdp.endPacket();
|
2017-01-28 13:41:01 +00:00
|
|
|
} else {
|
|
|
|
syslog_level = 0;
|
|
|
|
syslog_timer = SYSLOG_TIMER;
|
2017-09-13 13:19:34 +01:00
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_APPLICATION D_SYSLOG_HOST_NOT_FOUND ". " D_RETRY_IN " %d " D_UNIT_SECOND), SYSLOG_TIMER);
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog(LOG_LEVEL_INFO);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void AddLog(byte loglevel)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2018-01-30 13:14:55 +00:00
|
|
|
char mxtime[10]; // "13:45:21 "
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2018-01-30 13:14:55 +00:00
|
|
|
snprintf_P(mxtime, sizeof(mxtime), PSTR("%02d" D_HOUR_MINUTE_SEPARATOR "%02d" D_MINUTE_SECOND_SEPARATOR "%02d "), RtcTime.hour, RtcTime.minute, RtcTime.second);
|
2017-01-28 13:41:01 +00:00
|
|
|
|
2017-09-14 13:20:27 +01:00
|
|
|
if (loglevel <= seriallog_level) {
|
2018-01-30 13:14:55 +00:00
|
|
|
Serial.printf("%s%s\n", mxtime, log_data);
|
2017-09-14 13:20:27 +01:00
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
#ifdef USE_WEBSERVER
|
2017-10-18 17:22:34 +01:00
|
|
|
if (Settings.webserver && (loglevel <= Settings.weblog_level)) {
|
2018-01-30 13:14:55 +00:00
|
|
|
// Delimited, zero-terminated buffer of log lines.
|
|
|
|
// Each entry has this format: [index][log data]['\1']
|
|
|
|
if (!web_log_index) web_log_index++; // Index 0 is not allowed as it is the end of char string
|
|
|
|
while (web_log_index == web_log[0] || // If log already holds the next index, remove it
|
|
|
|
strlen(web_log) + strlen(log_data) + 13 > WEB_LOG_SIZE) // 13 = web_log_index + mxtime + '\1' + '\0'
|
|
|
|
{
|
|
|
|
char* it = web_log;
|
|
|
|
it++; // Skip web_log_index
|
2018-02-01 15:18:00 +00:00
|
|
|
it += strchrspn(it, '\1'); // Skip log line
|
2018-01-30 13:14:55 +00:00
|
|
|
it++; // Skip delimiting "\1"
|
|
|
|
memmove(web_log, it, WEB_LOG_SIZE -(it-web_log)); // Move buffer forward to remove oldest log line
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2018-01-30 13:14:55 +00:00
|
|
|
snprintf_P(web_log, sizeof(web_log), PSTR("%s%c%s%s\1"), web_log, web_log_index++, mxtime, log_data);
|
2018-02-06 12:50:05 +00:00
|
|
|
if (!web_log_index) web_log_index++; // Index 0 is not allowed as it is the end of char string
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
#endif // USE_WEBSERVER
|
2017-04-25 17:24:42 +01:00
|
|
|
if ((WL_CONNECTED == WiFi.status()) && (loglevel <= syslog_level)) {
|
2017-10-18 17:22:34 +01:00
|
|
|
Syslog();
|
2017-04-25 17:24:42 +01:00
|
|
|
}
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void AddLog_P(byte loglevel, const char *formatP)
|
2017-01-28 13:41:01 +00:00
|
|
|
{
|
2017-09-13 13:19:34 +01:00
|
|
|
snprintf_P(log_data, sizeof(log_data), formatP);
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog(loglevel);
|
2017-01-28 13:41:01 +00:00
|
|
|
}
|
|
|
|
|
2017-10-18 17:22:34 +01:00
|
|
|
void AddLog_P(byte loglevel, const char *formatP, const char *formatP2)
|
2017-09-02 13:37:02 +01:00
|
|
|
{
|
2017-09-14 13:20:27 +01:00
|
|
|
char message[100];
|
2017-09-02 13:37:02 +01:00
|
|
|
|
2017-09-13 13:19:34 +01:00
|
|
|
snprintf_P(log_data, sizeof(log_data), formatP);
|
2017-09-14 13:20:27 +01:00
|
|
|
snprintf_P(message, sizeof(message), formatP2);
|
|
|
|
strncat(log_data, message, sizeof(log_data));
|
2017-10-18 17:22:34 +01:00
|
|
|
AddLog(loglevel);
|
2017-09-02 13:37:02 +01:00
|
|
|
}
|
|
|
|
|
2018-02-04 17:09:09 +00:00
|
|
|
void AddLogSerial(byte loglevel)
|
|
|
|
{
|
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_SERIAL D_RECEIVED));
|
|
|
|
for (byte i = 0; i < serial_in_byte_counter; i++) {
|
|
|
|
snprintf_P(log_data, sizeof(log_data), PSTR("%s %02X"), log_data, serial_in_buffer[i]);
|
|
|
|
}
|
|
|
|
AddLog(loglevel);
|
|
|
|
}
|
|
|
|
|
2017-01-28 13:41:01 +00:00
|
|
|
/*********************************************************************************************\
|
|
|
|
*
|
|
|
|
\*********************************************************************************************/
|