Update CHANGELOG

fix return value when get value of sensor
Add autoclose of the solenoid when the soil moisture has reached the set level
2021-10-03 10:04:30 +02:00 · 2021-08-28 12:17:22 +02:00 · 2021-08-28 11:38:05 +02:00 · 2021-08-27 22:52:01 +02:00 · 2021-08-22 15:19:34 +02:00 · 2021-08-10 23:39:38 +02:00
29 changed files with 1092 additions and 176 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# 0.6.4 - 03/10/2021
+- Add support for sensor: moisture, temperature, fertility, illuminance
+- Add command line: sensor_status, sensor_status_all, sensor_status_set
+- Add api command: sensor_status_set
+- Add event ev_not_open_for_moisture, sensor_set_state_before, sensor_set_state_after
+- Added zone humidity management: when a zone has reached the humidity defined in EVx_SENSOR_MOISTURE it does not start irrigation or interrupts it if it is already active. In case of rain it does not stop irrigation if the soil humidity has not reached the configured value
+
+# 0.6.3 - 10/08/2021
+- Add command last_rain_sensor_timestamp, last_rain_online_timestamp, reset_last_rain_sensor_timestamp, reset_last_rain_online_timestamp
+- Add socket server api for reset_last_rain_sensor_timestamp, reset_last_rain_online_timestamp
+
+# 0.6.2 - 24/04/2021
+- Update rainsensorqty driver to version 0.2.5c
+
+# 0.6.1 - 06/09/2020
+- Add support for send log to piGardenWeb
+
+# 0.6.0 - 16/05/2020
+- Add support for enable all cron fron api
+- Update rainsensorqty driver to version 0.2.5b
+
 # 0.5.14 - 24/09/2019
 - Updated rainsensorqty driver to version 0.2.3 
 - Added api and command for manage piGardenSched scheduling
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ sudo make install

 ``` bash
 cd
-git clone git://git.drogon.net/wiringPi
-cd wiringPi
+git clone https://github.com/WiringPi/WiringPi.git
+cd WiringPi
 git pull origin 
 ./build
 ```
--- a/conf/piGarden.conf.example
+++ b/conf/piGarden.conf.example
@@ -2,6 +2,14 @@
 LOG_FILE="/home/pi/piGarden/log/piGarden.log"
 LOG_FILE_MAX_SIZE=1048576 # 1MB

+#
+# Enable send log to piGardenWeb
+#
+
+#LOG_URL="http://url_of_your_pigardenweb/api/log"
+#LOG_API_TOKEN="token_of_pigardenweb_user"
+#LOG_CURL_PARAM="--data-urlencode -k"
+
 # Log file for driver output
 LOG_OUTPUT_DRV_FILE="/tmp/piGarden.drv.log"

@@ -99,6 +107,9 @@ EV1_ALIAS="1" #
 EV1_GPIO=17   #		Physical 11 - wPi 0
 #EV1_NORAIN=1 # 	Non interrompe l'irrigazione di questa zona in caso di pioggia
 #EV1_MONOSTABLE=1 #	L'elettrovalvola è monostabile
+#EV1_SENSOR_ALIAS=Mi_Flora 		# Nome del sensore (definito in SENSORx_ALIAS) per stabilire l'umidità del terreno
+#EV1_SENSOR_MOISTURE=50 		# Percentule di umidità ottimale
+#EV1_SENSOR_MOISTURE_AUTOCLOSE=1	# Chiude automaticamente l'elettrovalvola quando supera l'umidità impostata in EVx_MONOSTABLE

 EV2_ALIAS="2" #
 EV2_GPIO=27   #		Physical 13 - wPi 2
@@ -116,6 +127,16 @@ EV6_ALIAS="6" #
 EV6_GPIO=24   #		Physical 18 - wPi 5


+
+# Numero di sensori
+SENSOR_TOTAL=1
+
+# Definizione sensori
+SENSOR1_ALIAS=Mi_Flora
+
+
+
+
 # Definisci il servizio online da utilizzare per il controllo delle condizioni meteo, puoi scegliere openweathermap oppure wunderground.
 # Se non vuoi configurare nessun servizio imposta il vale "none"
 WEATHER_SERVICE="openweathermap"
--- a/conf/piGarden.conf.rainsensorqty.example
+++ b/conf/piGarden.conf.rainsensorqty.example
@@ -2,6 +2,14 @@
 LOG_FILE="/home/pi/piGarden/log/piGarden.log"
 LOG_FILE_MAX_SIZE=1048576 # 1MB

+#
+# Enable send log to piGardenWeb
+#
+
+#LOG_URL="http://url_of_your_pigardenweb/api/log"
+#LOG_API_TOKEN="token_of_pigardenweb_user"
+#LOG_CURL_PARAM="--data-urlencode -k"
+
 # Log file for driver output
 LOG_OUTPUT_DRV_FILE="/tmp/piGarden.drv.log"

--- a/conf/piGarden.conf.remote.example
+++ b/conf/piGarden.conf.remote.example
@@ -2,6 +2,14 @@
 LOG_FILE="/home/pi/piGarden/log/piGarden.log"
 LOG_FILE_MAX_SIZE=1048576 # 1MB

+#
+# Enable send log to piGardenWeb
+#
+
+#LOG_URL="http://url_of_your_pigardenweb/api/log"
+#LOG_API_TOKEN="token_of_pigardenweb_user"
+#LOG_CURL_PARAM="--data-urlencode -k"
+
 # Log file for driver output
 #LOG_OUTPUT_DRV_FILE="/tmp/piGarden.drv.log"

--- a/conf/piGarden.conf.sonoff_tasmota_http.example
+++ b/conf/piGarden.conf.sonoff_tasmota_http.example
@@ -2,6 +2,14 @@
 LOG_FILE="/home/pi/piGarden/log/piGarden.log"
 LOG_FILE_MAX_SIZE=1048576 # 1MB

+#
+# Enable send log to piGardenWeb
+#
+
+#LOG_URL="http://url_of_your_pigardenweb/api/log"
+#LOG_API_TOKEN="token_of_pigardenweb_user"
+#LOG_CURL_PARAM="--data-urlencode -k"
+
 # Log file for driver output
 #LOG_OUTPUT_DRV_FILE="/tmp/piGarden.drv.log"

--- a/conf/piGarden.conf.spb16ch.example
+++ b/conf/piGarden.conf.spb16ch.example
@@ -2,6 +2,14 @@
 LOG_FILE="/home/pi/piGarden/log/piGarden.log"
 LOG_FILE_MAX_SIZE=1048576 # 1MB

+#
+# Enable send log to piGardenWeb
+#
+
+#LOG_URL="http://url_of_your_pigardenweb/api/log"
+#LOG_API_TOKEN="token_of_pigardenweb_user"
+#LOG_CURL_PARAM="--data-urlencode -k"
+
 # Log file for driver output
 #LOG_OUTPUT_DRV_FILE="/tmp/piGarden.drv.log"

--- a/drv/rainsensorqty/README.md
+++ b/drv/rainsensorqty/README.md
@@ -2,8 +2,8 @@
 # Driver rainsensorqty - driver for measure the rain volume
 # Author: androtto
 # file README.md
-# Version: 0.2.30
-# Data: 21/Sep/2019
+# Version: 0.2.5
+# Data: 07/Apr/2020


 FILE DI CONFIGURAZIONE /etc/piGarden.conf:
@@ -37,19 +37,38 @@ nella sottodirectory command sono presenti:
 commands/rainsensorqty_CHECK.sh
 	chiama la funzione di verifica pioggia, la medesima chiamata da check_rain_sensor
 commands/rainsensorqty_HISTORY.sh
-	visualizza lo storico della pioggia
+	visualizza lo storico della pioggia consultando il file $RAINSENSORQTY_HISTORY
+	puo' essere lanciato con l''opzione -force per ricostruire il file $RAINSENSORQTY_HISTORY dal $RAINSENSORQTY_HISTORYRAW
+	e con un argomento X, che permette di evidenziare solo gli ultimi X eventi
+commands/rainsensorqty_HISTORYRAW.sh
+	visualizza lo storico della pioggia consultando il file $RAINSENSORQTY_HISTORYRAW
+	puo' essere lanciato senza argomenti per processare l'intero file, chiede conferma visto che i tempi sono potenzialmente lunghi
+	con un argomento X, che permette di evidenziare solo gli ultimi X eventi
 commands/rainsensorqty_INIT.sh
 	inizializza il driver eseguendo lo script di monitoring - normalmente tale processo avviene da piGarden.sh
 	utile quando si vuole testare dei cambiamenti o se necessario riavviare dopo il kill del comando successivo
 commands/rainsensorqty_KILL.sh
 	killa i processi di monitoring ed eventuali figli
 commands/rainsensorqty_RAINNOW.sh
-	simula una pioggia registrandola in $RAINSENSORQTY_LASTRAIN
+	simula una pioggia registrandola in $RAINSENSORQTY_LASTRAIN $RAINSENSORQTY_HISTORY $RAINSENSORQTY_HISTORYRAW
+	puo' essere lanciato in 3 modi:
+	senza argomenti: genera una pioggia per un numero di loop pari al valore della variabile RAINSENSORQTY_LOOPSFORSETRAINING, quindi una pioggia completa
+	con un argomento: che indica quanti loop
+	con due argomenti: quanti loop e quanti secondi tra uno e l'altro
 commands/rainsensorqty_REMOVELASTRAIN.sh
-	rimuove dai file $RAINSENSORQTY_LASTRAIN $RAINSENSORQTY_HISTORY l'ultima pioggia registrata
+	rimuove dai file $RAINSENSORQTY_LASTRAIN $RAINSENSORQTY_HISTORY $RAINSENSORQTY_HISTORYRAW l'ultima pioggia registrata
 commands/rainsensorqty_RESET.sh
 	invia il SIGUSR1 al processo di monitor per resettare i cicli. Viene visualizzato il reset solo dopo il successivo PULSE, questo perche' non e' possibile per lo script ricevere il trap in quanto il processo $GPIO e' attivo in attesa del PULSE

+questi i timestamps alla data del file:
+-rwxr-xr-x 1 pi pi 1044 Sep 24 18:26 rainsensorqty_CHECK.sh
+-rwxr-xr-x 1 pi pi 1139 Nov 28 00:17 rainsensorqty_HISTORYRAW.sh
+-rwxr-xr-x 1 pi pi 1462 Nov 19 00:19 rainsensorqty_HISTORY.sh
+-rwxr-xr-x 1 pi pi  596 Sep 24 18:26 rainsensorqty_INIT.sh
+-rwxr-xr-x 1 pi pi 1300 Sep 24 18:26 rainsensorqty_KILL.sh
+-rwxr-xr-x 1 pi pi 1111 Nov 27 00:05 rainsensorqty_RAINNOW.sh
+-rwxr-xr-x 1 pi pi 1252 Nov 22 00:18 rainsensorqty_REMOVELASTRAIN.sh
+-rwxr-xr-x 1 pi pi  897 Sep 24 18:26 rainsensorqty_RESET.sh

 ULTERIORI VARIABILI in config.include.sh
 ----------------------------------------
@@ -65,14 +84,14 @@ RAINSENSORQTY_LASTRAIN="$STATUS_DIR/rainsensorqty_lastrain"
 	memorizza l'ultima pioggia
 RAINSENSORQTY_HISTORY="$STATUS_DIR/rainsensorqty_history"
 	memorizza tutte le piogge permettendo di visualizzare lo storico (commands/rainsensorqty_HISTORY.sh)
