From 312d0b308a32b964aee4f7765037b9fcc7d7e4b4 Mon Sep 17 00:00:00 2001
From: Dobromir Popov ONE <dobromir.popov@gateway.one>
Date: Mon, 27 Jun 2022 00:42:34 +0300
Subject: [PATCH] rules backup; trying to fix mqtt freeze

---
 .../config_Garden_U0_Build20116_202210.dat    | Bin 0 -> 36864 bytes
 src/ESPEasy/rules1.txt                        |  62 ++++++++++++++++++
 src/mqtt.js                                   |   1 +
 views/chartGarden.ejs                         |   4 +-
 4 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 src/ESPEasy/config_Garden_U0_Build20116_202210.dat
 create mode 100644 src/ESPEasy/rules1.txt

diff --git a/src/ESPEasy/config_Garden_U0_Build20116_202210.dat b/src/ESPEasy/config_Garden_U0_Build20116_202210.dat
new file mode 100644
index 0000000000000000000000000000000000000000..8ba2e2f88aa4b8cde4a2d7bc19e8ccafc4aa0dff
GIT binary patch
literal 36864
zcmeI*&q@M89Ki8e%MQ{hf+)JhB2?H5h!8<}3MmiWV$CI`{m1Sqc?*J`pa<yKV?=Mz
z6K&(Rthv~(#uBODft8ur-~1Rq`Wp`(_M>xfUl2k(pUam-JJZ~@ZY3tep<~-d#qyns
z?cPqhpFLNVA*;n8NR2GWoxLlf9R(?hP?GV*aAJ2mIX}xdn4*p6Q{vVizai?0F+&9M
z6gZR>a3#xPSU=NTvS#A;tsBq%hmI`kxQQS7!@ai(Co4jp7@J>3KiYcq#vXRoL_^3!
zV{2p5xiVhmqt#*W<w+62sZ5`7Bqf$HL;wK<5I_I{1Q0-Az64sPGhZ7{+ig=f9o^OZ
zo~x&Y2~qEv-FDX>q({lS4OjQP%ygM)at$cRmTN+iA%Fk^2rQj|a%p#sg?ZP<mS)($
z{6}Jb5cvI{pU;Y&B7gt_2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb`LU3%tFGQnh*UxSxZ8>J2<gGj;Vy^}V~O*Vl}&mqY%{6r&C7WyTV)
zm;&Y6@OhD?=n_V)8a_XAz3dMknh<|OuGOB^_0^dTI{MAbYgm8)0tg_000IagfB*sr
bAb<b@2q1s}0tg_000IagfB*sr{DHtHxT1F;

literal 0
HcmV?d00001

diff --git a/src/ESPEasy/rules1.txt b/src/ESPEasy/rules1.txt
new file mode 100644
index 0000000..7b62d92
--- /dev/null
+++ b/src/ESPEasy/rules1.txt
@@ -0,0 +1,62 @@
+On manualwatering do
+ gpio,12,1 //start watering (open valve)
+ timerSet,8,%eventvalue% //timer 1 set for 5 sec
+ Publish %sysname%/Water/start,{"soil":"[Soil#RH]","temp":"[bmp#Temperature]", "eventvalue": "%eventvalue%"}
+endon
+On startwatering do
+ gpio,12,1 //start watering (open valve)
+ timerSet,8,10 //timer 1 set for 5 sec
+ Publish %sysname%/Water/start,{"soil":"[Soil#RH]"}
+endon
+On stopwatering do
+ timerSet,8,0 //timer 1 set to halt, used to stop watering before the timer ends!
+ gpio,12,0 //stop watering (close valve)
+ Publish %sysname%/Water/stop,{"soil":"[Soil#RH]"}
+endon
+On Rules#Timer=8 do
+  gpio,12,0 //stop watering (close valve)
+endOn
+
+
+On Soil#RH do
+  if [Soil#RH]<70 and [Soil#RH]>20
+   //Publish %sysname%/Water/start,{"soil":"[Soil#RH]"}
+   event,startwatering
+  else
+   gpio,12,0 //stop watering (close valve)
+   //event,stopwatering
+   //deepsleep,30
+  endif
+endOn
+
+//Time events GMT (17:00 is 14:00GMT)
+On Clock#Time=All,%sunrise% do
+ Publish %sysname%/state/time,{"sunrise":"%sunrise%"}
+ event,manualwatering=10
+endon
+On Clock#Time=All,%sunset% do 
+ Publish %sysname%/state/time,{"sunset":"%sunset%"}
+ event,manualwatering=10
+endon
+
+//On Clock#Time=All,**:*5 do 
+// Publish %sysname%/state/time,{"time":"%systime%"}
+// event,manualwatering=5
+//endon
+//On Clock#Time=All,**:*0 do 
+// Publish %sysname%/state/time,{"time":"%systime%"}
+// event,manualwatering=5
+//endon
+
+On Clock#Time=All,**:00 do 
+ //event,nightwatering=3
+endon
+
+On nightwatering do
+ If %systime% < %sunrise% //12:00:00
+  event,manualwatering=%eventvalue%
+ Endif  
+ If %systime% > %sunset%//19:00:00
+  event,manualwatering=%eventvalue%
+ Endif
+endon
\ No newline at end of file
diff --git a/src/mqtt.js b/src/mqtt.js
index c752677..ba1649e 100644
--- a/src/mqtt.js
+++ b/src/mqtt.js
@@ -218,6 +218,7 @@ exports.SendCmd = function (message = "") {
   topic = EspDeviceName + "/cmd";
   console.log("MQTT> command topic is:" + topic);
   console.log("MQTT> message:" + message);
+  //mqtt_client.clear();
   mqtt_client.publish(topic, message, (r) => {
     console.log("MQTT> Published to '" + topic + "'>'" + message + "'");
     console.log(r);
diff --git a/views/chartGarden.ejs b/views/chartGarden.ejs
index df2ed38..c241968 100644
--- a/views/chartGarden.ejs
+++ b/views/chartGarden.ejs
@@ -96,7 +96,7 @@
                     crosshair: {
 						enabled: true
 					},
-                    minimum: 990,
+                    //minimum: 990,
                     //maximum: 1080,
                 },
             ],
@@ -121,7 +121,7 @@
                 xValueFormatString: "HH:mm on DD MMM, YYYY",
                 color: "#F08080",
                 dataPoints: temp.out
-            },            
+            },
             /*{
                 name: "Dew Point",
                 type: "line",//line