Merge pull request #105 from augustynski-lukasz/amiplus-tariffs

Amiplus-patch for tarrifs T1, T2, T3, T4
SzczepanLeon · Jul 15, 2024 · c208656 · c208656
2 parents dd4a20e + a98a476
commit c208656
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/components/wmbus/__init__.py b/components/wmbus/__init__.py
@@ -127,5 +127,5 @@ async def to_code(config):
     cg.add_library(
         None,
         None,
-        "https://github.com/SzczepanLeon/wmbus-drivers#1.3.11",
+        "https://github.com/SzczepanLeon/wmbus-drivers#1.3.12",
     )
diff --git a/components/wmbus/sensor/__init__.py b/components/wmbus/sensor/__init__.py
@@ -135,6 +135,34 @@ def my_key(value):
             state_class=STATE_CLASS_TOTAL_INCREASING,
             icon="mdi:transmission-tower-export",
         ),
+        cv.Optional("total_energy_consumption_t1_kwh"): sensor.sensor_schema(
+            accuracy_decimals=3,
+            unit_of_measurement=UNIT_KILOWATT_HOURS,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            icon="mdi:transmission-tower-export",
+        ),
+        cv.Optional("total_energy_consumption_t2_kwh"): sensor.sensor_schema(
+            accuracy_decimals=3,
+            unit_of_measurement=UNIT_KILOWATT_HOURS,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            icon="mdi:transmission-tower-export",
+        ),
+        cv.Optional("total_energy_consumption_t3_kwh"): sensor.sensor_schema(
+            accuracy_decimals=3,
+            unit_of_measurement=UNIT_KILOWATT_HOURS,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            icon="mdi:transmission-tower-export",
+        ), 
+        cv.Optional("total_energy_consumption_t4_kwh"): sensor.sensor_schema(
+            accuracy_decimals=3,
+            unit_of_measurement=UNIT_KILOWATT_HOURS,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            icon="mdi:transmission-tower-export",
+        ),                        
         cv.Optional("current_power_consumption_kw"): sensor.sensor_schema(
             accuracy_decimals=3,
             unit_of_measurement=UNIT_KILOWATT,
@@ -149,6 +177,34 @@ def my_key(value):
             state_class=STATE_CLASS_TOTAL_INCREASING,
             icon="mdi:transmission-tower-import",
         ),
+        cv.Optional("total_energy_production_t1_kwh"): sensor.sensor_schema(
+            accuracy_decimals=3,
+            unit_of_measurement=UNIT_KILOWATT_HOURS,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            icon="mdi:transmission-tower-import",
+        ),
+        cv.Optional("total_energy_production_t2_kwh"): sensor.sensor_schema(
+            accuracy_decimals=3,
+            unit_of_measurement=UNIT_KILOWATT_HOURS,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            icon="mdi:transmission-tower-import",
+        ),
+        cv.Optional("total_energy_production_t3_kwh"): sensor.sensor_schema(
+            accuracy_decimals=3,
+            unit_of_measurement=UNIT_KILOWATT_HOURS,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            icon="mdi:transmission-tower-import",
+        ),
+        cv.Optional("total_energy_production_t4_kwh"): sensor.sensor_schema(
+            accuracy_decimals=3,
+            unit_of_measurement=UNIT_KILOWATT_HOURS,
+            device_class=DEVICE_CLASS_ENERGY,
+            state_class=STATE_CLASS_TOTAL_INCREASING,
+            icon="mdi:transmission-tower-import",
+        ),
         cv.Optional("current_power_production_kw"): sensor.sensor_schema(
             accuracy_decimals=3,
             unit_of_measurement=UNIT_KILOWATT,

diff --git a/components/wmbus/version.h b/components/wmbus/version.h
@@ -1,3 +1,3 @@
 #ifndef MY_VERSION
-#define MY_VERSION "3.2.1"
+#define MY_VERSION "3.2.2"
 #endif