1 files changed, 6 insertions, 6 deletions
diff --git a/tasmota-config/configure-radiators b/tasmota-config/configure-radiators
index 488e7e3..6799acd 100755
--- a/tasmota-config/configure-radiators
+++ b/tasmota-config/configure-radiators
@@ -18,7 +18,7 @@ M=10.32.139.1
 
 set -x
 
-for T in laundry_radiator ; do #kstudy_radiator bedroom_radiator spare_bedroom_radiator; do
+for T in laundry_radiator kstudy_radiator bedroom_radiator spare_bedroom_radiator; do
   mosquitto_pub -h "${M}" -t "cmnd/${T}/Backlog" -m "Switchmode1 3; Rule1 1; Rule1 4; Rule2 1; Rule2 4; Rule3 1; Rule3 4"
   sleep 3
   mosquitto_pub -h "${M}" -t "cmnd/${T}/Backlog" -m "TelePeriod 60; SetOption26 0; SetOption0 0; PowerOnState 0"
@@ -32,8 +32,8 @@ for T in laundry_radiator ; do #kstudy_radiator bedroom_radiator spare_bedroom_r
     ON system#boot DO Backlog RuleTimer1 70; var1 5; var2 5; var3 0; var4 0 ENDON 
     ON Rules#Timer=1 DO Backlog RuleTimer1 70; Power %var3% ENDON 
     ON tele-SI7021#temperature DO Backlog RuleTimer1 70; Event temp=%value% ENDON 
-    ON Switch1#State=0 DO Backlog var3 0; RuleTimer2 0; Event temp=100 ENDON 
-    ON Switch1#State=1 DO Backlog var3 1; RuleTimer2 1800; Event temp=100 ENDON 
+    ON Button1#State DO event toggle3=%var3% ENDON
+    ON Button2#State DO event toggle3=%var3% ENDON
 EOF
   R="$(echo $R)"
 
@@ -43,8 +43,8 @@ EOF
 ##
 
   read -r -d '' R << EOF
-    ON Switch2#State=0 DO Backlog var3 0; RuleTimer2 0; Event temp=100 ENDON 
-    ON Switch2#State=1 DO Backlog var3 1; RuleTimer2 1800; Event temp=100 ENDON 
+    ON event#toggle3<1 DO BackLog var3 1; RuleTimer2 1800; Event temp=100 ENDON 
+    ON event#toggle3>0 DO BackLog var3 0; RuleTimer2 0; Event temp=100 ENDON 
     ON Rules#Timer=2 DO var3 0 ENDON 
     ON Power1#State DO BackLog Var4 %value%; Publish2 stat/${T}/OPEN %value% ENDON
     ON Event#temp DO BackLog Publish2 stat/${T}/var1 %var1%; Publish2 stat/${T}/var2 %var2% ENDON
@@ -60,7 +60,7 @@ EOF
     ON Event#temp<%var1% DO Power1 1 ENDON
     ON Event#temp>%var2% DO Power1 %var3% ENDON
     ON Event#temp<5 DO Power1 1 ENDON
-    ON Event#temp DO BackLog Var5 %var1%; Sub5 %value%; Publish2 stat/${T}/DELTA %var5%; Publish2 stat/${T}/OPEN %var4% ENDON
+    ON Event#temp DO BackLog Var5 %var1%; Sub5 %value%; Publish2 stat/${T}/DELTA %var5%; Publish2 stat/${T}/OPEN %var4%; Publish2 stat/${T}/TEMPERATURE %value% ENDON
 EOF
   R="$(echo $R)"