From 90f56e6f04ef81bed07aec0e2f7fa782d7ca9ae0 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 14 Jan 2026 07:25:52 +0100
Subject: [PATCH] Fine tuning regolazione scaldasalviette x poweroff

---
 Egalware/rules/egalware.rules      | 51 +++++++++++++++++++-----------
 Egalware/sitemaps/egalware.sitemap |  4 +--
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/Egalware/rules/egalware.rules b/Egalware/rules/egalware.rules
index 0708f0a..9401061 100644
--- a/Egalware/rules/egalware.rules
+++ b/Egalware/rules/egalware.rules
@@ -7,11 +7,11 @@ val Random random = new Random()
 var powerOnTemp          = 23
 var powerOnTempLow       = 21
 var minTemp              = 19
-var maxTemp              = 25
-var limPrelievoReteMax   = 8000
-var limPrelievoReteMin   = 5000
-var oraVmcOn             = 6
-var oraVmcOff            = 20
+var maxTemp              = 24
+var limPrelievoReteMax   = 7500
+var limPrelievoReteMin   = 4000
+var oraVmcOn             = 7
+var oraVmcOff            = 19
 
 // // estate
 // var powerOnTemp         = 24
@@ -364,7 +364,7 @@ end
 // spegnimento invernale
 rule "Spegnimento serale VMC (periodo ampio + variabile inverno/estate x cambio comportamento)"
 when
-    Time  cron "0 0/30 23 * * ?"
+    Time  cron "0 0/30 20-23 * * ?"
     // Time  cron "0 0/30 19-23 * * ?"
 then
     val hour = (MyDateTimeItem.state as DateTimeType).zonedDateTime.hour
@@ -372,6 +372,9 @@ then
     {
         SonoffServizi01_VorticeVCM.sendCommand(OFF)
         SonoffServizi02_VorticeVCM.sendCommand(OFF)
+        // aggiunta gestione Bagni
+        ShellySwitchBagno100.sendCommand(OFF)
+        ShellySwitchBagno120.sendCommand(OFF)
     }
 end
 
@@ -405,18 +408,24 @@ then
         logInfo("VMC.Check","VMC-01: soglia min superata | ON + OFF | Fn_PrelRete.state: {}", Fn_PrelRete.state)
         SonoffServizi01_VorticeVCM.sendCommand(ON)
         SonoffServizi02_VorticeVCM.sendCommand(OFF)
-        // aggiunta gestione Bagni
-        ShellySwitchBagno100.sendCommand(ON)
-        ShellySwitchBagno120.sendCommand(OFF)
+        if (CL_ModoEstivo.state != ON)
+        {
+            // aggiunta gestione Bagni
+            ShellySwitchBagno100.sendCommand(ON)
+            ShellySwitchBagno120.sendCommand(OFF)
+        }
     }
     else
     {
         logInfo("VMC.Check","VMC-01: all OK 01 | ON + ON | Fn_PrelRete.state: {}", Fn_PrelRete.state)
         SonoffServizi01_VorticeVCM.sendCommand(ON)
         SonoffServizi02_VorticeVCM.sendCommand(ON)
-        // aggiunta gestione Bagni
-        ShellySwitchBagno100.sendCommand(ON)
-        ShellySwitchBagno120.sendCommand(ON)
+        if (CL_ModoEstivo.state != ON)
+        {
+            // aggiunta gestione Bagni
+            ShellySwitchBagno100.sendCommand(ON)
+            ShellySwitchBagno120.sendCommand(ON)
+        }
     }
 end
 
@@ -442,18 +451,24 @@ then
         logInfo("VMC.Check","VMC-02: soglia min superata | OFF + ON | Fn_PrelRete.state: {}", Fn_PrelRete.state)
         SonoffServizi01_VorticeVCM.sendCommand(OFF)
         SonoffServizi02_VorticeVCM.sendCommand(ON)
-        // aggiunta gestione Bagni
-        ShellySwitchBagno100.sendCommand(OFF)
-        ShellySwitchBagno120.sendCommand(ON)
+        if (CL_ModoEstivo.state != ON)
+        {
+            // aggiunta gestione Bagni
+            ShellySwitchBagno100.sendCommand(OFF)
+            ShellySwitchBagno120.sendCommand(ON)
+        }
     }
     else
     {
         logInfo("VMC.Check","VMC-02: all OK 01 | ON + ON | Fn_PrelRete.state: {}", Fn_PrelRete.state)
         SonoffServizi01_VorticeVCM.sendCommand(ON)
         SonoffServizi02_VorticeVCM.sendCommand(ON)
-        // aggiunta gestione Bagni
-        ShellySwitchBagno100.sendCommand(ON)
-        ShellySwitchBagno120.sendCommand(ON)
+        if (CL_ModoEstivo.state != ON)
+        {
+            // aggiunta gestione Bagni
+            ShellySwitchBagno100.sendCommand(ON)
+            ShellySwitchBagno120.sendCommand(ON)
+        }
     }
 end
 
diff --git a/Egalware/sitemaps/egalware.sitemap b/Egalware/sitemaps/egalware.sitemap
index 1faa130..475a28f 100644
--- a/Egalware/sitemaps/egalware.sitemap
+++ b/Egalware/sitemaps/egalware.sitemap
@@ -716,7 +716,7 @@ sitemap egalware label="EgalWare"
             Chart item=ShellyPowerValBagno120 visibility=[FronLP==6] legend=true period=W refresh=60000
             Chart item=ShellyPowerValBagno120 visibility=[FronLP==7] legend=true period=2W refresh=60000
           }
-          Frame item=ShellyEnergyBagno120 label="Consumo Bagno Donne [%.1f kWh]"
+          Frame item=ShellyEnergyBagno120 label="Consumo Bagno Donne [%.1f Wh]"
           {
             Switch item=FronLP label="Periodo" icon="line" mappings=[0="1h", 1="4h", 2="12h", 3="24h", 4="2g", 5="3g", 6="7g", 7="2w"]
             Chart item=ShellyEnergyBagno120 visibility=[FronLP==0,FronLP=="Uninitialized"] legend=true period=h refresh=500
@@ -744,7 +744,7 @@ sitemap egalware label="EgalWare"
             Chart item=ShellyPowerValBagno100 visibility=[FronLP==6] legend=true period=W refresh=60000
             Chart item=ShellyPowerValBagno100 visibility=[FronLP==7] legend=true period=2W refresh=60000
           }
-          Frame item=ShellyEnergyBagno100 label="Consumo Bagno Uomini [%.1f kWh]"
+          Frame item=ShellyEnergyBagno100 label="Consumo Bagno Uomini [%.1f Wh]"
           {
             Switch item=FronLP label="Periodo" icon="line" mappings=[0="1h", 1="4h", 2="12h", 3="24h", 4="2g", 5="3g", 6="7g", 7="2w"]
             Chart item=ShellyEnergyBagno100 visibility=[FronLP==0,FronLP=="Uninitialized"] legend=true period=h refresh=500