uptime also in seconds (restAPI)

Author: mrWheel

DSMRloggerAPI.ino

@@ -2,7 +2,7 @@
 ***************************************************************************  
 **  Program  : DSMRloggerAPI (restAPI)
 */
-#define _FW_VERSION "v3.0.Beta3 (09-06-2021)"
+#define _FW_VERSION "v3.0.Beta3 (15-06-2021)"
 /*
 **  Copyright (c) 2020, 2021 Willem Aandewiel
 **

data/DSMRindex.js

@@ -2084,6 +2084,7 @@ http://DSMR-API.local/api/v1/dev/settings</pre>", false);
           ,[ "ssid",                      "WiFi SSID" ]
           ,[ "wifirssi",                  "WiFi RSSI" ]
           ,[ "uptime",                    "Up Time [dagen] - [hh:mm]" ]
+          ,[ "uptime_secs",               "Up Time in Seconds" ]
           ,[ "reboots",                   "Aantal keer opnieuw opgestart" ]
           ,[ "lastreset",                 "Laatste Reset reden" ]
 

edge/DSMRindex.js

@@ -2084,6 +2084,7 @@ http://DSMR-API.local/api/v1/dev/settings</pre>", false);
           ,[ "ssid",                      "WiFi SSID" ]
           ,[ "wifirssi",                  "WiFi RSSI" ]
           ,[ "uptime",                    "Up Time [dagen] - [hh:mm]" ]
+          ,[ "uptime_secs",               "Up Time in Seconds" ]
           ,[ "reboots",                   "Aantal keer opnieuw opgestart" ]
           ,[ "lastreset",                 "Laatste Reset reden" ]
 

restAPI.ino

@@ -385,7 +385,7 @@ void sendDeviceInfo()
   sendNestedJsonObj("flashchiprealsize", formatFloat((ESP.getFlashChipRealSize() / 1024.0 / 1024.0), 3), "MB");
 
   FSYS.info(SPIFFSinfo);
-  sendNestedJsonObj("spiffssize", formatFloat( (SPIFFSinfo.totalBytes / (1024.0 * 1024.0)), 0), "MB");
+  sendNestedJsonObj("filesystem_size", formatFloat( (SPIFFSinfo.totalBytes / (1024.0 * 1024.0)), 0), "MB");
 
   sendNestedJsonObj("flashchipspeed", formatFloat((ESP.getFlashChipSpeed() / 1000.0 / 1000.0), 0), "MHz");
 
@@ -412,6 +412,7 @@ void sendDeviceInfo()
 #endif
   sendNestedJsonObj("wifirssi", WiFi.RSSI());
   sendNestedJsonObj("uptime", upTime());
+  sendNestedJsonObj("uptime_secs",      (int)upTimeSeconds, "sec");
   sendNestedJsonObj("oled_type",        (int)settingOledType);
   sendNestedJsonObj("oled_flip_screen", (int)settingOledFlip);
   sendNestedJsonObj("smhasfaseinfo",    (int)settingSmHasFaseInfo);
@@ -448,6 +449,8 @@ void sendDeviceTime()
   sendNestedJsonObj("timestamp", actTimestamp); 
   sendNestedJsonObj("time", buildDateTimeString(actTimestamp, sizeof(actTimestamp)).c_str()); 
   sendNestedJsonObj("epoch", (int)now());
+  sendNestedJsonObj("uptime", upTime());
+  sendNestedJsonObj("uptime_secs", (int)upTimeSeconds, "sec");
 
   sendEndJsonObj();