Merge pull request #3 from mplogas/issue/1

huh wild. the main part of the pr was missing :D
mplogas · Sep 8, 2024 · 90e3ca9 · 90e3ca9
2 parents ff0c0ad + d6f6894
commit 90e3ca9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/Ecowitt.Controller/Mapping/ApiDataExtension.cs b/src/Ecowitt.Controller/Mapping/ApiDataExtension.cs
@@ -319,15 +319,22 @@ public static Gateway Map(this GatewayApiData gatewayApiData, bool isMetric = tr
                             double value;
                             double maxVoltage;
                             double minVoltage;
+
+                            /*
+                             *
+                               wh90batt - voltage of the AA batteries
+                               ws90cap_volt - voltage of the capacitor battery (solar charged)
+
+                             */
                             if (propertyName.Equals("wh90batt", StringComparison.InvariantCultureIgnoreCase))
                             {
-                                maxVoltage = 5.3;
-                                minVoltage = 2.0;
+                                maxVoltage = 3.0;
+                                minVoltage = 2.2;
                                 value = doubleVal / 100;
                             }
                             else
                             {
-                                minVoltage = 1.2;
+                                minVoltage = 1.1;
                                 maxVoltage = 1.5;
                                 value = doubleVal / 10;
                             }

diff --git a/src/Ecowitt.Controller/appsettings.json b/src/Ecowitt.Controller/appsettings.json
@@ -13,25 +13,14 @@
     "user": "",
     "password": "",
     "port": 1883,
-    "basetopic": "ecowitt-dev",
+    "basetopic": "ec-dev",
     "clientId": "ecowitt-controller",
     "reconnect": true,
     "reconnectAttemps": 5    
   },
   "ecowitt": {
     "pollingInterval": 3,
-    "autodiscovery": true,
-    "retries": 2,
-    "gateways": [
-      {
-        "name": "Garten",
-        "ip": "192.168.103.162"
-      },
-      {
-        "name": "Haus",
-        "ip": "192.168.103.241"
-      }
-    ]
+    "autodiscovery": true
   },
   "controller": {
     "precision": 2,