From 4cda315aee2a90d1e1b22fce9a267c4c0542f3b4 Mon Sep 17 00:00:00 2001
From: oberfritze <139758614+oberfritze@users.noreply.github.com>
Date: Mon, 7 Aug 2023 01:55:40 +0200
Subject: [PATCH] Add files via upload

Configuration added for SML/OBIS
---
 src/config/config.h   |  6 ++----
 src/config/settings.h | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/config/config.h b/src/config/config.h
index bca9708e..1db31520 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -111,11 +111,9 @@
 #define NTP_REFRESH_INTERVAL    12 * 3600 * 1000
 
 #define AHOY_SML_OBIS_SUPPORT
-#ifdef AHOY_SML_OBIS_SUPPORT
-#define AHOY_CHARTDATA_HDR "Time, AC Power, Grid Power"
-#else
+#define AHOY_CHARTDATA_WITH_GRID_HDR "Time, AC Power, Grid Power"
 #define AHOY_CHARTDATA_HDR "Time, AC Power"
-#endif
+
 
 // #define AHOY_MQTT_SUPPORT
 
diff --git a/src/config/settings.h b/src/config/settings.h
index d04fdce5..2eec2141 100644
--- a/src/config/settings.h
+++ b/src/config/settings.h
@@ -151,6 +151,10 @@ typedef struct {
     uint8_t disp_dc;
 } display_t;
 
+typedef struct {
+    bool ir_connected;
+} cfgSML_t;
+
 typedef struct {
     display_t display;
 } plugins_t;
@@ -164,6 +168,7 @@ typedef struct {
     cfgMqtt_t   mqtt;
     cfgLed_t    led;
     cfgInst_t   inst;
+    cfgSML_t    sml_obis;
     plugins_t   plugin;
     bool        valid;
 } settings_t;
@@ -255,8 +260,13 @@ class settings {
                     if(root.containsKey(F("ntp"))) jsonNtp(root[F("ntp")]);
                     if(root.containsKey(F("sun"))) jsonSun(root[F("sun")]);
                     if(root.containsKey(F("serial"))) jsonSerial(root[F("serial")]);
+#ifdef AHOY_MQTT_SUPPORT
                     if(root.containsKey(F("mqtt"))) jsonMqtt(root[F("mqtt")]);
+#endif
                     if(root.containsKey(F("led"))) jsonLed(root[F("led")]);
+#ifdef AHOY_SML_OBIS_SUPPORT
+                    if(root.containsKey(F("sml_obis"))) jsonSML(root[F("sml_obis")]);
+#endif
                     if(root.containsKey(F("plugin"))) jsonPlugin(root[F("plugin")]);
                     if(root.containsKey(F("inst"))) jsonInst(root[F("inst")]);
                 }
@@ -279,8 +289,13 @@ class settings {
             jsonNtp(root.createNestedObject(F("ntp")), true);
             jsonSun(root.createNestedObject(F("sun")), true);
             jsonSerial(root.createNestedObject(F("serial")), true);
+#ifdef AHOY_MQTT_SUPPORT
             jsonMqtt(root.createNestedObject(F("mqtt")), true);
+#endif
             jsonLed(root.createNestedObject(F("led")), true);
+#ifdef AHOY_SML_OBIS_SUPPORT
+            jsonSML(root.createNestedObject(F("sml_obis")), true);
+#endif
             jsonPlugin(root.createNestedObject(F("plugin")), true);
             jsonInst(root.createNestedObject(F("inst")), true);
 
@@ -388,6 +403,8 @@ class settings {
 
             memset(&mCfg.inst, 0, sizeof(cfgInst_t));
 
+            mCfg.sml_obis.ir_connected     = false;
+
             mCfg.plugin.display.pwrSaveAtIvOffline = false;
             mCfg.plugin.display.contrast = 60;
             mCfg.plugin.display.pxShift = true;
@@ -501,6 +518,7 @@ class settings {
             }
         }
 
+#ifdef AHOY_MQTT_SUPPORT
         void jsonMqtt(JsonObject obj, bool set = false) {
             if(set) {
                 obj[F("broker")] = mCfg.mqtt.broker;
@@ -519,6 +537,7 @@ class settings {
                 getChar(obj, F("topic"), mCfg.mqtt.topic, MQTT_TOPIC_LEN);
             }
         }
+#endif
 
         void jsonLed(JsonObject obj, bool set = false) {
             if(set) {
@@ -532,6 +551,16 @@ class settings {
             }
         }
 
+#ifdef AHOY_SML_OBIS_SUPPORT
+        void jsonSML(JsonObject obj, bool set = false) {
+            if(set) {
+                obj[F("show")]  = mCfg.sml_obis.ir_connected;
+            } else {
+                getVal<bool>(obj, F("show"), &mCfg.sml_obis.ir_connected);
+            }
+        }
+#endif
+
         void jsonPlugin(JsonObject obj, bool set = false) {
             if(set) {
                 JsonObject disp = obj.createNestedObject("disp");