+RAINSENSORQTY_HISTORYRAW="$STATUS_DIR/rainsensorqty_history.raw"
+	memorizza in formato grezzo (raw) tutti gli impulsi registrati  (formato: "secondi:impulsi" ) - consultabile il contenuto con commands/rainsensorqty_HISTORYRAW.sh

 RAINSENSORQTY_MONITORLOG="$DIR_SCRIPT/log/rainsensorqty_monitor.log"
 	log dello script di monitoring, popolato solo se RAINSENSORQTY_verbose="yes"

 RAINSENSORQTY_MONPID="$TMPDIR/rainsensorqty_monitor.pid"
 	file che viene popolato con il pid dello script di monitoring
-RAINSENSORQTY_STATE="$TMPDIR/rainsensorqty_state"
-	file che viene popolato con l'ultimo stato della vaschetta (formato timestamp:counter)

 RAINSENSORQTY_DIR="$DIR_SCRIPT/drv/rainsensorqty"
 	home directory del driver
@@ -103,5 +122,3 @@ GPIO_RESISTOR="none" #pull-up|pull-down|none
 	se lo stato di riposo e' 1, lo script attende la variazione verso 0 (falling)
 	la variabile RAINSENSORQTY_PULSE viene impostata secondo il valore di RAIN_GPIO_STATE presente in /etc/piGarden.conf
 	cioe' il valore che ci si aspetta per registrare il riempimento della vaschetta dello stato di pioggia
-
-
--- a/drv/rainsensorqty/_version_0.2.3
+++ b/drv/rainsensorqty/_version_0.2.3
--- a/drv/rainsensorqty/_version_0.2.5c
+++ b/drv/rainsensorqty/_version_0.2.5c
--- a/drv/rainsensorqty/commands/rainsensorqty_HISTORY.sh
+++ b/drv/rainsensorqty/commands/rainsensorqty_HISTORY.sh
@@ -4,8 +4,8 @@
 # Author: androtto
 # file "rainsensorqty_CHECK.sh"
 # test script for checking rain status using drv_rainsensorqty_rain_sensor_get function
