Little bugfix and moved "Zirkulation Betriebsart" to sensors

LarsK1 · Apr 2, 2024 · 459fd43 · 459fd43
1 parent a85381a
commit 459fd43
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 100 deletions.
diff --git a/custom_components/solvis_control/const.py b/custom_components/solvis_control/const.py
@@ -292,8 +292,8 @@ class ModbusFieldConfig:
         unit="",
         device_class=None,
         state_class=None,
-        multiplier=1,
-        data=("0", "1", "2", "3"),
+        multiplier=1
+        # data=("0", "1", "2", "3"),
     ),
     ModbusFieldConfig(  # Raumtemperatur_HKR1
         name="raumtemperatur_hkr1",

diff --git a/custom_components/solvis_control/icons.json b/custom_components/solvis_control/icons.json
@@ -1,87 +1,15 @@
 {
-    "entity": {
-      "sensor": {
-        "gas_power": {
-          "default": "mdi:gas-burner"
-        },
-        "cold_water_temp": {
-          "name": "Zirkulationsdurchfluss"
-        },
-        "runtime_gasburner": {
-          "default": "mdi:hours-24"
-        },
-        "number_gas_burner_start": {
-          "default": "mdi:numeric"
-        },
-        "ionisation_voltage": {
-          "name": "Ionisationsstrom"
-        },
-        "a01_pumpe_zirkulation": {
-          "name": "A01.Pumpe Zirkulation"
-        },
-        "a02_pumpe_warmwasser": {
-          "name": "A02.Pumpe Warmwasser"
-        },
-        "a03_pumpe_hk1": {
-          "name": "A03.Pumpe HK1"
-        },
-        "a05_pumpe_zirkulation": {
-          "name": "A05.Pumpe Zirkulation"
-        },
-        "a12_brennerstatus": {
-          "name": "A12.Brennerstatus"
-        },
-        "ww_nachheizung_2322": {
-          "name": "WW Nachheizung 2322"
-        },
-        "solar_water_flow": {
-          "name": "Durchflussmenge Solar"
-        },
-        "domestic_water_flow": {
-          "name": "Durchfluss Warmwasserzirkualation"
-        },
-        "hkr1_betriebsart": {
-          "name": "HKR1 Betriebsart",
-          "state": {
-            "1": "Aus",
-            "2": "Puls",
-            "3": "Temp",
-            "4": "Warten"
-          }
-        },
-        "hkr1_absenktemperatur_nacht": {
-          "name": "HKR1 Absenktemperatur Nacht"
-        },
-        "hkr1_solltemperatur_tag": {
-          "name": "HKR1 Solltemperatur Tag"
-        },
-        "ww_solltemperatur": {
-          "name": "WW Solltemperatur"
-        },
-        "version_sc2": {
-          "name": "Version SC2"
-        },
-        "version_nbg": {
-          "name": "Version NBG"
-        },
-        "raumtemperatur_hkr1": {
-          "name": "Raumtemperatur HKR1"
-        },
-        "zirkulation_betriebsart": {
-          "name": "Zirkulation Betriebsart",
-          "state": {
-            "1": "Aus",
-            "2": "Puls",
-            "3": "Temp",
-            "4": "Warten"
-          }
-        },
-        "digin_stoerungen": {
-          "name": "Störungen",
-          "state": {
-            "1": "keine Störung"
-          }
-        }
+  "entity": {
+    "sensor": {
+      "gas_power": {
+        "default": "mdi:gas-burner"
+      },
+      "runtime_gasburner": {
+        "default": "mdi:hours-24"
+      },
+      "number_gas_burner_start": {
+        "default": "mdi:numeric"
       }
     }
-  }
+  }
+}
diff --git a/custom_components/solvis_control/select.py b/custom_components/solvis_control/select.py
@@ -48,7 +48,7 @@ async def async_setup_entry(
     sensors_to_add = []
 
     for register in REGISTERS:
-        if register.address not in (2818, 2049):
+        if register.address not in (2818, ):
             continue
         sensors_to_add.append(
             SolvisSensor(

diff --git a/custom_components/solvis_control/sensor.py b/custom_components/solvis_control/sensor.py
@@ -48,7 +48,7 @@ async def async_setup_entry(
     for register in REGISTERS:
         if register.edit:
             continue
-        if register.address in (2818, 2049):
+        if register.address in (2818):
             continue
         sensors_to_add.append(
             SolvisSensor(

diff --git a/custom_components/solvis_control/strings.json b/custom_components/solvis_control/strings.json
@@ -70,7 +70,9 @@
           "6": "Eco",
           "7": "Urlaub"
         }
-      },
+      }
+    },
+    "sensor": {
       "zirkulation_betriebsart": {
         "name": "Zirkulation Betriebsart",
         "state": {
@@ -79,9 +81,7 @@
           "2": "Zeit",
           "3": "Puls/Zeit"
         }
-      }
-    },
-    "sensor": {
+      },
       "gas_power": {
         "name": "Brennerleistung"
       },

diff --git a/custom_components/solvis_control/translations/de.json b/custom_components/solvis_control/translations/de.json
@@ -70,7 +70,9 @@
           "6": "Eco",
           "7": "Urlaub"
         }
-      },
+      }
+    },
+    "sensor": {
       "zirkulation_betriebsart": {
         "name": "Zirkulation Betriebsart",
         "state": {
@@ -79,9 +81,7 @@
           "2": "Zeit",
           "3": "Puls/Zeit"
         }
-      }
-    },
-    "sensor": {
+      },
       "gas_power": {
         "name": "Brennerleistung"
       },

diff --git a/custom_components/solvis_control/translations/en.json b/custom_components/solvis_control/translations/en.json
@@ -70,7 +70,9 @@
           "6": "Eco",
           "7": "Urlaub"
         }
-      },
+      }
+    },
+    "sensor": {
       "zirkulation_betriebsart": {
         "name": "Zirkulation Betriebsart",
         "state": {
@@ -79,9 +81,7 @@
           "2": "Zeit",
           "3": "Puls/Zeit"
         }
-      }
-    },
-    "sensor": {
+      },
       "gas_power": {
         "name": "Brennerleistung"
       },