yaml layout updates to v1.1 and minor fixes

packages/ev_charging.yaml

@@ -1,25 +1,25 @@
-mqtt:
-  sensor:
-    - unique_id: 32a_ev_wallcharger_power
-      name: "32A EV Wallcharger Power"
-      device_class: power
-      unit_of_measurement: kW
-      state_topic: "stat/tasmo-wemosd1-7280-powermon-1/EnergyMeterCount"
-      value_template: "{{ value_json.EVChargerWhCount * 2 * 60 / 1000 }}"
-    - unique_id: 16a_ev_wallcharger_power
-      name: "16A EV Wallcharger Power"
-      device_class: power
-      unit_of_measurement: kW
-      state_topic: "stat/tasmo-s4chan-7594-garage-1/EnergyMeterCount"
-      value_template: "{{ value_json.EVChargerWhCount * 2 * 60 / 1000 }}"
+#mqtt:
+#  sensor:
+#    - unique_id: 32a_ev_wallcharger_power
+#      name: "32A EV Wallcharger Power"
+#      device_class: power
+#      unit_of_measurement: kW
+#      state_topic: "stat/tasmo-wemosd1-7280-powermon-1/EnergyMeterCount"
+#      value_template: "{{ value_json.EVChargerWhCount * 2 * 60 / 1000 }}"
+#    - unique_id: 16a_ev_wallcharger_power
+#      name: "16A EV Wallcharger Power"
+#      device_class: power
+#      unit_of_measurement: kW
+#      state_topic: "stat/tasmo-s4chan-7594-garage-1/EnergyMeterCount"
+#      value_template: "{{ value_json.EVChargerWhCount * 2 * 60 / 1000 }}"
 
 # Use the Riemann sum integral to calculate energy in kWh
 # from the contimuous power measuring sensors
 sensor:
   - platform: integration
     unique_id: 32a_ev_wallcharger_power_total
-    name: "32A EV Wallcharger Power Total"
-    source: sensor.32a_ev_wallcharger_power
+    name: "EV 32A Wallcharger Power Total (Integral)"
+    source: sensor.main_house_3_phase_power_monitor_32a_wallcharger_power
     #device_class: energy
     #unit_of_measurement: Wh
     #unit_time: h
@@ -27,22 +27,22 @@ sensor:
     round: 0 # Only need 0 decimals accuracy
   - platform: integration
     unique_id: 16a_ev_wallcharger_power_total
-    name: "16A EV Wallcharger Power Total"
-    source: sensor.16a_ev_wallcharger_power
+    name: "EV 16A EV Wallcharger Power Total (Integral)"
+    source: sensor.garage_db_control_16a_wallcharger_power
     #device_class: energy
     #unit_of_measurement: Wh
     #unit_time: h
     #unit_prefix: k
     round: 0
 
-  - platform: filter
-    name: "32A EV Charger Power 1m Avg"
-    unique_id: ev_charger_32a_power_1m_avg
-    entity_id: sensor.main_house_3_phase_power_monitor_ev_wallcharger_power
-    filters:
-      - filter: time_simple_moving_average
-        window_size: "00:01"
-        precision: 3
+#  - platform: filter
+#    name: "32A EV Charger Power 1m Avg"
+#    unique_id: ev_charger_32a_power_1m_avg
+#    entity_id: sensor.main_house_3_phase_power_monitor_ev_wallcharger_power
+#    filters:
+#      - filter: time_simple_moving_average
+#        window_size: "00:01"
+#        precision: 3
 
 input_select:
   leaf_ev_charging_mode:
@@ -71,36 +71,35 @@ automation:
           "1hr top-up now":"boost", "Charge now until full":"now-full", "Stop charging now":"stop" } %} {% set dta = trigger.to_state.state %}
           {{ mapping[dta] }}
           '
-
-template:
-  - trigger:
-      - platform: time_pattern
-        seconds: "/10"
-      - platform: homeassistant
-        event: start
-    binary_sensor:
-      - name: "32A EV Charger Charging"
-        unique_id: ev_charger_32a_charging
-        icon: mdi:car-electric
-        state: >-
-          {{ states('sensor.32a_ev_charger_power_1m_avg') | float(0) > 0.1 }}
-        delay_on:
-          seconds: 60
-        delay_off:
-          seconds: 60
-
-      - name: "16A EV Charger Charging"
-        unique_id: ev_charger_16a_charging
-        icon: mdi:car-electric
-        state: >-
-          {{ (states('sensor.16a_ev_wallcharger_power') | float(0)) > 0.1 }}
-        delay_on:
-          seconds: 60
-        delay_off:
-          seconds: 60
-
-  - binary_sensor:
-      - name: 32A EV Charger Charging UI
-        unique_id: ev_charger_charging_ui
-        state: "{{ is_state('sensor.32a_ev_charger_charging', 'on') }}"
-        icon: mdi:car-electric
+#template:
+#  - trigger:
+#      - platform: time_pattern
+#        seconds: "/10"
+#      - platform: homeassistant
+#        event: start
+#    binary_sensor:
+#      - name: "32A EV Charger Charging"
+#        unique_id: ev_charger_32a_charging
+#        icon: mdi:car-electric
+#        state: >-
+#          {{ states('sensor.32a_ev_charger_power_1m_avg') | float(0) > 0.1 }}
+#        delay_on:
+#          seconds: 60
+#        delay_off:
+#          seconds: 60
+#
+#      - name: "16A EV Charger Charging"
+#        unique_id: ev_charger_16a_charging
+#        icon: mdi:car-electric
+#        state: >-
+#          {{ (states('sensor.16a_ev_wallcharger_power') | float(0)) > 0.1 }}
+#        delay_on:
+#          seconds: 60
+#        delay_off:
+#          seconds: 60
+#
+#  - binary_sensor:
+#      - name: 32A EV Charger Charging UI
+#        unique_id: ev_charger_charging_ui
+#        state: "{{ is_state('sensor.32a_ev_charger_charging', 'on') }}"
+#        icon: mdi:car-electric