feat(engine): move activate switch to engine_common

Author: Xavier Berger

solar_router/engine_1dimmer.yaml

@@ -4,27 +4,6 @@
 packages:
   - !include engine_common.yaml
 
-switch:
-  # Define is router is active or not
-  # When switch is ON, pooling timer will trigger every seconds
-  - platform: template
-    name: "Activate Solar Routing"
-    optimistic: true
-    restore_mode: RESTORE_DEFAULT_OFF
-    id: activate
-    on_turn_on:
-      then:
-        - light.turn_on: green_led
-        - lambda: id(power_meter_activated) = 1;
-    on_turn_off:
-      then:
-        - light.turn_off: green_led
-        - number.to_min: router_level
-        - lambda: |- 
-            id(real_power).publish_state(NAN);
-            id(consumption).publish_state(NAN);
-            id(power_meter_activated) = 0;
-
 number:
   # Router level from 0 to 100
   # This value serves two purposes:
@@ -59,7 +38,7 @@ number:
               - light.turn_off: green_led
               - if:
                   condition:
-                    - switch.is_on: activate
+                    - lambda: return id(power_meter_activated) == 1;
                   then:
                     - light.turn_on: green_led
   - platform: template

solar_router/engine_1dimmer_1bypass.yaml

@@ -5,26 +5,17 @@ packages:
   - !include engine_common.yaml
 
 switch:
-  # Define is router is active or not
-  # When switch is ON, pooling timer will trigger every seconds
-  - platform: template
+  # Reset values when router based on router activation
+  - platform: copy
     name: "Activate Solar Routing"
-    optimistic: true
-    restore_mode: RESTORE_DEFAULT_OFF
-    id: activate
-    on_turn_on:
-      then:
-        - light.turn_on: green_led
-        - lambda: id(power_meter_activated) = 1;
+    internal: True
+    source_id: activate
+    id: internal_activate
     on_turn_off:
       then:
-        - light.turn_off: green_led
         - lambda: |- 
             id(router_level).publish_state(0);
-            id(real_power).publish_state(NAN);
-            id(consumption).publish_state(NAN);
             id(bypass_tempo_counter).publish_state(NAN);
-            id(power_meter_activated) = 0;
             id(energy_divertion).turn_off();
             id(regulator_opening).publish_state(0);
         - script.execute: energy_regulation
@@ -92,7 +83,7 @@ number:
               - light.turn_off: green_led
               - if:
                   condition:
-                    - switch.is_on: activate
+                    - lambda: return id(power_meter_activated) == 1;
                   then:
                     - light.turn_on: green_led
         - if:

solar_router/engine_1dimmer_2switches.yaml

@@ -32,30 +32,25 @@ sensor:
         - script.execute: regulation_control
 
 switch:
-  # Define is router is active or not
-  # When switch is ON, pooling timer will trigger every seconds
-  - platform: template
+  # Reset values when router based on router activation
+  - platform: copy
     name: "Activate Solar Routing"
-    optimistic: true
-    restore_mode: RESTORE_DEFAULT_OFF
-    id: activate
+    internal: True
+    source_id: activate
+    id: internal_activate
     on_turn_on:
       then:
         - light.turn_on: green_led
         - lambda: |-
             id(relay1_tempo_counter).publish_state(id(full_power_duration).state);
             id(relay2_tempo_counter).publish_state(id(full_power_duration).state);
-            id(power_meter_activated) = 1;
     on_turn_off:
       then:
         - light.turn_off: green_led
         - lambda: |- 
             id(router_level).publish_state(0);
-            id(real_power).publish_state(NAN);
-            id(consumption).publish_state(NAN);
             id(relay1_tempo_counter).publish_state(0);
             id(relay2_tempo_counter).publish_state(0);
-            id(power_meter_activated) = 0;
             id(energy_divertion1).turn_off();
             id(energy_divertion2).turn_off();
             id(regulator_opening).publish_state(0);
@@ -147,7 +142,7 @@ number:
               - light.turn_off: green_led
               - if:
                   condition:
-                    - switch.is_on: activate
+                    - lambda: return id(power_meter_activated) == 1;
                   then:
                     - light.turn_on: green_led
 
@@ -168,7 +163,7 @@ number:
       then:
         - if:
             condition:
-              - switch.is_on: activate
+              - lambda: return id(power_meter_activated) == 1;
             then:
               - lambda: |-
                   id(relay1_tempo_counter).publish_state(id(full_power_duration).state);

solar_router/engine_1dimmer_2switches_1bypass.yaml

@@ -40,32 +40,25 @@ sensor:
         - script.execute: regulation_control
 
 switch:
-  # Define is router is active or not
-  # When switch is ON, pooling timer will trigger every seconds
-  - platform: template
+  # Reset values when router based on router activation
+  - platform: copy
     name: "Activate Solar Routing"
-    optimistic: true
-    restore_mode: RESTORE_DEFAULT_OFF
-    id: activate
+    internal: True
+    source_id: activate
+    id: internal_activate
     on_turn_on:
       then:
