jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add mac address and idle to statusupdate messages

Browse Source
This commit is contained in:
fvanroie 2021-03-29 02:48:41 +02:00
parent 54cb9df986
commit cd4be903fe
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -59,7 +59,7 @@ build_flags =
; -- Hasp build options ---------------------------- ; -- Hasp build options ----------------------------
-D HASP_VER_MAJ=0 -D HASP_VER_MAJ=0
-D HASP_VER_MIN=4 -D HASP_VER_MIN=4
-D HASP_VER_REV=0 -D HASP_VER_REV=1
-D HASP_LOG_LEVEL=9 -D HASP_LOG_LEVEL=9
${override.build_flags} ${override.build_flags}

29
src/hasp/hasp_dispatch.cpp
View File

@ -360,11 +360,8 @@ void dispatch_text_line(const char* cmnd)
} }
} }
// send idle state to the client void dispatch_get_idle_state(uint8_t state, char* payload)
void dispatch_output_idle_state(uint8_t state)
{ {
char topic[6];
char payload[6];
switch(state) { switch(state) {
case HASP_SLEEP_LONG: case HASP_SLEEP_LONG:
memcpy_P(payload, PSTR("long"), 5); memcpy_P(payload, PSTR("long"), 5);
@ -375,7 +372,16 @@ void dispatch_output_idle_state(uint8_t state)
default: default:
memcpy_P(payload, PSTR("off"), 4); memcpy_P(payload, PSTR("off"), 4);
} }
}
// send idle state to the client
void dispatch_output_idle_state(uint8_t state)
{
char topic[6];
char payload[6];
memcpy_P(topic, PSTR("idle"), 5); memcpy_P(topic, PSTR("idle"), 5);
dispatch_get_idle_state(state, payload);
dispatch_state_subtopic(topic, payload); dispatch_state_subtopic(topic, payload);
} }
@ -1032,18 +1038,22 @@ void dispatch_output_statusupdate(const char*, const char*)
{ {
#if HASP_USE_MQTT > 0 #if HASP_USE_MQTT > 0
char data[3 * 128]; char data[400];
char topic[16];
{ {
char buffer[128]; char buffer[128];
haspGetVersion(buffer, sizeof(buffer)); haspGetVersion(buffer, sizeof(buffer));
snprintf_P(data, sizeof(data), dispatch_get_idle_state(hasp_sleep_state, topic);
PSTR("{\"node\":\"%s\",\"status\":\"available\",\"version\":\"%s\",\"uptime\":%lu,"), snprintf_P(data, sizeof(data), PSTR("{\"node\":\"%s\",\"idle\":\"%s\",\"version\":\"%s\",\"uptime\":%lu,"),
haspDevice.get_hostname(), buffer, long(millis() / 1000)); haspDevice.get_hostname(), topic, buffer, long(millis() / 1000)); // \"status\":\"available\",
#if HASP_USE_WIFI > 0 #if HASP_USE_WIFI > 0 || HASP_USE_ETHERNET > 0
network_get_statusupdate(buffer, sizeof(buffer)); network_get_statusupdate(buffer, sizeof(buffer));
strcat(data, buffer); strcat(data, buffer);
snprintf_P(buffer, sizeof(buffer), PSTR("\"mac\":\"%s\","), halGetMacAddress(0, ":").c_str());
strcat(data, buffer);
#endif #endif
snprintf_P(buffer, sizeof(buffer), PSTR("\"heapFree\":%u,\"heapFrag\":%u,\"core\":\"%s\","), snprintf_P(buffer, sizeof(buffer), PSTR("\"heapFree\":%u,\"heapFrag\":%u,\"core\":\"%s\","),
@ -1064,7 +1074,6 @@ void dispatch_output_statusupdate(const char*, const char*)
strcat(data, buffer); strcat(data, buffer);
} }
char topic[16];
memcpy_P(topic, PSTR("statusupdate"), 13); memcpy_P(topic, PSTR("statusupdate"), 13);
dispatch_state_subtopic(topic, data); dispatch_state_subtopic(topic, data);
dispatchLastMillis = millis(); dispatchLastMillis = millis();