aggiornamenti su script

go.sh

@@ -5,6 +5,8 @@ tempo=$2
 pompasi=1
 pompa=10
 
+data=$(date)
+
 log=$(mktemp)
 
 if [ __${tempo}__ == ____ ] ; then
@@ -12,36 +14,42 @@ if [ __${tempo}__ == ____ ] ; then
   tempo=30s
 fi
 
+echo "data : ${data}" |tee -a ${log}
+echo "linea: ${linea}" |tee -a ${log}
+echo "pompa: ${pompa}" |tee -a ${log}
+echo "tempo: ${tempo}" |tee -a ${log}
+echo ""
+
 # verifica la presenza del file "irrigatore" >> ${log}
 if [ -f  ~/script/irrigatore ]; then 
   echo "File 'irrigatore' presente" >> ${log}
   echo "Apro valvola ${linea} per ${tempo}"  >> ${log}
   raspi-gpio set ${linea} dl 
-  mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'irrigatore':${linea},'status':$(pinctrl lev ${linea})}"
+  mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"irrigatore\":${linea},\"status\":$(pinctrl lev ${linea})}"
 
   if [ ${pompasi} == 1 ]; then
     echo "Accendo pompa ${pompa}" >> ${log}
     raspi-gpio set ${pompa} dl
-    mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'pompa':${pompa},'status':$(pinctrl lev ${pompa})}"
+    mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"pompa\":${pompa},\"status\":$(pinctrl lev ${pompa})}"
   fi
 
-  mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'tempo':${pompa},'status':${tempo})}"
+  mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"tempo\":${pompa},\"status\":${tempo})}"
   sleep ${tempo}
 
   if [ ${pompasi} == 1 ]; then
     echo "Spengo pompa ${pompa}" >> ${log}
     raspi-gpio set ${pompa} dh
-    mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'pompa':${pompa},'status':$(pinctrl lev ${pompa})}"
+    mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"pompa\":${pompa},\"status\":$(pinctrl lev ${pompa})}"
   fi
 
   echo "Chiudo valvola ${linea}" >> ${log}
   raspi-gpio set ${linea} dh
-  mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'irrigatore':${linea},'status':$(pinctrl lev ${linea})}"
+  mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"irrigatore\":${linea},\"status\":$(pinctrl lev ${linea})}"
 else
   echo "Accensione linea ${linea} per ${tempo}\nDisattivata: manca file 'irrigatore' in home" >> ${log}
 fi
 
-cat ${log} | mail -s "linea ${linea} per ${tempo}" root
+cat ${log} | mail -s "${data}: linea ${linea} per ${tempo}" root
 rm ${log}
 
 #dl lo attiva

load.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
-linea=$1
-tempo=$2
+
+data=$(date)
+if [ "$#" -eq 2 ]; then
+  echo "numero di parametri corretto" | tee -a ${log}
+  linea=$1
+  tempo=$2
+fi
 
 #lineadefault - corrisponde all'elettro valvola da aprire
 lineadefault=9
@@ -24,41 +29,45 @@ if [ __${tempo}__ == ____ ] ; then
   tempo=${tempodefault}
 fi
 
-echo "parametri applicati:" |tee -a ${log}
+echo "data : ${data}" |tee -a ${log}
 echo "linea: ${linea}" |tee -a ${log}
 echo "pompa: ${pompa}" |tee -a ${log}
 echo "tempo: ${tempo}" |tee -a ${log}
+echo ""
 
 # verifica la presenza del file "pompa" |tee -a ${log}
 if [ -f  ~/script/pompa ]; then 
   echo "File 'pompa' presente" |tee -a ${log}
-  echo "Apro valvola ${linea} per ${tempo}"  |tee -a ${log}
+  echo "Apro valvola ${linea}"  |tee -a ${log}
   raspi-gpio set ${linea} dl 
-  mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'valvola':${linea},'status':$(pinctrl lev ${linea})}"
+  mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"valvola\":${linea},\"status\":$(pinctrl lev ${linea})}"
 
   if [ ${pompasi} == 1 ]; then
     echo "Accendo pompa ${pompa}" |tee -a ${log}
     raspi-gpio set ${pompa} dl
-    mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'pompa':${pompa},'status':$(pinctrl lev ${pompa})}"
+    mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"pompa\":${pompa},\"status\":$(pinctrl lev ${pompa})}"
   fi
 
-  mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'tempo':${pompa},'status':${tempo})}"
+  mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"tempo\":${pompa},\"status\":${tempo})}"
+
   sleep ${tempo}
 
   if [ ${pompasi} == 1 ]; then
     echo "Spengo pompa ${pompa}" |tee -a ${log}
     raspi-gpio set ${pompa} dh
-    mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'pompa':${pompa},'status':$(pinctrl lev ${pompa})}"
+    mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"pompa\":${pompa},\"status\":$(pinctrl lev ${pompa})}"
   fi
+
   echo "Chiudo valvola ${linea}" |tee -a ${log}
   raspi-gpio set ${linea} dh
-  mosquitto_pub -h nuc -p 1883 -u swarn  -P 'Abcd.1234' -t 'Status' -m "{'valvola':${linea},'status':$(pinctrl lev ${linea})}"
+  mosquitto_pub -h nuc -p 1883 -u swarn  -P "Abcd.1234" -t "Status" -m "{\"valvola\":${linea},\"status\":$(pinctrl lev ${linea})}"
 
 else
   echo "Accensione linea ${linea} per ${tempo}\nDisattivata: manca file 'irrigatore' in home" |tee -a ${log}
 fi
 
-cat ${log} | mail -s "linea ${linea} per ${tempo}" root
+cat ${log} | mail -s "${data}: linea ${linea} per ${tempo}" root
+
 rm ${log}
 
 #dl lo attiva

mqtt.run.sh

@@ -2,4 +2,6 @@
 . ~/paho/bin/activate
 cd ~/script
 ./mqtt.cli.py
+echo "Start Mqtt Client" | mail -s "Start Mqtt Client" root
+