sys: hide internal details from the header

code/espurna/config/general.h

@@ -41,7 +41,7 @@
 #endif
 
 #ifndef HEARTBEAT_INTERVAL
-#define HEARTBEAT_INTERVAL          heartbeat::Seconds(300ul)     // Interval between heartbeat messages
+#define HEARTBEAT_INTERVAL          300     // Interval between heartbeat messages
 #endif
 
 //------------------------------------------------------------------------------

code/espurna/rpnrules.cpp

@@ -10,6 +10,8 @@ Copyright (C) 2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #if RPN_RULES_SUPPORT
 
+#include <rpnlib.h>
+
 #include "broker.h"
 #include "light.h"
 #include "mqtt.h"

code/espurna/rpnrules.h

@@ -10,10 +10,4 @@ Copyright (C) 2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #include "espurna.h"
 
-#if RPN_RULES_SUPPORT
-
-#include <rpnlib.h>
-
 void rpnSetup();
-
-#endif

code/espurna/system.cpp

@@ -312,6 +312,14 @@ unsigned char systemLoadAverage() {
 
 namespace heartbeat {
 
+constexpr Mode defaultMode() {
+    return HEARTBEAT_MODE;
+}
+
+constexpr Seconds defaultInterval() {
+    return Seconds(HEARTBEAT_INTERVAL);
+}
+
 constexpr Mask defaultValue() {
     return (Report::Status * (HEARTBEAT_REPORT_STATUS))
         | (Report::Ssid * (HEARTBEAT_REPORT_SSID))
@@ -348,11 +356,11 @@ Mask currentValue() {
 }
 
 Mode currentMode() {
-    return getSetting("hbMode", HEARTBEAT_MODE);
+    return getSetting("hbMode", defaultMode());
 }
 
 Seconds currentInterval() {
-    return getSetting("hbInterval", HEARTBEAT_INTERVAL);
+    return getSetting("hbInterval", defaultInterval());
 }
 
 Milliseconds currentIntervalMs() {
@@ -504,6 +512,10 @@ void _systemUpdateLoadAverage() {
 
 #if WEB_SUPPORT
 
+uint8_t _systemHeartbeatModeToId(heartbeat::Mode mode) {
+    return static_cast<uint8_t>(mode);
+}
+
 bool _systemWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
     if (strncmp(key, "sys", 3) == 0) return true;
     if (strncmp(key, "hb", 2) == 0) return true;
@@ -512,8 +524,8 @@ bool _systemWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 
 void _systemWebSocketOnConnected(JsonObject& root) {
     root["hbReport"] = heartbeat::currentValue();
-    root["hbInterval"] = getSetting("hbInterval", HEARTBEAT_INTERVAL).count();
-    root["hbMode"] = static_cast<uint8_t>(getSetting("hbMode", HEARTBEAT_MODE));
+    root["hbInterval"] = getSetting("hbInterval", heartbeat::defaultInterval()).count();
+    root["hbMode"] = _systemHeartbeatModeToId(getSetting("hbMode", heartbeat::defaultMode()));
 }
 
 #endif