adding configuration element in settings -> network settings to enabl…

…e / disable smartmeter simulation
AloisKlingler · Nov 20, 2023 · 1f77c38 · 1f77c38
1 parent b95041e
commit 1f77c38
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 6 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -68,6 +68,8 @@ struct CONFIG_T {
 
     bool Mdns_Enabled;
 
+    bool Fronius_SM_Simulation_Enabled;
+
     char Ntp_Server[NTP_MAX_SERVER_STRLEN + 1];
     char Ntp_Timezone[NTP_MAX_TIMEZONE_STRLEN + 1];
     char Ntp_TimezoneDescr[NTP_MAX_TIMEZONEDESCR_STRLEN + 1];

diff --git a/include/defaults.h b/include/defaults.h
@@ -22,6 +22,8 @@
 
 #define MDNS_ENABLED false
 
+#define FRONIUS_SM_SIMULATION_ENABLED false
+
 #define NTP_SERVER "pool.ntp.org"
 #define NTP_TIMEZONE "CET-1CEST,M3.5.0,M10.5.0/3"
 #define NTP_TIMEZONEDESCR "Europe/Berlin"

diff --git a/src/Configuration.cpp b/src/Configuration.cpp
@@ -44,6 +44,9 @@ bool ConfigurationClass::write()
     JsonObject mdns = doc.createNestedObject("mdns");
     mdns["enabled"] = config.Mdns_Enabled;
 
+    JsonObject modbus = doc.createNestedObject("modbus");
+    modbus["enabled"] = config.Fronius_SM_Simulation_Enabled;
+
     JsonObject ntp = doc.createNestedObject("ntp");
     ntp["server"] = config.Ntp_Server;
     ntp["timezone"] = config.Ntp_Timezone;
@@ -197,6 +200,9 @@ bool ConfigurationClass::read()
     JsonObject mdns = doc["mdns"];
     config.Mdns_Enabled = mdns["enabled"] | MDNS_ENABLED;
 
+    JsonObject modbus = doc["modbus"];
+    config.Fronius_SM_Simulation_Enabled = modbus["enabled"] | FRONIUS_SM_SIMULATION_ENABLED;
+
     JsonObject ntp = doc["ntp"];
     strlcpy(config.Ntp_Server, ntp["server"] | NTP_SERVER, sizeof(config.Ntp_Server));
     strlcpy(config.Ntp_Timezone, ntp["timezone"] | NTP_TIMEZONE, sizeof(config.Ntp_Timezone));

diff --git a/src/ModbusDtu.cpp b/src/ModbusDtu.cpp
@@ -8,7 +8,6 @@ ModbusDtuClass ModbusDtu;
 void ModbusDtuClass::init()
 {
     mb.server();
-    //const CONFIG_T& config = Configuration.get();
     mb.addHreg(0x9c40, 21365); //40000
     mb.addHreg(0x9c41, 28243); 
     mb.addHreg(0x9c42, 1);
@@ -56,15 +55,15 @@ void ModbusDtuClass::init()
 
 void ModbusDtuClass::loop()
 {
+    if (!(Configuration.get().Fronius_SM_Simulation_Enabled)) return;
     if (!_isstarted) {
         if (Datastore.getIsAllEnabledReachable() && Datastore.getTotalAcYieldTotalEnabled() != 0) {
             ModbusDtu.init();
             yield();
         } else return;
     }
 
-    const CONFIG_T& config = Configuration.get();
-    if (millis() - _lastPublish > (config.Dtu_PollInterval * 1000) && Hoymiles.isAllRadioIdle()) {
+    if (millis() - _lastPublish > ((Configuration.get().Dtu_PollInterval) * 1000) && Hoymiles.isAllRadioIdle()) {
             float value;
             uint16_t *hexbytes = (uint16_t *)&value;
             value = (Datastore.getTotalAcPowerEnabled()*-1);

diff --git a/src/WebApi_network.cpp b/src/WebApi_network.cpp
@@ -77,6 +77,7 @@ void WebApiNetworkClass::onNetworkAdminGet(AsyncWebServerRequest* request)
     root["password"] = config.WiFi_Password;
     root["aptimeout"] = config.WiFi_ApTimeout;
     root["mdnsenabled"] = config.Mdns_Enabled;
+    root["froniussmmodbusenabled"] = config.Fronius_SM_Simulation_Enabled;
 
     response->setLength();
     request->send(response);
@@ -238,6 +239,7 @@ void WebApiNetworkClass::onNetworkAdminPost(AsyncWebServerRequest* request)
     }
     config.WiFi_ApTimeout = root["aptimeout"].as<uint>();
     config.Mdns_Enabled = root["mdnsenabled"].as<bool>();
+    config.Fronius_SM_Simulation_Enabled = root["froniussmmodbusenabled"].as<bool>();
     Configuration.write();
 
     retMsg["type"] = "success";

diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
@@ -404,7 +404,9 @@
         "Minutes": "Minuten",
         "Save": "@:dtuadmin.Save",
         "EnableMdns": "mDNS aktivieren",
-        "MdnsSettings": "mDNS-Einstellungen"
+        "MdnsSettings": "mDNS-Einstellungen",
+        "ModbusSettings": "Modbus-Einstellungen",
+        "EnableFroniusSM": "Fronius SmartMeter Simulation aktivieren"
     },
     "mqttadmin": {
         "MqttSettings": "MQTT-Einstellungen",

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -404,7 +404,9 @@
         "Minutes": "minutes",
         "Save": "@:dtuadmin.Save",
         "EnableMdns": "Enable mDNS",
-        "MdnsSettings": "mDNS Settings"
+        "MdnsSettings": "mDNS Settings",
+        "ModbusSettings": "Modbus Settings",
+        "EnableFroniusSM": "Enable Fronius SmartMeter simulation"
     },
     "mqttadmin": {
         "MqttSettings": "MQTT Settings",

diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json
@@ -404,7 +404,10 @@
         "Minutes": "minutes",
         "Save": "@:dtuadmin.Save",
         "EnableMdns": "Activer mDNS",
-        "MdnsSettings": "mDNS Settings"
+        "MdnsSettings": "mDNS Settings",
+        "ModbusSettings": "Modbus Settings",
+        "EnableFroniusSM": "Activer Fronius SmartMeter simulation"
+
     },
     "mqttadmin": {
         "MqttSettings": "Paramètres MQTT",

diff --git a/webapp/src/types/NetworkConfig.ts b/webapp/src/types/NetworkConfig.ts
@@ -10,4 +10,5 @@ export interface NetworkConfig {
     dns2: string;
     aptimeout: number;
     mdnsenabled: boolean;
+    froniussmmodbusenabled: boolean;
 }
diff --git a/webapp/src/views/NetworkAdminView.vue b/webapp/src/views/NetworkAdminView.vue
@@ -56,6 +56,12 @@
                               type="checkbox"/>
             </CardElement>
 
+            <CardElement :text="$t('networkadmin.ModbusSettings')" textVariant="text-bg-primary" add-space>
+                <InputElement :label="$t('networkadmin.EnableFroniusSM')"
+                              v-model="networkConfigList.froniussmmodbusenabled"
+                              type="checkbox"/>
+            </CardElement>
+
             <CardElement :text="$t('networkadmin.AdminAp')" textVariant="text-bg-primary" add-space>
                 <InputElement :label="$t('networkadmin.ApTimeout')"
                               v-model="networkConfigList.aptimeout"

diff --git a/webapp_dist/js/app.js.gz b/webapp_dist/js/app.js.gz