Merge pull request #133 from jontofront/127-bug-fix

127 bug fix
jontofront · Dec 17, 2024 · 80c3593 · 80c3593
2 parents 3e2da9c + c80d106
commit 80c3593
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -176,4 +176,11 @@ Thank for @pblxptr add new code line from him
 
 **Full Changelog**: [https://github.com/jontofront/ecoNET-300-Home-Assistant-Integration/compare/v0.3.3...v1.0.5](https://github.com/jontofront/ecoNET-300-Home-Assistant-Integration/compare/v0.3.3...v1.0.5)
 
-## [v1.0.5]
+## [v1.0.11]
+
+Additions and Updates to Sensors:
+Added boilerPowerKW as a new sensor type in custom_components/econet300/const.py and updated its unit, device class, and icon. [1] [2] [3] [4] [5]
+Added feederWorks as a new binary sensor in custom_components/econet300/const.py and updated its icon. [1] [2] [3]
+Updates to Existing Sensors:
+Renamed the lighter sensor to lighterWorks in custom_components/econet300/const.py and updated its icon. [1] [2]
+Updated the names of the lighter, boilerPower, and feeder sensors in custom_components/econet300/strings.json and custom_components/econet300/translations/en.json. [1] [2] [3] [4] [5] [6]
diff --git a/custom_components/econet300/const.py b/custom_components/econet300/const.py
@@ -11,6 +11,7 @@
     STATE_PROBLEM,
     STATE_UNKNOWN,
     EntityCategory,
+    UnitOfPower,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -97,6 +98,7 @@
     },
     "_default": {
         "boilerPower",
+        "boilerPowerKW",
         "tempFeeder",
         "fuelLevel",
         "tempCO",
@@ -125,9 +127,10 @@
 
 BINARY_SENSOR_MAP_KEY = {
     "_default": {
-        "lighter",
+        "lighterWorks",
         "pumpCOWorks",
         "fanWorks",
+        "feederWorks",
         "pumpFireplaceWorks",
         "pumpCWUWorks",
         "mainSrv",
@@ -162,6 +165,7 @@
     "tempBack": UnitOfTemperature.CELSIUS,
     "tempCWU": UnitOfTemperature.CELSIUS,
     "boilerPower": PERCENTAGE,
+    "boilerPowerKW": UnitOfPower.KILO_WATT,
     "fuelLevel": PERCENTAGE,
     "tempUpperBuffer": UnitOfTemperature.CELSIUS,
     "tempLowerBuffer": UnitOfTemperature.CELSIUS,
@@ -197,6 +201,7 @@
     "tempExternalSensor": SensorDeviceClass.TEMPERATURE,
     "tempCO": SensorDeviceClass.TEMPERATURE,
     "boilerPower": SensorDeviceClass.POWER_FACTOR,
+    "boilerPowerKW": SensorDeviceClass.POWER,
     "fanPower": SensorDeviceClass.POWER_FACTOR,
     "tempFlueGas": SensorDeviceClass.TEMPERATURE,
     "mixerSetTemp1": SensorDeviceClass.TEMPERATURE,
@@ -264,14 +269,17 @@
     "statusCWU": "mdi:water-boiler",
     "thermostat": "mdi:thermostat",
     "boilerPower": "mdi:gauge",
+    "boilerPowerKW": "mdi:gauge",
     "fuelLevel": "mdi:gas-station",
     "lambdaLevel": "mdi:lambda",
     "lambdaSet": "mdi:lambda",
     "lambdaStatus": "mdi:lambda",
+    "lighterWorks": "mdi:fire",
     "workAt100": "mdi:counter",
     "workAt50": "mdi:counter",
     "workAt30": "mdi:counter",
     "FeederWork": "mdi:counter",
+    "feederWorks": "mdi:screw-lag",
     "FiringUpCount": "mdi:counter",
     "quality": "mdi:signal",
     "pumpCOWorks": "mdi:pump",
@@ -305,6 +313,7 @@
     "statusCWU": "mdi:water-boiler-off",
     "mainSrv": "mdi:server-network-off",
     "lan": "mdi:lan-disconnect",
+    "lighterWorks": "mdi:fire-off",
 }
 
 NO_CWU_TEMP_SET_STATUS_CODE = 128

diff --git a/custom_components/econet300/manifest.json b/custom_components/econet300/manifest.json
@@ -12,6 +12,6 @@
   "issue_tracker": "https://github.com/jontofront/ecoNET-300-Home-Assistant-Integration/issues",
   "requirements": [],
   "ssdp": [],
-  "version": "v1.0.10",
+  "version": "v1.0.11",
   "zeroconf": []
 }
diff --git a/custom_components/econet300/strings.json b/custom_components/econet300/strings.json
@@ -20,7 +20,7 @@
   },
   "entity": {
     "binary_sensor": {
-      "lighter": {
+      "lighter_works": {
         "name": "Lighter"
       },
       "weather_control": {
@@ -38,6 +38,9 @@
       "fan_works": {
         "name": "Fan"
       },
+      "feeder_works": {
+        "name": "Feeder"
+      },
       "additional_feeder": {
         "name": "Additional feeder"
       },
@@ -67,6 +70,9 @@
       "boiler_power": {
         "name": "Boiler output"
       },
+      "boiler_power_kw": {
+        "name": "Boiler power"
+      },
       "fuel_level": {
         "name": "Fuel level"
       },

diff --git a/custom_components/econet300/translations/en.json b/custom_components/econet300/translations/en.json
@@ -20,7 +20,7 @@
   },
   "entity": {
     "binary_sensor": {
-      "lighter": {
+      "lighter_works": {
         "name": "Lighter"
       },
       "weather_control": {
@@ -67,6 +67,9 @@
       "boiler_power": {
         "name": "Boiler output"
       },
+      "boiler_power_kw": {
+        "name": "Boiler power"
+      },
       "fuel_level": {
         "name": "Fuel level"
       },
@@ -103,6 +106,9 @@
       "feeder_work": {
         "name": "Feeder work"
       },
+      "feeder_works": {
+        "name": "Feeder"
+      },
       "firing_up_count": {
         "name": "Firing up count"
       },

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 colorlog==6.8.2
-homeassistant>=2024.9.2
-ruff==0.8.1
+homeassistant>=2024.10.2
+ruff==0.8.3
 codespell==2.3.0