-        - light.turn_on: green_led
         - lambda: |-
             id(relay1_tempo_counter).publish_state(id(full_power_duration).state);
             id(relay2_tempo_counter).publish_state(id(full_power_duration).state);
             id(relay3_tempo_counter).publish_state(id(full_power_duration).state);
-            id(power_meter_activated) = 1;
     on_turn_off:
       then:
-        - light.turn_off: green_led
         - lambda: |- 
             id(router_level).publish_state(0);
-            id(real_power).publish_state(NAN);
-            id(consumption).publish_state(NAN);
             id(relay1_tempo_counter).publish_state(0);
             id(relay2_tempo_counter).publish_state(0);
             id(relay3_tempo_counter).publish_state(0);
-            id(power_meter_activated) = 0;
             id(energy_divertion1).turn_off();
             id(energy_divertion2).turn_off();
             id(energy_divertion3).turn_off();
@@ -183,7 +176,7 @@ number:
               - light.turn_off: green_led
               - if:
                   condition:
-                    - switch.is_on: activate
+                    - lambda: return id(power_meter_activated) == 1;
                   then:
                     - light.turn_on: green_led
 
@@ -204,7 +197,7 @@ number:
       then:
         - if:
             condition:
-              - switch.is_on: activate
+              - lambda: return id(power_meter_activated) == 1;
             then:
               - lambda: |-
                   id(relay1_tempo_counter).publish_state(id(full_power_duration).state);

solar_router/engine_1switch.yaml

@@ -5,26 +5,15 @@ packages:
   - !include engine_common.yaml
 
 switch:
-  # Define is router is active or not
-  # When switch is ON, activate power meter (each time power meter is updated the energy regulation will run)
-  # When switch is OFF, deactivate power meter, turn off divertion and reset counters
-  - platform: template
+  # Reset values when router based on router activation
+  - platform: copy
     name: "Activate Solar Routing"
-    optimistic: true
-    restore_mode: RESTORE_DEFAULT_OFF
-    id: activate
-    on_turn_on:
-      then:
-        - lambda: |-
-            id(power_meter_activated) = 1;
-            id(green_led).turn_on();
+    internal: True
+    source_id: activate
+    id: internal_activate
     on_turn_off:
       then:
         - lambda: |- 
-            id(real_power).publish_state(NAN);
-            id(consumption).publish_state(NAN);
-            id(power_meter_activated) = 0;
-            id(green_led).turn_off();
             id(start_tempo_counter).publish_state(NAN);
             id(stop_tempo_counter).publish_state(NAN);
             id(router_level).publish_state(0);
@@ -82,7 +71,7 @@ number:
               - light.turn_off: green_led
               - if:
                   condition:
-                    - switch.is_on: activate
+                    - lambda: return id(power_meter_activated) == 1;
                   then:
                     - light.turn_on: green_led
 

solar_router/engine_common.yaml

@@ -1,13 +1,29 @@
 # ----------------------------------------------------------------------------------------------------
 # User interaction
 # ----------------------------------------------------------------------------------------------------
-
 globals:
   # By default, if no temperature package is used, safety_limit is disabled
   - id: safety_limit
     type: bool
     initial_value: "false"
 
+switch:
+  # Define is router is active or not
+  - platform: template
+    name: "Activate Solar Routing"
+    optimistic: true
+    restore_mode: RESTORE_DEFAULT_OFF
+    id: activate
+    on_turn_on:
+      then:
+        - light.turn_on: green_led
+        - lambda: id(power_meter_activated) = 1;
+    on_turn_off:
+      then:
+        - light.turn_off: green_led
+        - lambda: |-
+            id(power_meter_activated) = 0;
+
 sensor:
   - platform: copy
     source_id: real_power
@@ -19,7 +35,7 @@ sensor:
         - logger.log: "Real power updated, run energy_regulation if activated"
         - if:
             condition:
-              switch.is_on: activate
+              - lambda: return id(power_meter_activated) == 1;
             then:
               script.execute: energy_regulation
 
@@ -43,7 +59,7 @@ time:
         then:
           - if:
               condition:
-                switch.is_on: activate
+                - lambda: return id(power_meter_activated) == 1;
               then:
                 - light.turn_off: yellow_led
                 - if:

solar_router/power_meter_home_assistant.yaml

@@ -1,5 +1,4 @@
-packages:
-  - !include power_meter_common.yaml
+<<: !include power_meter_common.yaml # keep this include like this (it allows to overwrite real_power)
 
 # ----------------------------------------------------------------------------------------------------
 # Define sensor for power collection

solar_router/scheduler_forced_run.yaml

@@ -18,7 +18,7 @@ switch:
       then:
         - if:
             condition:
-              - switch.is_off: activate
+              - lambda: return id(power_meter_activated) == 0;
             then:
               # Set router level to 0 then Enable router
               - number.set:
@@ -119,7 +119,7 @@ time:
                     - if:
                         condition:
                           and:
-                            - switch.is_off: activate
+                            - lambda: return id(power_meter_activated) == 0;
                             # End Hour and minutes are reached
                             - lambda: |-
                                 // End Hour and minutes are reached