mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-29 05:36:39 +00:00
6.4.1.14 Add diag info to status 3
6.4.1.14 20190203 * Add SetOption32 until SetOption49 diagnostic information to Status 3 report as replacement for second property value in SetOption property name * Add Resolution property to Status 3 report providing previous SetOption second value property
This commit is contained in:
parent
fc5059bb84
commit
54aaaf50c9
@ -1,4 +1,8 @@
|
|||||||
/* 6.4.1.13 20190130
|
/* 6.4.1.14 20190203
|
||||||
|
* Add SetOption32 until SetOption49 diagnostic information to Status 3 report as replacement for second property value in SetOption property name
|
||||||
|
* Add Resolution property to Status 3 report providing previous SetOption second value property
|
||||||
|
*
|
||||||
|
* 6.4.1.13 20190130
|
||||||
* Add command SetOption36 to control boot loop default restoration (#4645, #5063)
|
* Add command SetOption36 to control boot loop default restoration (#4645, #5063)
|
||||||
* Add resiliency to saved Settings (#5065)
|
* Add resiliency to saved Settings (#5065)
|
||||||
*
|
*
|
||||||
|
@ -113,6 +113,7 @@
|
|||||||
#define D_JSON_PROGRAMSIZE "ProgramSize"
|
#define D_JSON_PROGRAMSIZE "ProgramSize"
|
||||||
#define D_JSON_REFERENCETEMPERATURE "ReferenceTemperature"
|
#define D_JSON_REFERENCETEMPERATURE "ReferenceTemperature"
|
||||||
#define D_JSON_RESET "Reset"
|
#define D_JSON_RESET "Reset"
|
||||||
|
#define D_JSON_RESOLUTION "Resolution"
|
||||||
#define D_JSON_RESTARTING "Restarting"
|
#define D_JSON_RESTARTING "Restarting"
|
||||||
#define D_JSON_RESTARTREASON "RestartReason"
|
#define D_JSON_RESTARTREASON "RestartReason"
|
||||||
#define D_JSON_RSSI "RSSI"
|
#define D_JSON_RSSI "RSSI"
|
||||||
|
@ -1566,7 +1566,7 @@ void PublishStatus(uint8_t payload)
|
|||||||
{
|
{
|
||||||
uint8_t option = STAT;
|
uint8_t option = STAT;
|
||||||
char stemp[MAX_FRIENDLYNAMES * (sizeof(Settings.friendlyname[0]) +MAX_FRIENDLYNAMES)];
|
char stemp[MAX_FRIENDLYNAMES * (sizeof(Settings.friendlyname[0]) +MAX_FRIENDLYNAMES)];
|
||||||
char stemp2[MAX_SWITCHES * 3];
|
char stemp2[64];
|
||||||
|
|
||||||
// Workaround MQTT - TCP/IP stack queueing when SUB_PREFIX = PUB_PREFIX
|
// Workaround MQTT - TCP/IP stack queueing when SUB_PREFIX = PUB_PREFIX
|
||||||
if (!strcmp(Settings.mqtt_prefix[0],Settings.mqtt_prefix[1]) && (!payload)) { option++; } // TELE
|
if (!strcmp(Settings.mqtt_prefix[0],Settings.mqtt_prefix[1]) && (!payload)) { option++; } // TELE
|
||||||
@ -1603,8 +1603,12 @@ void PublishStatus(uint8_t payload)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((0 == payload) || (3 == payload)) {
|
if ((0 == payload) || (3 == payload)) {
|
||||||
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS3_LOGGING "\":{\"" D_CMND_SERIALLOG "\":%d,\"" D_CMND_WEBLOG "\":%d,\"" D_CMND_SYSLOG "\":%d,\"" D_CMND_LOGHOST "\":\"%s\",\"" D_CMND_LOGPORT "\":%d,\"" D_CMND_SSID "\":[\"%s\",\"%s\"],\"" D_CMND_TELEPERIOD "\":%d,\"" D_CMND_SETOPTION "\":[\"%08X\",\"%08X\",\"%08X\"]}}"),
|
stemp2[0] = '\0';
|
||||||
Settings.seriallog_level, Settings.weblog_level, Settings.syslog_level, Settings.syslog_host, Settings.syslog_port, Settings.sta_ssid[0], Settings.sta_ssid[1], Settings.tele_period, Settings.flag.data, Settings.flag2.data, Settings.flag3.data);
|
for (int8_t i = 0; i < PARAM8_SIZE; i++) {
|
||||||
|
snprintf_P(stemp2, sizeof(stemp2), PSTR("%s%02X"), stemp2, Settings.param[i]);
|
||||||
|
}
|
||||||
|
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_CMND_STATUS D_STATUS3_LOGGING "\":{\"" D_CMND_SERIALLOG "\":%d,\"" D_CMND_WEBLOG "\":%d,\"" D_CMND_SYSLOG "\":%d,\"" D_CMND_LOGHOST "\":\"%s\",\"" D_CMND_LOGPORT "\":%d,\"" D_CMND_SSID "\":[\"%s\",\"%s\"],\"" D_CMND_TELEPERIOD "\":%d,\"" D_JSON_RESOLUTION "\":\"%08X\",\"" D_CMND_SETOPTION "\":[\"%08X\",\"%s\",\"%08X\"]}}"),
|
||||||
|
Settings.seriallog_level, Settings.weblog_level, Settings.syslog_level, Settings.syslog_host, Settings.syslog_port, Settings.sta_ssid[0], Settings.sta_ssid[1], Settings.tele_period, Settings.flag2.data, Settings.flag.data, stemp2, Settings.flag3.data);
|
||||||
MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "3"));
|
MqttPublishPrefixTopic_P(option, PSTR(D_CMND_STATUS "3"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#ifndef _SONOFF_VERSION_H_
|
#ifndef _SONOFF_VERSION_H_
|
||||||
#define _SONOFF_VERSION_H_
|
#define _SONOFF_VERSION_H_
|
||||||
|
|
||||||
#define VERSION 0x0604010D
|
#define VERSION 0x0604010E
|
||||||
|
|
||||||
#define D_PROGRAMNAME "Sonoff-Tasmota"
|
#define D_PROGRAMNAME "Sonoff-Tasmota"
|
||||||
#define D_AUTHOR "Theo Arends"
|
#define D_AUTHOR "Theo Arends"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user