andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 11:49:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

uptime to 32 bits, build# to homie

Browse Source
This commit is contained in:
Andrey Klimov
2019-03-06 15:51:44 +03:00
parent 517b760e49
commit eb43bc5d18
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lighthub/homiedef.h
View File

@@ -7,7 +7,7 @@ const char homie_P[] PROGMEM = "$homie";
const char homiever_P[] PROGMEM = "2.1.0"; const char homiever_P[] PROGMEM = "2.1.0";
const char name_P[] PROGMEM = "$name"; const char name_P[] PROGMEM = "$name";
const char nameval_P[] PROGMEM = "LightHub"; const char nameval_P[] PROGMEM = "LightHub ";
const char nodes_P[] PROGMEM = "$nodes"; const char nodes_P[] PROGMEM = "$nodes";
const char color_P[] PROGMEM = "color"; const char color_P[] PROGMEM = "color";

12
lighthub/main.cpp
View File

@@ -117,6 +117,7 @@ lan_status lanStatus = INITIAL_STATE;
const char configserver[] PROGMEM = CONFIG_SERVER; const char configserver[] PROGMEM = CONFIG_SERVER;
const char verval_P[] PROGMEM = QUOTE(PIO_SRC_REV);
unsigned int UniqueID[5] = {0,0,0,0,0}; unsigned int UniqueID[5] = {0,0,0,0,0};
@@ -140,10 +141,10 @@ aJsonObject *dmxArr = NULL;
aJsonObject *udpSyslogArr = NULL; aJsonObject *udpSyslogArr = NULL;
#endif #endif
unsigned long nextPollingCheck = 0; uint32_t nextPollingCheck = 0;
unsigned long nextInputCheck = 0; uint32_t nextInputCheck = 0;
unsigned long nextLanCheckTime = 0; uint32_t nextLanCheckTime = 0;
unsigned long nextThermostatCheck = 0; uint32_t nextThermostatCheck = 0;
aJsonObject *pollingItem = NULL; aJsonObject *pollingItem = NULL;
@@ -385,6 +386,7 @@ void onMQTTConnect(){
setTopic(topic,sizeof(topic),T_DEV); setTopic(topic,sizeof(topic),T_DEV);
strncat_P(topic, name_P, sizeof(topic)); strncat_P(topic, name_P, sizeof(topic));
strncpy_P(buf, nameval_P, sizeof(buf)); strncpy_P(buf, nameval_P, sizeof(buf));
strncat_P(buf,(verval_P),sizeof(buf));
mqttClient.publish(topic,buf,true); mqttClient.publish(topic,buf,true);
//strncpy_P(topic, outprefix, sizeof(topic)); //strncpy_P(topic, outprefix, sizeof(topic));
@@ -1396,7 +1398,7 @@ void publishStat(){
long fr = freeRam(); long fr = freeRam();
char topic[64]; char topic[64];
char intbuf[16]; char intbuf[16];
long ut = millis()/1000; uint32_t ut = millis()/1000;
// debugSerial<<F("\nfree RAM: ")<<fr; // debugSerial<<F("\nfree RAM: ")<<fr;
setTopic(topic,sizeof(topic),T_DEV); setTopic(topic,sizeof(topic),T_DEV);