fix: triac regulation

Author: XavierBerger

solar_router/engine_progressive_with_bypass.yaml

@@ -26,7 +26,7 @@ switch:
             id(power_meter_activated) = 0;
             id(energy_divertion).turn_off();
             id(regulator_opening).publish_state(0);
-        - script.execute: relay_regulation_control 
+        - script.execute: energy_regulation
 
   # Define the bypass relay
   # When bypass relay is ON, the regulator opening is set to 0
@@ -92,9 +92,11 @@ number:
                     - switch.is_on: activate
                   then:
                     - light.turn_on: green_led
-        - script.execute: energy_regulation
-
-
+        - if:
+            condition:
+                - lambda: return id(power_meter_activated) == 0;
+            then:
+                - script.execute: energy_regulation
 
   # Define the number of consecutive regulations where regulator is at 100% before activating bypass relay
   # When regulator is at 100% and delta is still positive, this counter is incremented
@@ -162,25 +164,18 @@ script:
             return;
           }
 
-          // Calculate the power difference and adjust the regulator opening percentage
-          double delta = 0;
+          // If router is activated, calculate the power difference and adjust the regulator opening percentage
           if ((id(power_meter_activated) == 1)) 
           {
+            double delta = 0;
             delta = -1*(id(real_power).state-id(target_grid_exchange).state)*id(reactivity).state/1000;
-          }
-          // Determine the new regulator status
-          double new_router_level = id(router_level).state + delta;
-          new_router_level = std::max(0.0, std::min(100.0, new_router_level));
-          id(router_level).publish_state(new_router_level);
-
-          if (new_router_level >= 100.0) 
-          {
-            if ((id(power_meter_activated) == 0))
-            {
-              // If automatic regulation is off and user push to router level to 100%, bypass is activated immadiately
-              id(bypass_tempo_counter).publish_state(0);
-            } 
-            else
+          
+            // Determine the new regulator status
+            double new_router_level = id(router_level).state + delta;
+            new_router_level = std::max(0.0, std::min(100.0, new_router_level));
+            id(router_level).publish_state(new_router_level);
+            
+            if (new_router_level >= 100.0) 
             {
               if ( isnan( id(bypass_tempo_counter).state ) ) 
               {
@@ -193,11 +188,16 @@ script:
                   id(bypass_tempo_counter).publish_state(id(bypass_tempo_counter).state - 1);
                 }
               }
+            } 
+            else 
+            {
+              id(bypass_tempo_counter).publish_state(NAN);
             }
-          } 
-          else 
+          }
+          else
           {
-            id(bypass_tempo_counter).publish_state(NAN);
+            // If automatic regulation is off, do not manage bypass tempo
+            id(bypass_tempo_counter).publish_state(0); 
           }
 
           if ( (id(router_level).state >= 100.0) && (id(bypass_tempo_counter).state == 0) ) 
@@ -214,4 +214,5 @@ script:
             switch.is_on: energy_divertion
           then:          
             lambda:  id(regulator_opening).publish_state(0.0);
-      - script.execute: relay_regulation_control
+      - script.execute: relay_regulation_control
+      - script.execute: regulation_control