-# Version: 0.2.0a
-# Data: 13/Aug/2019
+# Version: 0.2.5
+# Data: 08/Jan/2020

 SCRIPTDIR="$(cd `dirname $0` ; pwd )"
 SCRIPTNAME=${0##*/}
@@ -22,7 +22,38 @@ LOG_OUTPUT_DRV_FILE="$DIR_SCRIPT/log/$LOG_OUTPUT_DRV_FILE"
 . ./init.include.sh
 . ./rainsensor.include.sh

-rain_history # update rain history file if not
+if [[ $1 = "-force" ]] ; then
+	if [[ -s $RAINSENSORQTY_HISTORY ]] ; then
+		echo backup $RAINSENSORQTY_HISTORY to ${RAINSENSORQTY_HISTORY}.old$$
+		cp $RAINSENSORQTY_HISTORY ${RAINSENSORQTY_HISTORY}.old$$
+	fi

-echo "RAIN HISTORY"
-cat $RAINSENSORQTY_HISTORY | rain_when_amount
+	echo "generate all rain events to $RAINSENSORQTY_HISTORY"
+	if ! rainevents > ${RAINSENSORQTY_HISTORY} ; then
+		echo "WARNING: rainevents function had error"
+	fi
+	shift
+fi
+
+if ! rain_history tmp ; then # update rain history with last rain if not
+	echo "WARNING: rain_history function had error"
+fi
+
+cmd="cat"
+if [[ $# > 0 ]] ; then
+	if (( $1 >= 1 )) ; then
+		echo "processing last $1 lines of $RAINSENSORQTY_HISTORYRAW file"
+		cmd="tail -$1"
+	else
+		echo "argument not recognized - exit"
+		exit 1
+	fi
+fi
+echo -e "\n\n"
+
+if [[ -s $RAINSENSORQTY_HISTORY ]] ; then
+	echo "RAIN HISTORY"
+	cat $RAINSENSORQTY_HISTORY $RAINSENSORQTY_HISTORYTMP | $cmd | rain_when_amount
+else
+	echo "WARNING: no \$RAINSENSORQTY_HISTORY file"
+fi
--- a/drv/rainsensorqty/commands/rainsensorqty_HISTORYRAW.sh
+++ b/drv/rainsensorqty/commands/rainsensorqty_HISTORYRAW.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#
+# Driver rainsensorqty - driver for measure the rain volume
+# Author: androtto
+# file "rainsensorqty_CHECK.sh"
+# test script for checking rain status using drv_rainsensorqty_rain_sensor_get function
+# Version: 0.2.5
+# Data: 07/Apr/2020
+
+SCRIPTDIR="$(cd `dirname $0` ; pwd )"
+SCRIPTNAME=${0##*/}
+cd $SCRIPTDIR/.. # command is a subdirectory of driver
+
+DIR_SCRIPT=/home/pi/piGarden # home directory of piGarden
+CONFIG_ETC="/etc/piGarden.conf"
+LOG_OUTPUT_DRV_FILE="$DIR_SCRIPT/log/$LOG_OUTPUT_DRV_FILE"
+
+. $CONFIG_ETC
+
+. ./common.include.sh
+. ./config.include.sh 
+. ./init.include.sh
+. ./rainsensor.include.sh
+
+
+if [[ $# = 0 ]] ; then
+	cmd=cat
+	echo "processing all entire  $RAINSENSORQTY_HISTORYRAW file, will go on? (y/n)"
+	read answer
+	echo $answer
+	[[ $answer = [yY] ]] || exit 1
+else
+	if (( $1 >= 1 )) ; then
+		echo "processing $1 lines of $RAINSENSORQTY_HISTORYRAW file"
+		cmd="tail -$1"
+	else
+		echo "argument not recognized - exit"
+		exit 1
+	fi
+fi
+echo -e "\n\n"
+
+$cmd $RAINSENSORQTY_HISTORYRAW | while read line
+do
+	set -- ${line//:/ }
+	secs=$1
+	counter=$2
+	echo "$(sec2date $1):$counter"
+done
+ 
--- a/drv/rainsensorqty/commands/rainsensorqty_RAINNOW.sh
+++ b/drv/rainsensorqty/commands/rainsensorqty_RAINNOW.sh
@@ -3,8 +3,8 @@
 # Author: androtto
 # file "rainsensorqty_RAINNOW.sh"
 # test script for simulate rain ... now!
-# Version: 0.2.0a
-# Data: 13/Aug/2019
+# Version: 0.2.5
+# Data: 07/Apr/2020

 SCRIPTDIR="$(cd `dirname $0` ; pwd )"
 SCRIPTNAME=${0##*/}
@@ -19,8 +19,49 @@ CONFIG_ETC="/etc/piGarden.conf"
 . ./init.include.sh
 . ./rainsensor.include.sh

-echo "RAIN now!"
-echo "$(date +%s):$RAINSENSORQTY_LOOPSFORSETRAINING" > ${RAINSENSORQTY_LASTRAIN}
+wait=0
+timestart=$( date +%s)
+if [[ $# -ne 0 ]] ; then
+	if [[ $# = 1 ]] ; then 
+		howmany=$1
+		echo "one argument passed: rain event for $howmany loops"
+		(( time = timestart - howmany ))
+	elif [[ $# = 2 ]] ; then 
+		howmany=$1
+		wait=$2
+		echo "two arguments passed: rain event for $howmany loops every $wait seconds"
+		(( time = timestart ))
+	else
+		echo "too many arguments... exit"
+		exit 1
+	fi
+else
+	howmany=$RAINSENSORQTY_LOOPSFORSETRAINING
+	(( time = timestart - $RAINSENSORQTY_LOOPSFORSETRAINING ))
+fi
+
+
+echo "RAIN now! (for $howmany loops)"
+for (( c=1; c<=$howmany; c++ )) 
+do
+	if (( wait > 0 )) ; then	
+		time=$( date +%s)
+	else
+		(( time+= 1 ))
+	fi
+	linetoadd="$time:$c"
+	echo $linetoadd >> $RAINSENSORQTY_HISTORYRAW
+	sleep $wait
+	echo -e ".\c"
+done
+echo
+
+if ! rain_history ; then # update rain history with last rain if not
+	echo "WARNING: rain_history function had error"
+fi
+
+echo $linetoadd > ${RAINSENSORQTY_LASTRAIN}
 echo "file ${RAINSENSORQTY_LASTRAIN} updated."
-echo -e "\nLAST RAIN:"
-cat $RAINSENSORQTY_LASTRAIN | rain_when_amount
+
+echo "last 2 rain events:"
+tail -2 $RAINSENSORQTY_HISTORY | rain_when_amount
--- a/drv/rainsensorqty/commands/rainsensorqty_REMOVELASTRAIN.sh
+++ b/drv/rainsensorqty/commands/rainsensorqty_REMOVELASTRAIN.sh
@@ -3,8 +3,8 @@
 # Author: androtto
 # file "test_rainsensorqty_CHECK.sh"
 # test script for checking rain status using drv_rainsensorqty_rain_sensor_get function
-# Version: 0.2.0a
-# Data: 13/Aug/2019
+# Version: 0.2.5
+# Data: 07/Apr/2020

 SCRIPTDIR="$(cd `dirname $0` ; pwd )"
 SCRIPTNAME=${0##*/}
@@ -26,26 +26,19 @@ LOG_OUTPUT_DRV_FILE="$DIR_SCRIPT/log/$LOG_OUTPUT_DRV_FILE"
 # RAINSENSORQTY_LASTRAIN
 # RAINSENSORQTY_HISTORY

-rain_history # update rain history file if not
-
-echo "RAIN HISTORY - last five events"
-tail -5 $RAINSENSORQTY_HISTORY | rain_when_amount
-
-echo -e "\nLAST RAIN"
-cat $RAINSENSORQTY_LASTRAIN | rain_when_amount
-
-#exit # for test
-
-echo -e "\nbackup to .old files"
-cp -p $RAINSENSORQTY_HISTORY ${RAINSENSORQTY_HISTORY}.old
-cp -p  $RAINSENSORQTY_LASTRAIN ${RAINSENSORQTY_LASTRAIN}.old
+echo "RAIN HISTORY - last two events"
+tail -2 $RAINSENSORQTY_HISTORY 
+tail -2 $RAINSENSORQTY_HISTORY | rain_when_amount

 echo "...removing last event"
-head -n-1 ${RAINSENSORQTY_HISTORY}.old > $RAINSENSORQTY_HISTORY 
-tail -1 $RAINSENSORQTY_HISTORY > $RAINSENSORQTY_LASTRAIN 
+removelastrain
+echo "...rebuilding ${RAINSENSORQTY_HISTORY} from ${RAINSENSORQTY_HISTORYRAW}"
+if ! rainevents > ${RAINSENSORQTY_HISTORY} ; then
+	echo "WARNING: rainevents function had error"
+fi
+tail -1 ${RAINSENSORQTY_HISTORYRAW} > ${RAINSENSORQTY_LASTRAIN}

-echo -e "\nnew RAIN HISTORY - last five events"
-tail -5 $RAINSENSORQTY_HISTORY | rain_when_amount
+echo -e "\nnew RAIN HISTORY - last two events"
+tail -2 $RAINSENSORQTY_HISTORY 
+tail -2 $RAINSENSORQTY_HISTORY | rain_when_amount

-echo -e "\nnew LAST RAIN"
-cat $RAINSENSORQTY_LASTRAIN | rain_when_amount
--- a/drv/rainsensorqty/commands/test_pulse
+++ b/drv/rainsensorqty/commands/test_pulse
@@ -0,0 +1 @@
+echo 1 > /tmp/tick ; sleep 0.9 ; echo 0 > /tmp/tick
--- a/drv/rainsensorqty/common.include.sh
+++ b/drv/rainsensorqty/common.include.sh
@@ -3,14 +3,19 @@
 # Author: androtto
 # file "common.include.sh"
 # common functions used by driver
-# Version: 0.2.0a
-# Data: 13/Aug/2019
+# Version: 0.2.5
+# Data: 08/Jan/2020


 #note:
 #RAINSENSORQTY_MONPID="$TMPDIR/rainsensorqty_monitor.pid"
 #

+sec2date()
+{
+        date --date="@$1"
+}
+
 d() # short date & time
 {
 date '+%X-%x'
@@ -55,15 +60,70 @@ en_echo() # enhanched echo - check verbose variable
 	[[ $RAINSENSORQTY_verbose = yes ]] && echo "$(d) $*"
 }

+check_incomplete_loop()
+{
+	[[ ! -f $RAINSENSORQTY_HISTORYRAW ]] && return 1
+	[[ ! -f $RAINSENSORQTY_HISTORY ]] && touch $RAINSENSORQTY_HISTORY
+	> $RAINSENSORQTY_HISTORYTMP
+
+	if lastrainevent=$( rainevents 1 ) ; then
+       		: # done ok
+	else
+        	echo "WARNING: rainevents function had errors"
+		return 1
+	fi
+
+        set -- ${lastrainevent//:/ }
+	local started=$1
+	local before=$2
+	local counter=$3
+
+	wrongevent=$(awk -F ":" '$1=="'$started'" && $2!="'$before'" {print $0}' $RAINSENSORQTY_HISTORY) 
+	if [[ -n $wrongevent ]] ; then
+		echo "ERROR: wrong last rain event found: $wrongevent , right one should be: $lastrainevent"
+		return 2
+	fi
+
+	if grep -q ^${lastrainevent}$ $RAINSENSORQTY_HISTORY ; then
+		: # already present
+		return 0
+	else
+
+		: # missing and fixed 
+		if [[ $1 == tmp ]] ; then
+			echo $lastrainevent > $RAINSENSORQTY_HISTORYTMP
+		else
+			echo $lastrainevent >> $RAINSENSORQTY_HISTORY
+		fi
+		return 1
+	fi
+}
+
+#next function is not used anymore
 rain_history()
 {
+	[[ ! -f $RAINSENSORQTY_HISTORYRAW ]] && return 1
 	[[ ! -f $RAINSENSORQTY_HISTORY ]] && touch $RAINSENSORQTY_HISTORY
-	[[ ! -f $RAINSENSORQTY_LASTRAIN ]] && return 1
-	if grep -q ^$(<$RAINSENSORQTY_LASTRAIN)$ $RAINSENSORQTY_HISTORY ; then
-		: # do nothing
-		return 2
+	> $RAINSENSORQTY_HISTORYTMP
+
+	if lastrainevent=$( rainevents 1 ) ; then
+       		: # done ok
 	else
-		cat $RAINSENSORQTY_LASTRAIN >> $RAINSENSORQTY_HISTORY
+        	echo "WARNING: rainevents function had errors"
+		return 1
+	fi
+
+#old	#if grep -q ^$(<$RAINSENSORQTY_LASTRAIN)$ $RAINSENSORQTY_HISTORY ; then
+	if grep -q ^${lastrainevent}$ $RAINSENSORQTY_HISTORY ; then
+		: # already present
+		return 0
+	else
+		: # missing and fixed 
+		if [[ $1 == tmp ]] ; then
+			echo $lastrainevent > $RAINSENSORQTY_HISTORYTMP
+		else
+			echo $lastrainevent >> $RAINSENSORQTY_HISTORY
+		fi
 		return 0
 	fi
 }
@@ -71,12 +131,14 @@ rain_history()
 rain_when_amount()
 {
 # from standard input
+# format  $time:$endtime:$endsequence
 cat - | while read line
 do
        set -- ${line//:/ }
-        when=$1
-        howmuch=$2
-        printf "RAINED on %s for %.2f mm\n" "$(date --date="@$1")" $( $JQ -n "$howmuch * $RAINSENSORQTY_MMEACH" )
+        start=$1
+        stop=$2
+        howmuch=$3
+        printf "RAINED for %7.2f mm between %s and %s\n" $( $JQ -n "$howmuch * $RAINSENSORQTY_MMEACH" ) "$(date --date="@$start")" "$(date --date="@$stop")"
 done
 }

@@ -88,3 +150,54 @@ check_TMPDIR()
        fi
 }

+rainevents()
+{
+	if [[ ! -f $RAINSENSORQTY_HISTORYRAW ]] ; then
+		#echo "WARNING: no \$RAINSENSORQTY_HISTORYRAW file"# cannot echo, redirected output
+		return 1
+	fi
+	case $1 in
+       		[0-9]|[0-9][0-9]) howmanyevent=$1 ;;
+#		-1) skiplast=true ;;
+		*) howmanyevent=-1 ;;
+	esac
+
+	newloop=yes
+	tac $RAINSENSORQTY_HISTORYRAW | while read line
+	do
+		set -- ${line//:/ }
+		time=$1
+		sequence=$2
+		if [[ $newloop == yes ]] ; then
+			endtime=$time
+			endsequence=$sequence
+			newloop=no
+		fi
+		if (( sequence == 1 )) ; then
+#			[[ $skiplast=true ]] && { skiplast=false ; continue ; }
+			echo $time:$endtime:$endsequence
+			newloop=yes
+			(( event +=1 ))
+		fi
+		(( howmanyevent == event )) && break
+	done | sort -k1n
+}
+
+removelastrain()
+{
+	if [[ ! -f $RAINSENSORQTY_HISTORYRAW ]] ; then
+		echo "WARNING: no \$RAINSENSORQTY_HISTORYRAW file"
+		return 1
+	fi
+
+	next=false
+	tac $RAINSENSORQTY_HISTORYRAW | while read line
+	do
+		set -- ${line//:/ }
+		time=$1
+		sequence=$2
+		[[ $next = true ]] && echo $line
+		(( sequence == 1 )) && next=true
+	done | tac > ${RAINSENSORQTY_HISTORYRAW}_$$
+	mv ${RAINSENSORQTY_HISTORYRAW}_$$ $RAINSENSORQTY_HISTORYRAW
+}
--- a/drv/rainsensorqty/conf_example/config.include.sh
+++ b/drv/rainsensorqty/conf_example/config.include.sh
@@ -0,0 +1,66 @@
+#
+# Driver rainsensorqty - driver for measure the rain volume
+# Author: androtto
+# file "config.include.sh"
+# specific driver config file
+# Version: 0.2.5
+# Data: 08/Jan/2020
+
+export TMPDIR=/tmp
+
+RAINSENSOR_DEBOUNCE=0.3 # 0.3 seconds for manage debounce of reed contact
+
+RAINSENSORQTY_verbose="yes" # yes/no
+
+RAINSENSORQTY_LASTRAIN="$STATUS_DIR/rainsensorqty_lastrain"
+RAINSENSORQTY_HISTORY="$STATUS_DIR/rainsensorqty_history"
+RAINSENSORQTY_HISTORYRAW="$STATUS_DIR/rainsensorqty_history.raw"
+RAINSENSORQTY_HISTORYTMP="$TMPDIR/rainsensorqty_history.tmp"
+
+RAINSENSORQTY_MONITORLOG="$DIR_SCRIPT/log/rainsensorqty_monitor.log"
+
+RAINSENSORQTY_MONPID="$TMPDIR/rainsensorqty_monitor.pid"
+RAINSENSORQTY_STATE="$TMPDIR/rainsensorqty_state"
+RAINSENSORQTY_STATE_HIST="$TMPDIR/rainsensorqty_state.history"
+
+RAINSENSORQTY_DIR="$DIR_SCRIPT/drv/rainsensorqty"
+
+monitor_sh="$RAINSENSORQTY_DIR/drv_rainsensorqty_monitor.sh"
+
+# internal gpio resistor, 3 values: pull-up, pull-down, none
+# pull-up/down if rain gauge is connected directly to raspberry
+# none if connected through an optocoupler circuit
+GPIO_RESISTOR="pull-up" #pull-up|pull-down|none
+
+#rising means waiting for 1 status (from 0)
+#falling means waiting for 0 status (from 1)
+#RAINSENSORQTY_PULSE=rising  # pull-down circuit (rest status is 0)
+#RAINSENSORQTY_PULSE=falling # pull-up circuit   (rest status is 1)
+(( RAIN_GPIO_STATE == 1 )) && RAINSENSORQTY_PULSE=rising  # pull-down circuit (rest status is 0)
+(( RAIN_GPIO_STATE == 0 )) && RAINSENSORQTY_PULSE=falling # pull-up circuit   (rest status is 1)
+
+
+config_check()
+{
+	var2check="RAINSENSOR_DEBOUNCE RAINSENSORQTY_verbose RAINSENSORQTY_LASTRAIN RAINSENSORQTY_HISTORY RAINSENSORQTY_MONITORLOG RAINSENSORQTY_MONPID RAINSENSORQTY_DIR monitor_sh"
+	for var in $var2check
+	do
+		#${!a}
+		if [[ -z ${!var} ]] ; then
+			echo "ERROR: \$$var not set"
+			exit 1 
+		fi
+	done
+	if [[ -z $RAINSENSORQTY_PULSE ]] ; then
+		echo "ERROR: RAIN_GPIO_STATE not set in piGarden.conf"
+		exit 1
+	fi
+	return 0
+	case $GPIO_RESISTOR in
+		pull-up|pull-down|none) return 0 ;;
+		*) echo "ERROR: GPIO_RESISTOR not set correctly - values are \"pull-up|pull-down|none\" "
+			exit 1
+			;;
+	esac
+}
+
--- a/drv/rainsensorqty/config.include.sh
+++ b/drv/rainsensorqty/config.include.sh
@@ -3,8 +3,8 @@
 # Author: androtto
 # file "config.include.sh"
 # specific driver config file
-# Version: 0.2.0
-# Data: 11/Aug/2019
+# Version: 0.2.5
+# Data: 08/Jan/2020

 export TMPDIR=/tmp

@@ -14,6 +14,8 @@ RAINSENSORQTY_verbose="yes" # yes/no

 RAINSENSORQTY_LASTRAIN="$STATUS_DIR/rainsensorqty_lastrain"
 RAINSENSORQTY_HISTORY="$STATUS_DIR/rainsensorqty_history"
+RAINSENSORQTY_HISTORYRAW="$STATUS_DIR/rainsensorqty_history.raw"
+RAINSENSORQTY_HISTORYTMP="$TMPDIR/rainsensorqty_history.tmp"

 RAINSENSORQTY_MONITORLOG="$DIR_SCRIPT/log/rainsensorqty_monitor.log"

--- a/drv/rainsensorqty/drv_rainsensorqty_monitor.sh
+++ b/drv/rainsensorqty/drv_rainsensorqty_monitor.sh
@@ -4,8 +4,8 @@
 # Author: androtto
 # file "drv_rainsensorqty_monitor.sh"
 # monitor script
-# Version: 0.2.2
-# Data: 08/Sep/2019
+# Version: 0.2.5c
+# Data: 08/Dec/2020

 resetcounter()
 {
@@ -14,6 +14,19 @@ resetcounter()
        echo "SIGUSR1 received after last PULSE - counter resetted"
 }

+# DEBUG FUNCTION:
+testloop()
+{
+	touch /tmp/tick
+	while true
+	do
+		if [[ $( < /tmp/tick ) = "1" ]] ; then
+			break
+		fi
+		sleep 1
+	done
+}
+
 ###############
 #    MAIN     #
 ###############
@@ -51,34 +64,44 @@ fi
 echo $$ > $RAINSENSORQTY_MONPID
 drv_rainsensorqty_writelog $f "NORMAL - $$ pid monitor process started - see $RAINSENSORQTY_MONPID"

+echo ""
+en_echo "---- NEW RUN ----"
+
+# check if monitor script was killed before writing a complete rain event
+check_incomplete_loop 
+case $? in 
+	2) echo "\$RAINSENSORQTY_HISTORY - wrong entry found - no fix possible" ;;
+	1) echo "\$RAINSENSORQTY_HISTORY - fixed incomplete loop" ;;
+	0) echo "\$RAINSENSORQTY_HISTORY - no incomplete loop needed to be fixed" ;;
+esac
+
 # init variables
 MMEACH="$RAINSENSORQTY_MMEACH"
 (( counter=0 ))
-rain_history
+before="-1"

-echo ""
-en_echo "---- NEW RUN ----"
+en_echo "WAITING FOR $RAINSENSORQTY_PULSE PULSE" 

 # loop forever
 while true
 do
-	before=`date +%s`
 	sleep $RAINSENSOR_DEBOUNCE
-	en_echo "WAITING FOR $RAINSENSORQTY_PULSE PULSE" 
+	#DEBUG: testloop #DEBUG
 	$GPIO -g wfi $gpio_port $RAINSENSORQTY_PULSE
 	now=`date +%s`
 	(( elapsed = now - before ))
 	if (( elapsed >= RAINSENSORQTY_SECSBETWEENRAINEVENT )) ; then
+		last_event="$started:$before:$counter"
 		(( counter=0 ))
 		drv_rainsensorqty_writelog $f "first drops after $elapsed seconds since last rain ( greater than $RAINSENSORQTY_SECSBETWEENRAINEVENT )- new cycle - waiting for $( $JQ -n "$RAINSENSORQTY_LOOPSFORSETRAINING * $MMEACH" ) mm of rain" &
+		(( before > 0 )) && echo $last_event >> $RAINSENSORQTY_HISTORY
 		en_echo "---- NEW CYCLE ----"
-		rain_history &
 	fi
  	(( counter+=1 ))
-	en_echo "$RAINSENSORQTY_PULSE PULSE #$counter RECEIVED" 
-	echo "$now:$counter" > ${RAINSENSORQTY_STATE} &
-	echo "$now:$counter" >> ${RAINSENSORQTY_STATE_HIST} &
+  	(( counter == 1 )) && (( started = now ))
+	echo "$now:$counter" >> ${RAINSENSORQTY_HISTORYRAW} &
 	MMWATER=$( $JQ -n "$counter*$MMEACH" )
+	en_echo $( printf "%s PULSE #%d RECEIVED (%.2f mm)" $RAINSENSORQTY_PULSE $counter $MMWATER )
 	text=$(printf "%.2f mm height (#%d pulse)" $MMWATER $counter )
 	if (( counter >= RAINSENSORQTY_LOOPSFORSETRAINING )) ; then 
 		drv_rainsensorqty_writelog $f "RAINING - $text" &
@@ -86,4 +109,5 @@ do
 	else
 		drv_rainsensorqty_writelog $f "now is $text" &
 	fi
+	(( before = now ))
 done
--- a/drv/remote/rele.include.sh
+++ b/drv/remote/rele.include.sh
@@ -35,7 +35,7 @@ function drv_remote_rele_open {
 		error="${error%\"}"
 		error="${error#\"}"
 		echo "error=$error"
-	        log_write "Remote rele open error: $error"
+	        log_write "drv_remote" "error" "Remote rele open error: $error"
        	message_write "warning" "Remote rele open error: $error"
 		return 1
 	fi
@@ -68,7 +68,7 @@ function drv_remote_rele_close {
 		error="${error%\"}"
 		error="${error#\"}"
 		echo "error=$error"
-	        log_write "Remote rele close error: $error"
+	        log_write "drv_remoter" "error" "Remote rele close error: $error"
        	message_write "warning" "Remote rele close error: $error"
 		return 1
 	fi
--- a/drv/sonoff_tasmota_http/rele.include.sh
+++ b/drv/sonoff_tasmota_http/rele.include.sh
@@ -35,7 +35,7 @@ function drv_sonoff_tasmota_http_rele_open {
 		error="${error%\"}"
 		error="${error#\"}"
 		echo "error=$error"
-	        log_write "Remote rele open error: $error"
+	        log_write "drv_sonoff_tasmota_http" "error" "Remote rele open error: $error"
        	message_write "warning" "Remote rele open error: $error"
 		return 1
 	fi
@@ -69,7 +69,7 @@ function drv_sonoff_tasmota_http_rele_close {
 		error="${error%\"}"
 		error="${error#\"}"
 		echo "error=$error"
-	        log_write "Remote rele close error: $error"
+	        log_write "drv_sonoff_tasmota_http" "error" "Remote rele close error: $error"
        	message_write "warning" "Remote rele close error: $error"
 		return 1
 	fi
--- a/drv/spb16ch/common.include.sh
+++ b/drv/spb16ch/common.include.sh
@@ -74,7 +74,7 @@ function drv_spb16ch_boards_id_load {
 			SPB16CH_USED_ID+=("$board_id")
 		done
 	else
-		log_write "spb16ch: file $SPB16CH_BOARD_ID_STORE_FILE not found: remember to run 'piGarden init' to generate the file"
+		log_write "drv_spb16ch" "error" "spb16ch: file $SPB16CH_BOARD_ID_STORE_FILE not found: remember to run 'piGarden init' to generate the file"
 	fi

 }
--- a/drv/spb16ch/rele.include.sh
+++ b/drv/spb16ch/rele.include.sh
@@ -19,7 +19,7 @@ function drv_spb16ch_rele_open {
 	local rele_data=${SPB16CH_RELE_MAP[$rele_id]}
 	if [[ -z $rele_data ]]; then
 		local message="Error - Rele map not defined - rele_id=$rele_id - ($1)"
-		log_write "$message"
+		log_write "drv_spb16ch" "error" "$message"
 		message_write "warning" "$message"
 	fi
 	local address_num=${rele_data:0:2}
@@ -52,7 +52,7 @@ function drv_spb16ch_rele_close {
 	local rele_data=${SPB16CH_RELE_MAP[$rele_id]}
 	if [[ -z $rele_data ]]; then
 		local message="Error - Rele map not defined - rele_id=$rele_id - ($1)"
-		log_write "$message"
+		log_write "drv_spb16ch" "error" "$message"
 		message_write "warning" "$message"
 	fi
 	local address_num=${rele_data:0:2}
--- a/include/cron.include.sh
+++ b/include/cron.include.sh
@@ -10,7 +10,7 @@ function cron_del {

 	if [ -z "$CRON_TYPE" ]; then
 		echo "Cron type is empty" >&2
-		log_write "Cron type is empty"
+		log_write "cron" "error" "Cron type is empty"
 		return 1
 	fi

@@ -25,17 +25,17 @@ function cron_del {
 	fi
 	if ! [[ $START =~ $re ]] ; then
  		echo "Cron start don't find" >&2
-  		log_write "Cron start don't find"
+  		log_write "cron" "error" "Cron start don't find"
 		return 1
 	fi
 	if ! [[ $END =~ $re ]] ; then
  		echo "Cron end cron don't find" >&2
-  		log_write "Cron end cron don't find"
+  		log_write "cron" "error" "Cron end cron don't find"
 		return 1
 	fi
 	if [ "$START" -gt "$END" ]; then
  		echo "Wrong position for start and end in cron" >&2
-  		log_write "Wrong position for start and end in cron"
+  		log_write "cron" "error" "Wrong position for start and end in cron"
 		return 1
 	fi

@@ -74,7 +74,7 @@ function cron_add {

 	if [ -z "$CRON_TYPE" ]; then
 		echo "Cron type is empty" >&2
-		log_write "Cron type is empty"
+		log_write "cron" "error" "Cron type is empty"
 		return 1
 	fi

@@ -91,12 +91,12 @@ function cron_add {
 	else
 		if ! [[ $START =~ $re ]] ; then
  			echo "Cron start don't find" >&2
-  			log_write "Cron start don't find"
+  			log_write "cron" "error" "Cron start don't find"
 			return 1
 		fi
 		if ! [[ $END =~ $re ]] ; then
  			echo "Cron end cron don't find" >&2
-  			log_write "Cron end cron don't find"
+  			log_write "cron" "error" "Cron end cron don't find"
 			return 1
 		fi
 		START=$(($START + 1))
@@ -104,7 +104,7 @@ function cron_add {

 		if [ "$START" -gt "$END" ]; then
  			echo "Wrong position for start and end in cron" >&2
-  			log_write "Wrong position for start and end in cron"
+  			log_write "cron" "error" "Wrong position for start and end in cron"
 			return 1
 		fi
 		
@@ -183,7 +183,7 @@ function cron_add {

 		*)
 			echo "Wrong cron type: $CRON_TYPE"
-			log_write "Wrong cron type: $CRON_TYPE"
+			log_write "cron" "error" "Wrong cron type: $CRON_TYPE"
 			;;

 	esac
@@ -225,7 +225,7 @@ function cron_get {

 	if [ -z "$CRON_TYPE" ]; then
 		echo "Cron type is empty" >&2
-		log_write "Cron type is empty"
+		log_write "cron" "error" "Cron type is empty"
 		return 1
 	fi

@@ -241,12 +241,12 @@ function cron_get {
 	else
 		if ! [[ $START =~ $re ]] ; then
  			echo "Cron start don't find" >&2
-  			log_write "Cron start don't find"
+  			log_write "cron" "error" "Cron start don't find"
 			return 1
 		fi
 		if ! [[ $END =~ $re ]] ; then
  			echo "Cron end cron don't find" >&2
-  			log_write "Cron end cron don't find"
+  			log_write "cron" "error" "Cron end cron don't find"
 			return 1
 		fi
 		START=$(($START + 1))
@@ -254,7 +254,7 @@ function cron_get {

 		if [ "$START" -gt "$END" ]; then
  			echo "Wrong position for start and end in cron" >&2
-  			log_write "Wrong position for start and end in cron"
+  			log_write "cron" "error" "Wrong position for start and end in cron"
 			return 1
 		fi
 		
@@ -370,7 +370,7 @@ function add_cron_open {

 	local exists=`alias_exists $1`
 	if [ "check $exists" = "check FALSE" ]; then
-		log_write "Alias $1 not found"
+		log_write "cron" "error" "Alias $1 not found"
 		echo "Alias $1 not found"
 		return 1
 	fi
@@ -387,7 +387,7 @@ function del_cron_open {

 	local exists=`alias_exists $1`
 	if [ "check $exists" = "check FALSE" ]; then
-		log_write "Alias $1 not found"
+		log_write "cron" "error" "Alias $1 not found"
 		echo "Alias $1 not found"
 		return 1
 	fi
@@ -404,7 +404,7 @@ function get_cron_open {

 	local exists=`alias_exists $1`
 	if [ "check $exists" = "check FALSE" ]; then
-		log_write "Alias $1 not found"
+		log_write "cron" "error" "Alias $1 not found"
 		echo "Alias $1 not found"
 		return 1
 	fi
@@ -421,7 +421,7 @@ function del_cron_open_in {

 	local exists=`alias_exists $1`
 	if [ "check $exists" = "check FALSE" ]; then
-		log_write "Alias $1 not found"
+		log_write "cron" "error" "Alias $1 not found"
 		echo "Alias $1 not found"
 		return 1
 	fi
@@ -439,7 +439,7 @@ function get_cron_close {

 	local exists=`alias_exists $1`
 	if [ "check $exists" = "check FALSE" ]; then
-		log_write "Alias $1 not found"
+		log_write "cron" "error" "Alias $1 not found"
 		echo "Alias $1 not found"
 		return 1
 	fi
@@ -462,7 +462,7 @@ function add_cron_close {

 	local exists=`alias_exists $1`
 	if [ "check $exists" = "check FALSE" ]; then
-		log_write "Alias $1 not found"
+		log_write "cron" "error" "Alias $1 not found"
 		echo "Alias $1 not found"
 		return 1
 	fi
@@ -479,7 +479,7 @@ function del_cron_close {

 	local exists=`alias_exists $1`
 	if [ "check $exists" = "check FALSE" ]; then
-		log_write "Alias $1 not found"
+		log_write "cron" "error" "Alias $1 not found"
 		echo "Alias $1 not found"
 		return 1
 	fi
@@ -559,7 +559,79 @@ function cron_disable_all_open_close {
 		fi
 		
        done
-
-
-
+}
+
+
+
+#
+# Attiva tutte le schedulazioni di apertura e chiusura elettrovalvole
+#
+function cron_enable_all_open_close {
+
+	local a=""
+	local al=""
+	local cron=""
+
+	#
+	# Disabilita tutte le schedulazioni di apertura
+	#
+        for i in $(seq $EV_TOTAL)
+        do
+                a=EV"$i"_ALIAS
+                al=${!a}
+                local crons=`get_cron_open $al`
+		if [[ ! -z "$crons" ]]; then
+			del_cron_open $al
+			IFS=$'\n'       # make newlines the only separator
+			for cron in $crons
+			do
+				#echo "-- $cron --"
+				CRON_M=`echo $cron | $CUT -d' ' -f1,1`
+				CRON_H=`echo $cron | $CUT -d' ' -f2,2`
+				CRON_DOM=`echo $cron | $CUT -d' ' -f3,3`
+				CRON_MON=`echo $cron | $CUT -d' ' -f4,4`
+				CRON_DOW=`echo $cron | $CUT -d' ' -f5,5`
+
+				if [[ ${CRON_M:0:1} == "#" ]]; then
+					CRON_M=${CRON_M:1:${#CRON_M}}
+				fi
+				#echo "++ $CRON_M $CRON_H $CRON_DOM $CRON_MON $CRON_DOW ++"
+
+				add_cron_open $al "$CRON_M" "$CRON_H" "$CRON_DOM" "$CRON_MON" "$CRON_DOW"
+			done
+		fi
+		
+        done
+
+
+	#
+	# Disabilita tutte le schedulazioni di chiusura
+	#
+        for i in $(seq $EV_TOTAL)
+        do
+                a=EV"$i"_ALIAS
+                al=${!a}
+                local crons=`get_cron_close $al`
+		if [[ ! -z "$crons" ]]; then
+			del_cron_close $al
+			IFS=$'\n'       # make newlines the only separator
+			for cron in $crons
+			do
+				#echo "-- $cron --"
+				CRON_M=`echo $cron | $CUT -d' ' -f1,1`
+				CRON_H=`echo $cron | $CUT -d' ' -f2,2`
+				CRON_DOM=`echo $cron | $CUT -d' ' -f3,3`
+				CRON_MON=`echo $cron | $CUT -d' ' -f4,4`
+				CRON_DOW=`echo $cron | $CUT -d' ' -f5,5`
+
+				if [[ ${CRON_M:0:1} == "#" ]]; then
+					CRON_M=${CRON_M:1:${#CRON_M}}
+				fi
+				#echo "++ $CRON_M $CRON_H $CRON_DOM $CRON_MON $CRON_DOW ++"
+
+				add_cron_close $al "$CRON_M" "$CRON_H" "$CRON_DOM" "$CRON_MON" "$CRON_DOW"
+			done
+		fi
+		
+        done
 }
--- a/include/drv.include.sh
+++ b/include/drv.include.sh
@@ -94,7 +94,7 @@ function drv_rele_init {
                $GPIO -g mode $idx out                # setta il gpio nella modalita di scrittura
 	# Il driver definito non è stato trovato
 	elif [ "$fnc" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx"
+	        log_write "drv" "error" "Driver not found: $idx"
        	message_write "warning" "Driver not found: $idx"
 	else
 		echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
@@ -116,7 +116,7 @@ function drv_rele_close {
 		$GPIO -g write $idx $RELE_GPIO_CLOSE	
 	# Il driver definito non è stato trovato
 	elif [ "$fnc" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx"
+	        log_write "drv" "error" "Driver not found: $idx"
        	message_write "warning" "Driver not found: $idx"
 		return 1
 	else
@@ -142,7 +142,7 @@ function drv_rele_open {
 		$GPIO -g write $idx $RELE_GPIO_OPEN	
 	# Il driver definito non è stato trovato
 	elif [ "$fnc" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx"
+	        log_write "drv" "error" "Driver not found: $idx"
        	message_write "warning" "Driver not found: $idx"
 		return 1
 	else
@@ -172,7 +172,7 @@ function drv_supply_bistable_init {
 		$GPIO -g mode $idx1 out
 	# Il driver definito non è stato trovato
 	elif [ "$fnc1" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx1"
+	        log_write "drv" "error" "Driver not found: $idx1"
        	message_write "warning" "Driver not found: $idx1"
 		return
 	else
@@ -186,7 +186,7 @@ function drv_supply_bistable_init {
 		$GPIO -g mode $idx2 out
 	# Il driver definito non è stato trovato
 	elif [ "$fnc2" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx2"
+	        log_write "drv" "error" "Driver not found: $idx2"
        	message_write "warning" "Driver not found: $idx2"
 	else
 		echo "$(date) $fnc2 arg:$idx2" >> "$LOG_OUTPUT_DRV_FILE"
@@ -212,7 +212,7 @@ function drv_supply_positive {
 		$GPIO -g write $idx1 $SUPPLY_GPIO_POS
 	# Il driver definito non è stato trovato
 	elif [ "$fnc1" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx1"
+	        log_write "drv" "error" "Driver not found: $idx1"
        	message_write "warning" "Driver not found: $idx1"
 		return
 	else
@@ -225,7 +225,7 @@ function drv_supply_positive {
 		$GPIO -g write $idx2 $SUPPLY_GPIO_POS
 	# Il driver definito non è stato trovato
 	elif [ "$fnc2" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx2"
+	        log_write "drv" "error" "Driver not found: $idx2"
        	message_write "warning" "Driver not found: $idx2"
 	else
 		echo "$(date) $fnc2 arg:$idx2" >> "$LOG_OUTPUT_DRV_FILE"
@@ -251,7 +251,7 @@ function drv_supply_negative {
 		$GPIO -g write $idx1 $SUPPLY_GPIO_NEG
 	# Il driver definito non è stato trovato
 	elif [ "$fnc1" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx1"
+	        log_write "drv" "error" "Driver not found: $idx1"
        	message_write "warning" "Driver not found: $idx1"
 		return
 	else
@@ -264,7 +264,7 @@ function drv_supply_negative {
 		$GPIO -g write $idx2 $SUPPLY_GPIO_NEG
 	# Il driver definito non è stato trovato
 	elif [ "$fnc2" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx2"
+	        log_write "drv" "error" "Driver not found: $idx2"
        	message_write "warning" "Driver not found: $idx2"
 	else
 		echo "$(date) $fnc2 arg:$idx2" >> "$LOG_OUTPUT_DRV_FILE"
@@ -288,7 +288,7 @@ function drv_rain_sensor_init {
 		$GPIO -g mode $idx in
 	# Il driver definito non è stato trovato
 	elif [ "$fnc" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx"
+	        log_write "drv" "error" "Driver not found: $idx"
        	message_write "warning" "Driver not found: $idx"
 	else
 		echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
@@ -312,7 +312,7 @@ function drv_rain_sensor_get {
 		vret=`$GPIO -g read $idx`
 	# Il driver definito non è stato trovato
 	elif [ "$fnc" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx"
+	        log_write "drv" "error" "Driver not found: $idx"
        	message_write "warning" "Driver not found: $idx"
 	else
 		echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
@@ -335,11 +335,11 @@ function drv_rain_online_get {

 	# Nessun driver definito, esegue la lettura del sensore tramite gpio del raspberry
 	if [ -z "$fnc" ]; then
-	        log_write "Driver not found: $idx"
+	        log_write "drv" "error" "Driver not found: $idx"
        	message_write "warning" "Driver not found: $idx"
 	# Il driver definito non è stato trovato
 	elif [ "$fnc" == "drvnotfound" ]; then
-	        log_write "Driver not found: $idx"
+	        log_write "drv" "error" "Driver not found: $idx"
        	message_write "warning" "Driver not found: $idx"
 	else
 		echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
--- a/include/rain.include.sh
+++ b/include/rain.include.sh
@@ -4,7 +4,7 @@
 function check_rain_online {

 	if [ "$WEATHER_SERVICE" == "none" ]; then
-		log_write "check_rain_online - online service is disable"
+		log_write "rain" "warning" "check_rain_online - online service is disabled"
 		return
 	fi

@@ -17,7 +17,7 @@ function check_rain_online {

 	if [[ $local_epoch =~ ^-?[0-9]+$ ]]; then
 		if [ $local_epoch -eq 0 ]; then
-			log_write "check_rain_online - failed read online data"
+			log_write "rain" "error" "check_rain_online - failed read online data"
 		else
 			if [ $local_epoch -gt 0 ]; then
 				current_state_rain_online='rain'
@@ -27,14 +27,14 @@ function check_rain_online {
 			fi
 			weather=$(cat "$STATUS_DIR/last_weather_online" | $JQ -M ".weather")
 			
-			log_write "check_rain_online - weather=$weather, local_epoch=$local_epoch"
+			log_write "rain" "info" "check_rain_online - weather=$weather, local_epoch=$local_epoch"
 			if [ "$current_state_rain_online" != "$last_state_rain_online" ]; then
 				echo "$current_state_rain_online" > "$STATUS_DIR/last_state_rain_online"
 				trigger_event "check_rain_online_change" "$current_state_rain_online" "$weather"
 			fi
 		fi
 	else
-		log_write "check_rain_online - failed read online data"
+		log_write "rain" "error" "check_rain_online - failed read online data"
 	fi

 	trigger_event "check_rain_online_after" "$current_state_rain_online" "$weather"
@@ -57,11 +57,11 @@ function check_rain_sensor {
 			current_state_rain_sensor='rain'
 			local local_epoch=`date +%s`
 			echo $local_epoch > "$STATUS_DIR/last_rain_sensor"
-			log_write "check_rain_sensor - now it's raining ($local_epoch)"
+			log_write "rain" "info" "check_rain_sensor - now it's raining ($local_epoch)"
 			#return $local_epoch	
 		else
 			current_state_rain_sensor='norain'
-			log_write "check_rain_sensor - now is not raining"
+			log_write "rain" "info" "check_rain_sensor - now is not raining"
 		fi
 		if [ "$current_state_rain_sensor" != "$last_state_rain_sensor" ]; then
 			echo "$current_state_rain_sensor" > "$STATUS_DIR/last_state_rain_sensor"
@@ -69,17 +69,38 @@ function check_rain_sensor {
 		fi
 		trigger_event "check_rain_sensor_after" "$current_state_rain_sensor"
 	else
-		log_write "Rain sensor not present"
+		log_write "rain" "warning" "Rain sensor not present"
 	fi

 }

 #
-# Chiude tutte le elettrovalvole se sta piovendo
+# Chiude tutte le elettrovalvole se sta piovendo oppure chiude quelle che hanno raggiunto l'mudità massima impostata
 # Eseguie il controllo in tempo reale sul sensore hardware e sui dati dell'ultima chiamata eseguita online
 #
 function close_all_for_rain {

+	#
+	# Chiude le elettrovalvole che hanno raggiunto l'umidità del terreno impostata in EVx_SENSOR_MOISTURE
+	#
+
+	for i in $(seq $EV_TOTAL)
+	do
+		local a=EV"$i"_ALIAS
+		local al=${!a}
+		ev_status $al
+		local state=$?
+		local moisture=$(ev_check_moisture_autoclose $i)
+		if [ "$state" = "1" ] && [ "$moisture" -gt 0 ]; then
+			ev_close $al
+			log_write "irrigate" "warning" "close_all_for_rain - Close solenoid '$al' because maximum soil moisture has been reached"
+		fi
+	done
+
+	#
+	# Chiude le elettrovalvole in caso di pioggia
+	#
+
 	local close_all=0
 	local now=`date +%s`

@@ -102,6 +123,12 @@ function close_all_for_rain {
 	fi

 	if [ "$close_all" = "1" ]; then
+
+		#
+		# PIOVE 
+		# Valuta se la sciare aperte le elettrovalvole in caso l'umidità del sensore non sia stata raggiunta
+		#
+
 		for i in $(seq $EV_TOTAL)
 		do
 			local a=EV"$i"_ALIAS
@@ -110,14 +137,51 @@ function close_all_for_rain {
 			local evnorain=${!a}
 			ev_status $al
 			local state=$?
+			local moisture=$(ev_check_moisture $i)
 			#echo "$al = $state"
-			if [ "$state" = "1" ] && [ "$evnorain" != "1" ]; then
+			if [ "$state" = "1" ] && [ "$evnorain" != "1" ] && [ "$moisture" -ne 0 ]; then
 				ev_close $al
-				log_write "close_all_for_rain - Close solenoid '$al' for rain"
+				log_write "irrigate" "warning" "close_all_for_rain - Close solenoid '$al' for rain"
 			fi
 		done
+
 	fi

+
+}
+
+#
+# Mostra il timestamp dell'ultima pioggia rilevato dal sensore
+#
+function last_rain_sensor_timestamp {
+	cat "$STATUS_DIR/last_rain_sensor" 2> /dev/null
+}
+
+#
+# Mostra il timestamp dell'ultima pioggia rilevato dal servizio online
+#
+function last_rain_online_timestamp {
+	cat "$STATUS_DIR/last_rain_online" 2> /dev/null
+}
+
+#
+# Resetta il timestamp dell'ultima pioggia rilevato dal sensore
+#
+function reset_last_rain_sensor_timestamp {
+	trigger_event "reset_last_rain_sensor_timestamp_before" ""
+	rm "$STATUS_DIR/last_rain_sensor" 2> /dev/null
+	trigger_event "reset_last_rain_sensor_timestamp_after" ""
+	log_write "rain" "info" "reset_last_rain_sensor_timestamp"
+}
+
+#
+# Resetta mostra il timestamp dell'ultima pioggia rilevato dal servizio online
+#
+function reset_last_rain_online_timestamp {
+	trigger_event "reset_last_rain_online_timestamp_before" ""
+	rm "$STATUS_DIR/last_rain_online" 2> /dev/null
+	trigger_event "reset_last_rain_online_timestamp_before" ""
+	log_write "rain" "info" "reset_last_rain_online_timestamp"
 }


--- a/include/sensor.include.sh
+++ b/include/sensor.include.sh
@@ -0,0 +1,249 @@
+#
+# Imposta lo stato di una elettrovalvola
+# $1 numero del sensore
+# $2 tipologia dello stato
+# $3 stato da scrivere
+#
+function sensor_set_state {
+	trigger_event "sensor_set_state_before" $1 $2 $3
+	echo "$3" > "$STATUS_DIR/sensor$1_$2"
+	trigger_event "sensor_set_state_after" $1 $2 $3
+}
+
+#
+# Legge lo stato di un sensore
+# $1 numero del sensore
+# $2 tipologia dello stato
+#
+function sensor_get_state {
+	if [ ! -f "$STATUS_DIR/sensor$1_$2" ]; then
+		sensor_set_state $1 $2 ""
+	fi
+
+	local state=$(cat "$STATUS_DIR/sensor$1_$2" 2> /dev/null)
+	echo $state
+}
+
+#
+# Recupera il numero di un sensore in base all'alias
+# $1 alias del sensore
+#
+function sensor_alias2number {
+	for i in $(seq $EV_TOTAL)
+	do
+		a=SENSOR"$i"_ALIAS
+		av=${!a}
+		if [ "$av" == "$1" ]; then
+			return $i
+		fi
+	done
+
+	log_write "general" "error" "ERROR sensor alias not found: $1"
+	message_write "warning" "Sensor alias not found"
+	mqtt_status
+	exit 1
+}
+
+#
+# Verifica se un alias di un sensore esiste
+# $1 alias dell'elettrovalvola
+#
+function sensor_alias_exists {
+	local vret='FALSE'
+	for i in $(seq $EV_TOTAL)
+	do
+		a=SENSOR"$i"_ALIAS
+		av=${!a}
+		if [ "$av" == "$1" ]; then
+			vret='TRUE'
+		fi
+	done
+
+	echo $vret
+}
+
+#
+# Mostra lo stato di tutte le elettrovalvole
+#
+function sensor_status_all {
+	for i in $(seq $SENSOR_TOTAL)
+	do
+		a=SENSOR"$i"_ALIAS
+		av=${!a}
+		for t in $SENSOR_STATE_TYPE
+		do
+			local state=$(sensor_get_state $i $t)
+			echo -e "$av: $t $state"
+		done
+	done
+}
+
+#
+# Mostra lo stato di un sensore
+# $1 alias sensore
+# $2 tipologia dello stato
+#
+function sensor_status {
+	sensor_alias2number $1
+	i=$?
+	if [ -z "$2" ]; then
+		for t in $SENSOR_STATE_TYPE
+		do
+			local state=$(sensor_get_state $i $t)
+			echo -e "$av: $t $state"
+		done
+	else
+		local state=$(sensor_get_state $i $2)
+		echo -e "$state"
+	fi
+
+}
+
+#
+# Imposta lo stato di un sensore per alias
+# $1 alias sensore
+# $2 tipologia dello stato
+# $3 stato da imopostare
+#
+function sensor_status_set {
+	sensor_alias2number $1
+	i=$?
+	sensor_set_state $i $2 $3
+	mqtt_status
+}
+
+#
+# Stampa la lista degli alias dei sensori
+#
+function list_alias_sensor {
+
+	for i in $(seq $SENSOR_TOTAL)
+	do
+		local a=SENSOR"$i"_ALIAS
+		local al=${!a}
+		echo $al
+	done
+
+}
+
+#
+# Stampa lo stato di tutti i sensori in formato json
+#
+function json_sensor_status_all {
+	local js=""
+	local js_item=""
+	local js_type=""
+
+	for i in $(seq $SENSOR_TOTAL)
+	do
+		a=SENSOR"$i"_ALIAS
+		av=${!a}
+
+		js_type=""
+		for t in $SENSOR_STATE_TYPE
+		do
+			local state=$(sensor_get_state $i $t)
+			js_type="$js_type \"$t\": \"$state\", "
+		done
+		js_type="${js_type::-2}"
+		js_item="$js_item \"$av\":{$js_type}, ";
+	done
+
+	if [[ ! -z $js_item ]]; then
+		js_item="${js_item::-2}"
+	fi
+
+	js="\"sensor\": {$js_item}"
+	echo $js
+}
+
+#
+# Controlla se la zona comandata da un elettrovalvola ha raggiunto l'umidità necessaria per non fare partire l'irrigazione,
+# faerla chiudere in caso di pioggia.
+# Se è stata superata l'umidità indicata in EVx_SENSOR_MOISTURE ritorna l'umidità attuale del sensore relativo all'elettrovalvola
+# in caso contrario ritorna 0, se no è impostato il parametro EV_xSENSOR_ALIAS o EVxSENSOR?MOISTURE ritorna il valore -1
+#
+# $1 numero elettrovalvola da controllare
+#
+function ev_check_moisture {
+
+	local s=EV"$1"_SENSOR_ALIAS
+	local sa=${!s}
+
+	if [[ -z $sa ]]; then
+		echo -1
+		return
+	fi
+
+	local moisture=$(sensor_status $sa moisture)
+
+	local s=EV"$1"_SENSOR_MOISTURE
+	local max_moisture=${!s}
+
+	if [ -z $max_moisture ]; then
+		echo -1
+		return
+	fi
+
+	if [ $moisture -gt $max_moisture ]; then
+		log_write "sensor" "info" "ev_check_moisture_autoclose: humidity of the \"$sa\" sensor reached: $moisture%"
+		echo $moisture
+		return $moisture
+	fi
+
+	echo 0
+	return 0
+}
+
+#
+# Controlla se la zona comandata da un elettrovalvola ha raggiunto l'umidità necessaria per essere chiusa in automatico
+# Se è stata superata l'umidità indicata in EVx_SENSOR_MOISTURE ritorna l'umidità attuale del sensore relativo all'elettrovalvola
+# in caso contrario ritorna 0, se no è impostato il parametro EV_xSENSOR_ALIAS, EVxSENSOR_MOISTURE o 
+# EVxSENSOR_MOISTURE_AUTOCLOSE ritorna il valore -1
+#
+# $1 numero elettrovalvola da controllare
+#
+function ev_check_moisture_autoclose {
+
+	local s=EV"$1"_SENSOR_ALIAS
+	local sa=${!s}
+
+	if [[ -z $sa ]]; then
+		echo -1
+		return
+	fi
+
+	local moisture=$(sensor_status $sa moisture)
+
+	local s=EV"$1"_SENSOR_MOISTURE
+	local max_moisture=${!s}
+
+	if [ -z $max_moisture ]; then
+		echo -1
+		return
+	fi
+
+	local s=EV"$1"_SENSOR_MOISTURE_AUTOCLOSE
+	local autoclose=${!s}
+
+	if [ -z $autoclose ]; then
+		echo -1
+		return
+	fi
+
+	if [ $autoclose -ne 1 ]; then
+		echo -1
+		return
+	fi
+
+	if [ $moisture -gt $max_moisture ]; then
+		log_write "sensor" "info" "ev_check_moisture_autoclose: humidity of the \"$sa\" sensor reached: $moisture%"
+		echo $moisture
+		return $moisture
+	fi
+
+	echo 0
+	return 0
+}
+
+
--- a/include/socket.include.sh
+++ b/include/socket.include.sh
@@ -19,7 +19,7 @@ function stop_socket_server {
                exit 1
        fi

-	log_write "stop socket server"
+	log_write "socket_server" "info" "stop socket server"

        kill -9 $(list_descendants `cat "$TCPSERVER_PID_FILE"`) 2> /dev/null
        kill -9 `cat "$TCPSERVER_PID_FILE"` 2> /dev/null
@@ -44,7 +44,7 @@ function socket_server_command {
 		user=$(echo "$user" | $TR -d '[\r\n]')
 		password=$(echo "$password" | $TR -d '[\r\n]')
 		if [ "$user" != "$TCPSERVER_USER" ] || [ "$password" != "$TCPSERVER_PWD" ]; then
-			log_write "socket connection from: $TCPREMOTEIP - Bad socket server credentials - user:$user"
+			log_write "socket_server" "warning" "socket connection from: $TCPREMOTEIP - Bad socket server credentials - user:$user"
 			json_error 0 "Bad socket server credentials"
 			return
 		fi
@@ -61,7 +61,7 @@ function socket_server_command {
 	arg7=$(echo "$line " | $CUT -d ' ' -f7)
 	arg8=$(echo "$line " | $CUT -d ' ' -f8)

-	log_write "socket connection from: $TCPREMOTEIP - command: $arg1 $arg2 $arg3 $arg4 $arg5 $arg6 $arg7 $arg8"
+	log_write "socket_server" "info" "socket connection from: $TCPREMOTEIP - command: $arg1 $arg2 $arg3 $arg4 $arg5 $arg6 $arg7 $arg8"
 	
 	#reset_messages &> /dev/null

@@ -102,6 +102,12 @@ function socket_server_command {
 			json_status
 			;;

+		cron_enable_all_open_close)
+			cron_enable_all_open_close &> /dev/null
+			message_write "success" "All solenoid enabled"
+			json_status
+			;;
+
 		set_general_cron)
 			local vret=""
 			for i in $arg2 $arg3 $arg4 $arg5 $arg6 $arg7
@@ -121,7 +127,7 @@ function socket_server_command {

 			if [[ ! -z $vret ]]; then
 				json_error 0 "Cron set failed"
-				log_write "Cron set failed: $vret"
+				log_write "socket_server" "error" "Cron set failed: $vret"
 			else
 				message_write "success" "Cron set successfull"
 				json_status
@@ -136,7 +142,7 @@ function socket_server_command {

 			if [[ ! -z $vret ]]; then
 				json_error 0 "Cron set failed"
-				log_write "Cron del failed: $vret"
+				log_write "socket_server" "error" "Cron del failed: $vret"
 			else
 				message_write "success" "Cron set successfull"
 				json_status
@@ -151,7 +157,7 @@ function socket_server_command {

 			if [[ ! -z $vret ]]; then
 				json_error 0 "Cron del failed"
-				log_write "Cron del failed: $vret"
+				log_write "socket_server" "error" "Cron del failed: $vret"
 			else
 				message_write "success" "Scheduled start successfully deleted"
 				json_status "get_cron_open_in:$arg2"
@@ -167,7 +173,7 @@ function socket_server_command {

 			if [[ ! -z $vret ]]; then
 				json_error 0 "Cron set failed"
-				log_write "Cron set failed: $vret"
+				log_write "socket_server" "error" "Cron set failed: $vret"
 			else
 				message_write "success" "Cron set successfull"
 				json_status
@@ -182,7 +188,7 @@ function socket_server_command {

 			if [[ ! -z $vret ]]; then
 				json_error 0 "Cron set failed"
-				log_write "Cron set failed: $vret"
+				log_write "socket_server" "error" "Cron set failed: $vret"
 			else
 				message_write "success" "Cron set successfull"
 				json_status
@@ -197,7 +203,7 @@ function socket_server_command {

 			if [[ ! -z $vret ]]; then
 				json_error 0 "Cron set failed"
-				log_write "Cron set failed: $vret"
+				log_write "socket_server" "error" "Cron set failed: $vret"
 			else
 				message_write "success" "Cron set successfull"
 				json_status
@@ -212,7 +218,7 @@ function socket_server_command {

 			if [[ ! -z $vret ]]; then
 				json_error 0 "piGardenSched command failed"
-				log_write "piGardenSched command failed: $vret"
+				log_write "socket_server" "error" "piGardenSched command failed: $vret"
 			else
 				message_write "success" "Schedule set successfull"
 				json_status
@@ -234,6 +240,27 @@ function socket_server_command {
 			nohup $PATH_SCRIPT poweroff > /dev/null 2>&1 &
 			;;

+		reset_last_rain_sensor_timestamp)
+			reset_last_rain_sensor_timestamp
+			message_write "success" "Timestamp of last sensor rain successfull reset"
+			json_status
+			;;
+
+		reset_last_rain_online_timestamp)
+			reset_last_rain_online_timestamp
+			message_write "success" "Timestamp of last online rain successfull reset"
+			json_status
+			;;
+
+		sensor_status_set)
+	                if [ "empty$arg2" == "empty" ]; then
+        	                json_error 0 "Alias sensor not specified"
+			else
+                		sensor_status_set $arg2 $arg3 $arg4 &> /dev/null
+				json_status 
+			fi
+			;;
+
 		*)
 			json_error 0 "invalid command"
 			;;
--- a/piGarden.sh
+++ b/piGarden.sh
@@ -10,7 +10,7 @@
 #
 function initialize {

-	log_write "Run initialize"
+	log_write "general" "info" "Run initialize"

 	unlock

@@ -50,13 +50,13 @@ function initialize {
 	# Inizializza il sensore di rilevamento pioggia
 	if [ -n "$RAIN_GPIO" ]; then 
 		drv_rain_sensor_init "$RAIN_GPIO"
-		log_write "Rain sensor initialized"
+		log_write "rain" "info" "Rain sensor initialized"
 	else
-		log_write "Rain sensor not present"
+		log_write "rain" "info" "Rain sensor not present"
 	fi

 	trigger_event "init_after" ""
-	log_write "End initialize"
+	log_write "general" "info" "End initialize"

 }

@@ -88,35 +88,48 @@ function ev_open {
 	local EV_IS_MONOSTABLE_VAR=EV"$EVNUM"_MONOSTABLE
 	local EV_IS_MONOSTABLE=${!EV_IS_MONOSTABLE_VAR}

-	if [ ! "$2" = "force" ] && [ "$EVNORAIN" != "1" ]; then
-		if [[ "$NOT_IRRIGATE_IF_RAIN_ONLINE" -gt 0 && -f $STATUS_DIR/last_rain_online ]]; then
-			local last_rain=`cat $STATUS_DIR/last_rain_online`
-			local now=`date +%s`
-			local dif=0
-			let "dif = now - last_rain"
-			if [ $dif -lt $NOT_IRRIGATE_IF_RAIN_ONLINE ]; then
-				message_write "warning" "Solenoid not open for rain"
-				trigger_event "ev_not_open_for_rain_online" "$1" 
-				trigger_event "ev_not_open_for_rain" "$1" 
-				log_write "Solenoid '$1' not open for rain (online check)"
-				return
+	if [ ! "$2" = "force" ]; then
+
+		local moisture=$(ev_check_moisture $EVNUM)
+		if [ $moisture -gt 0 ]; then
+			message_write "warning" "solenoid not open because maximum soil moisture has been reached"
+			trigger_event "ev_not_open_for_moisture" "$1" 
+			log_write "irrigate" "warning" "Solenoid '$1' not open because maximum soil moisture has been reached"
+			return
+		fi
+
+		if [ "$EVNORAIN" != "1" ]; then
+
+			if [[ "$NOT_IRRIGATE_IF_RAIN_ONLINE" -gt 0 && -f $STATUS_DIR/last_rain_online ]]; then
+				local last_rain=`cat $STATUS_DIR/last_rain_online`
+				local now=`date +%s`
+				local dif=0
+				let "dif = now - last_rain"
+				if [ $dif -lt $NOT_IRRIGATE_IF_RAIN_ONLINE ] && [ $moisture -ne 0 ]; then
+					message_write "warning" "Solenoid not open for rain"
+					trigger_event "ev_not_open_for_rain_online" "$1" 
+					trigger_event "ev_not_open_for_rain" "$1" 
+					log_write "irrigate" "warning" "Solenoid '$1' not open for rain (online check)"
+					return
+				fi
+			fi
+
+			check_rain_sensor
+			if [[ "$NOT_IRRIGATE_IF_RAIN_SENSOR" -gt 0 && -f $STATUS_DIR/last_rain_sensor && $moisture -ne 0 ]]; then
+				local last_rain=`cat $STATUS_DIR/last_rain_sensor`
+				local now=`date +%s`
+				local dif=0
+				let "dif = now - last_rain"
+				if [ $dif -lt $NOT_IRRIGATE_IF_RAIN_SENSOR ]; then
+					message_write "warning" "Solenoid not open for rain"
+					trigger_event "ev_not_open_for_rain_sensor" "$1" 
+					trigger_event "ev_not_open_for_rain" "$1" 
+					log_write "irrigate" "warning" "Solenoid '$1' not open for rain (sensor check)"
+					return
+				fi
 			fi
 		fi

-		check_rain_sensor
-		if [[ "$NOT_IRRIGATE_IF_RAIN_SENSOR" -gt 0 && -f $STATUS_DIR/last_rain_sensor ]]; then
-			local last_rain=`cat $STATUS_DIR/last_rain_sensor`
-			local now=`date +%s`
-			local dif=0
-			let "dif = now - last_rain"
-			if [ $dif -lt $NOT_IRRIGATE_IF_RAIN_SENSOR ]; then
-				message_write "warning" "Solenoid not open for rain"
-				trigger_event "ev_not_open_for_rain_sensor" "$1" 
-				trigger_event "ev_not_open_for_rain" "$1" 
-				log_write "Solenoid '$1' not open for rain (sensor check)"
-				return
-			fi
-		fi
 	fi

 	local state=1
@@ -126,7 +139,7 @@ function ev_open {

 	trigger_event "ev_open_before" "$1" "$2"
 	if [ $? -ne 0 ]; then
-		log_write "Solenoid '$1' not open due to external event"
+		log_write "irrigate" "warning" "Solenoid '$1' not open due to external event"
 		message_write 'warning' "Solenoid not open due to external event"
 		mqtt_status
 		return
@@ -150,7 +163,7 @@ function ev_open {

 	ev_set_state $EVNUM $state

-	log_write "Solenoid '$1' open"
+	log_write "irrigate" "info" "Solenoid '$1' open"
 	message_write "success" "Solenoid open"

 	trigger_event "ev_open_after" "$1" "$2"
@@ -259,7 +272,7 @@ function ev_close {

 	ev_set_state $EVNUM 0

-	log_write "Solenoid '$1' close"
+	log_write "irrigate" "info" "Solenoid '$1' close"
 	message_write "success" "Solenoid close"

 	trigger_event "ev_close_after" "$1"
@@ -285,7 +298,9 @@ function supply_negative {

 #
 # Scrive un messaggio nel file di log
-# $1 log da scrivere
+# $1 type
+# $2 level
+# $3 log da scrivere
 #
 function log_write {
 	if [ -e "$LOG_FILE" ]; then
@@ -304,7 +319,25 @@ function log_write {
 		fi
 	fi

-	echo -e "`date`\t\t$1" >> $LOG_FILE
+	echo -e "`date`\t\t$1\t$2\t$3" >> $LOG_FILE
+
+	log_send "$1" "$2" "`date '+%Y-%m-%d %H:%M:%S'`" "$3"
+
+}
+
+#
+# Invia un log verso piGardenWeb
+# $1 type
+# $2 level
+# $3 date time
+# $4 messaggio
+#
+function log_send {
+
+	if [[ ! -z "$LOG_URL" ]]; then
+		$CURL $LOG_CURL_PARAM "$LOG_URL" -d "api_token=$LOG_API_TOKEN&type=$1&level=$2&datetime_log=$3&message=$4" &> /dev/null &
+	fi
+
 }

 #
@@ -373,7 +406,7 @@ function gpio_alias2number {
 		fi
 	done

-	log_write "ERROR solenoid alias not found: $1"
+	log_write "general" "error" "ERROR solenoid alias not found: $1"
 	message_write "warning" "Solenoid alias not found"
 	mqtt_status
 	exit 1
@@ -393,7 +426,7 @@ function ev_alias2number {
 		fi
 	done

-	log_write "ERROR solenoid alias not found: $1"
+	log_write "general" "error" "ERROR solenoid alias not found: $1"
 	message_write "warning" "Solenoid alias not found"
 	mqtt_status
 	exit 1
@@ -480,7 +513,7 @@ function close_all {
 			#echo "$al = $state"
 			if [[ "$state" -gt "0" || "$1" = "force" ]]; then
 				ev_close $al
-				log_write "close_all - Close solenoid '$al' for rain"
+				log_write "irrigate" "info" "close_all - Close solenoid '$al' for rain"
 			fi
 		done

@@ -664,8 +697,9 @@ function json_status {
 	fi
 	local json_cron_open_in="\"cron_open_in\":{$json_get_cron_open_in}"
 	local json_timestamp="\"timestamp\": $(date +%s)"
+	local json_sensor="$(json_sensor_status_all)"

-	json="{$json_version,$json_timestamp,$json_event,$json,$json_last_weather_online,$json_error,$json_last_info,$json_last_warning,$json_last_success,$json_last_rain_online,$json_last_rain_sensor,$json_cron,$json_cron_open_in $json_schedule}"
+	json="{$json_version,$json_timestamp,$json_event,$json,$json_sensor,$json_last_weather_online,$json_error,$json_last_info,$json_last_warning,$json_last_success,$json_last_rain_online,$json_last_rain_sensor,$json_cron,$json_cron_open_in $json_schedule}"

 	echo "$json"

@@ -707,10 +741,25 @@ function show_usage {
 	echo -e "\t$NAME_SCRIPT list_alias                                   view list of aliases solenoid"
 	echo -e "\t$NAME_SCRIPT ev_status alias                              show status solenoid"
 	echo -e "\t$NAME_SCRIPT ev_status_all                                show status solenoids"
+
+	echo -e "\n"
+	echo -e "\t$NAME_SCRIPT list_alias_sensor                            view list of aliases sensor"
+	echo -e "\t$NAME_SCRIPT sensor_status alias [type]                   show status sensor (type: $SENSOR_STATE_TYPE)"
+	echo -e "\t$NAME_SCRIPT sensor_status_set alias type value           set status of sensor (type: $SENSOR_STATE_TYPE)"
+	echo -e "\t$NAME_SCRIPT sensor_status_all                            show status of all sensors"
+
+	echo -e "\n"
+	echo -e "\t$NAME_SCRIPT last_rain_sensor_timestamp                   show timestamp of last rain sensor"
+	echo -e "\t$NAME_SCRIPT last_rain_online_timestamp                   show timestamp of last rain online"
+	echo -e "\t$NAME_SCRIPT reset_last_rain_sensor_timestamp             show timestamp of last rain sensor"
+	echo -e "\t$NAME_SCRIPT reset_last_rain_online_timestamp             show timestamp of last rain online"
+	echo -e "\n"
 	echo -e "\t$NAME_SCRIPT json_status [get_cron|get_cron_open_in|get_schedule] show status in json format"
 	echo -e "\t$NAME_SCRIPT mqtt_status                                  send status in json format to mqtt broker"
-	echo -e "\t$NAME_SCRIPT check_rain_online                            check rain from http://api.wunderground.com/"
+	echo -e "\n"
+	echo -e "\t$NAME_SCRIPT check_rain_online                            check rain from online api service"
 	echo -e "\t$NAME_SCRIPT check_rain_sensor                            check rain from hardware sensor"
+	echo -e "\n"
 	echo -e "\t$NAME_SCRIPT close_all_for_rain                           close all solenoid if it's raining"
 	echo -e "\t$NAME_SCRIPT close_all [force]                            close all solenoid"
 	echo -e "\n"
@@ -779,12 +828,12 @@ function lock {
 		local foo=bar
 	else
 		if [ "$current_time" -gt "$max_time" ]; then
-			log_write "Maximum locked time reached"
+			log_write "general" "error" "Maximum locked time reached"
 			sleep $max_time
 			unlock
 			exit 1
 		fi
-		log_write "Sleep 1 second for locked state"
+		log_write "general" "info" "Sleep 1 second for locked state"
 		sleep 1
 		lock $current_time
 		return
@@ -833,7 +882,7 @@ function send_identifier {
 	fi
 	echo "$ID" > "$FILE_ID"

-	log_write "Send installation identifier to collect usage"
+	log_write "general" "info" "Send installation identifier to collect usage"

 	$CURL https://www.lejubila.net/statistic/collect_usage/piGarden/$ID/$VERSION/$SUB_VERSION/$RELEASE_VERSION > /dev/null 2>&1

@@ -875,7 +924,7 @@ function cmd_pigardensched {

 	if [ $PIGARDENSCHED == 0 ]; then
 		echo "piGardenSched not configured in piGarden" >&2
-		log_write "piGardenSched not configured in piGarden"
+		log_write "piGardenSched" "error" "piGardenSched not configured in piGarden"
 		return
 	fi

@@ -983,8 +1032,8 @@ function debug2 {
 }

 VERSION=0
-SUB_VERSION=5
-RELEASE_VERSION=14
+SUB_VERSION=6
+RELEASE_VERSION=4

 DIR_SCRIPT=`dirname $0`
 NAME_SCRIPT=${0##*/}
@@ -1010,6 +1059,7 @@ fi
 . "$DIR_SCRIPT/include/cron.include.sh"
 . "$DIR_SCRIPT/include/socket.include.sh"
 . "$DIR_SCRIPT/include/rain.include.sh"
+. "$DIR_SCRIPT/include/sensor.include.sh"
 . "$DIR_SCRIPT/include/events.include.sh"

 MESSAGE_INFO=""
@@ -1019,8 +1069,14 @@ MESSAGE_SUCCESS=""
 CURRENT_EVENT=""
 CURRENT_EVENT_ALIAS=""

+SENSOR_STATE_TYPE="moisture temperature fertility illuminance"
+
 PARENT_PID=0

+if [ -z $SENSOR_TOTAL ]; then
+	SENSOR_TOTAL=0
+fi
+
 if [ -z $LOG_OUTPUT_DRV_FILE ]; then
 	LOG_OUTPUT_DRV_FILE="/dev/null"
 fi
@@ -1091,6 +1147,26 @@ case "$1" in
 		ev_status_all
 		;;

+	list_alias_sensor)
+		list_alias_sensor
+		;;
+
+	sensor_status)
+		sensor_status $2 $3
+		;;
+	
+	sensor_status_all)
+		sensor_status_all
+		;;
+
+	sensor_status_set)
+		sensor_status_set $2 $3 $4
+		;;
+
+	json_sensor_status_all)
+		json_sensor_status_all
+		;;
+
 	json_status)
 		json_status $2 $3 $4 $5 $6
 		;;
@@ -1099,6 +1175,22 @@ case "$1" in
 		mqtt_status $2
 		;;

+	last_rain_sensor_timestamp)
+		last_rain_sensor_timestamp
+		;;
+
+	last_rain_online_timestamp)
+		last_rain_online_timestamp
+		;;
+
+	reset_last_rain_sensor_timestamp)
+		reset_last_rain_sensor_timestamp
+		;;
+
+	reset_last_rain_online_timestamp)
+		reset_last_rain_online_timestamp
+		;;
+
 	check_rain_online)
 		check_rain_online
 		;;
@@ -1130,7 +1222,7 @@ case "$1" in
                nohup $0 start_socket_server_daemon > /dev/null 2>&1 &

                echo "Daemon is started widh pid $!"
-		log_write "start socket server with pid $!"
+		log_write "socket_server" "info" "start socket server with pid $!"
                ;;

 	start_socket_server_daemon)
Author	SHA1	Message	Date
lejubila	3d0d36077d	Update CHANGELOG	2021-10-03 10:04:30 +02:00
lejubila	a30e1cb6ef	fix return value when get value of sensor	2021-08-28 12:17:22 +02:00
lejubila	81ce03e90a	Add autoclose of the solenoid when the soil moisture has reached the set level	2021-08-28 11:38:05 +02:00
lejubila	2001b09937	Add support for sensor: moisture, temperature, fertility, illuminance. Add event ev_not_open_for_moisture, sensor_set_state_before, sensor_set_state_after. Added zone humidity management: when a zone has reached the humidity defined in EVx_SENSOR_MOISTURE it does not start irrigation or interrupts it if it is already active. In case of rain it does not stop irrigation if the soil humidity has not reached the configured value.	2021-08-27 22:52:01 +02:00
lejubila	c91128cbb4	Add command line: sensor_status, sensor_status_all, sensor_status_set. Add api command: sensor_status_set.	2021-08-22 15:19:34 +02:00
lejubila	7242b1c2ab	Add command last_rain_sensor_timestamp, last_rain_online_timestamp, reset_last_rain_sensor_timestamp, reset_last_rain_online_timestamp. Add socket server api for reset_last_rain_sensor_timestamp, reset_last_rain_online_timestamp	2021-08-10 23:39:38 +02:00
lejubila	5152252653	Aggiornato driver rainsensorqty alla versione 0.2.5c	2021-04-24 09:55:57 +02:00
lejubila	50fc8a72b2	Change number of version	2020-09-06 08:28:04 +02:00
lejubila	9183bbcef5	Add support for send log to piGardenWeb	2020-09-06 08:24:26 +02:00
lejubila	bdab0fb6fe	Fix changelog	2020-05-16 18:14:21 +02:00
lejubila	6ed0510c7f	Published version 0.6.0: - Add support for enable all cron fron api - Update rainsensorqty driver to version 0.2.5b	2020-05-16 18:11:51 +02:00
lejubila	15e36e95a3	Update rainsensorqty to version 0.2.5	2020-04-08 22:17:14 +02:00
lejubila	3a5c3ef934	Add support for enable all cron fron api	2020-04-07 23:20:41 +02:00
lejubila	f3c11a7fee	Corretto repositori git da cui scaricare wiringPi	2020-04-01 12:45:58 +02:00
lejubila	ac95194b3e	Rimosso file con riferimento alla vecchia versione di rainsensorqty	2019-09-24 18:47:39 +02:00
				`@@ -0,0 +1 @@`
				`echo 1 > /tmp/tick ; sleep 0.9 ; echo 0 > /tmp/tick`