chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

[BREAKING] Change uptime unit from seconds to minutes (#897)

Browse Source 
* Change uptime from s to min

to prevent going to the max of unsigned long
This commit is contained in:
Florian authored and GitHub committed 2021-03-14 19:31:53 -05:00
1 parent 625f7f358b
commit 0e8b619bb9
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/ZmqttDiscovery.ino
+1 -1
View File
@@ -174,7 +174,7 @@ void pubMqttDiscovery() {
createDiscovery("sensor", //set Type createDiscovery("sensor", //set Type
subjectSYStoMQTT, "SYS: Uptime", (char*)getUniqueId("uptime", "").c_str(), //set state_topic,name,uniqueId subjectSYStoMQTT, "SYS: Uptime", (char*)getUniqueId("uptime", "").c_str(), //set state_topic,name,uniqueId
"", "", "{{ value_json.uptime }}", //set availability_topic,device_class,value_template, "", "", "{{ value_json.uptime }}", //set availability_topic,device_class,value_template,
"", "", "s", //set,payload_on,payload_off,unit_of_meas, "", "", "min", //set,payload_on,payload_off,unit_of_meas,
0, //set off_delay 0, //set off_delay
"", "", true, "", //set,payload_avalaible,payload_not avalaible ,is a gateway entity, command topic "", "", true, "", //set,payload_avalaible,payload_not avalaible ,is a gateway entity, command topic
"", "", "", "", false // device name, device manufacturer, device model, device mac, retain "", "", "", "", false // device name, device manufacturer, device model, device mac, retain
main/main.ino
+2 -2
View File
@@ -1322,10 +1322,10 @@ void loop() {
void stateMeasures() { void stateMeasures() {
StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer; StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
JsonObject& SYSdata = jsonBuffer.createObject(); JsonObject& SYSdata = jsonBuffer.createObject();
unsigned long uptime = millis() / 1000; unsigned long uptime = millis() / 60000; //minutes uptime
SYSdata["uptime"] = uptime; SYSdata["uptime"] = uptime;
SYSdata["version"] = OMG_VERSION; SYSdata["version"] = OMG_VERSION;
Log.trace(F("retrieving value of system characteristics Uptime (s):%u" CR), uptime); Log.trace(F("retrieving value of system characteristics Uptime (min):%u" CR), uptime);
# if defined(ESP8266) || defined(ESP32) # if defined(ESP8266) || defined(ESP32)
uint32_t freeMem; uint32_t freeMem;
freeMem = ESP.getFreeHeap(); freeMem = ESP.getFreeHeap();