Merge branch 'main' of https://git.belevo.ch/dh/Symcon_Belevo_Energiemanagement_testing

# Conflicts:
#	library.json

Ladestation_Universal/form.json

@@ -32,10 +32,21 @@
             "caption": "Zyklen zwischen zwei Leisutungsänderungen",
             "suffix": ""
         },
-
         {
-            "type": "Label",
-            "caption": "Aktuell wird nur Go-E ladestation unterstützt!"
-        }
+            "type": "Select",
+            "name": "Ladestation",
+            "caption": "Ladestation",
+            "value": 2,
+            "options": [
+              {
+                "caption": "Go-E Wallbox (Alte Version)",
+                "value": 1
+              },
+              {
+                "caption": "Go-E Germini / Germini Flex",
+                "value": 2
+              }
+            ]
+          }
     ]
 }

Ladestation_Universal/module.php

@@ -12,6 +12,8 @@ class Ladestation_Universal extends IPSModule
         $this->RegisterPropertyInteger("MinLeistung_1ph", 1400);
         $this->RegisterPropertyInteger("MaxLeistung_1ph", 7800);
         $this->RegisterPropertyString("IP_Adresse", "0.0.0.0");
+        $this->RegisterPropertyInteger("Ladestation", 2);
+
 
         // Ladestationspezifische Variabeln
         $this->RegisterVariableBoolean("Ladebereit", "Ladebereit", "~Switch", 1);

library.json

@@ -6,7 +6,11 @@
     "compatibility": {
         "version": "7.1"
     },
+<<<<<<< HEAD
+    "version": "0.173",
+=======
     "version": "0.189",
+>>>>>>> 04d67d2e0d688a8c20edd9a347dad2b09ea62229
     "build": 0,
     "date": 0
 }