ultra added watermeter + peak power BE

mhendriks · Jun 20, 2024 · 77a29ad · 77a29ad
1 parent 93e53c7
commit 77a29ad
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/ultra-p1-h2o-s0.yaml b/ultra-p1-h2o-s0.yaml
@@ -2,7 +2,7 @@ substitutions:
   device_name: ultra-p1-h2o
   device_description: "Ultra dongle with P1 and water sensor"
   friendly_name: Ultra P1 H2O
-  prj_version: "2024.5.1"
+  prj_version: "2024.6.2"
 
 esphome:
   name: ${device_name}
@@ -27,7 +27,8 @@ ethernet:
   interrupt_pin: 14
 
 ota:
-
+  platform: esphome
+
 web_server:
 
 # improv_serial:
@@ -68,7 +69,8 @@ dsmr:
  request_pin: 
     number: 17
     inverted: true
-
+ water_mbus_id: 2
+
 globals:
   - id: tot_count
     type: float
@@ -327,9 +329,18 @@ sensor:
     gas_delivered:
       name: "Gas Consumed"
       state_class: total_increasing
+    water_delivered:
+      name: Water delivered
+      state_class: total_increasing
     gas_delivered_be:
       name: "Gas Consumed Belgium"
       state_class: total_increasing
+    active_energy_import_current_average_demand:
+      name: "Current Average Demand"
+    active_energy_import_maximum_demand_running_month:
+      name: "Maximum Month Demand"
+    active_energy_import_maximum_demand_last_13_months:
+      name: "13 Month Maximum Quarterly Demand"    
   - platform: uptime
     name: "_Uptime"
 

diff --git a/ultra-p1-h2o.yaml b/ultra-p1-h2o.yaml
@@ -2,7 +2,7 @@ substitutions:
   device_name: ultra-p1-h2o
   device_description: "Ultra dongle with P1 and water sensor"
   friendly_name: Ultra P1 H2O
-  prj_version: "2024.6.1"
+  prj_version: "2024.6.2"
 
 esphome:
   name: ${device_name}
@@ -69,6 +69,7 @@ dsmr:
  request_pin: 
     number: 17
     inverted: true
+ water_mbus_id: 2
 
 light:
   - platform: status_led
@@ -267,6 +268,16 @@ sensor:
     gas_delivered_be:
       name: "Gas Consumed Belgium"
       state_class: total_increasing
+    water_delivered:
+      name: Water delivered
+      state_class: total_increasing      
+    active_energy_import_current_average_demand:
+      name: "Current Average Demand"
+    active_energy_import_maximum_demand_running_month:
+      name: "Maximum Month Demand"
+    active_energy_import_maximum_demand_last_13_months:
+      name: "13 Month Maximum Quarterly Demand"      
+
   - platform: uptime
     name: "_Uptime"