Fix changelog

- Update rainsensorqty driver to version 0.2.5b

CHANGELOG.md

@@ -1,3 +1,21 @@
+# 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
+
+# 0.5.13 - 12/08/2019
+- Added driver rainsensorqty for menage rainfall detection based on quantity
+
+# 0.5.12.1 - 23/06/2019
+- Added zip log drver file when exceeding the size limit
+
+# 0.5.12 - 13/11/2018
+- Fixed a bug that prevented the publication of the mqtt topic for each event
+- Fixed a bug on openweathermap driver which in some cases causes a malformation of the json status and prevented communication with piGardenWeb 
+
 # 0.5.11 - 11/11/2018
 - Added ability to disable online weather service by defining WEATHER_SERVICE="none" in the configuration file
 

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
 ```

conf/piGarden.conf.example

@@ -57,6 +57,9 @@ STAT="/usr/bin/stat"
 # # Installare con apt install mosquitto-clients
 MOSQUITTO_PUB="/usr/bin/mosquitto_pub"
 
+# Percorso di piGardenSched, se non definito non verranno gestire le schedulazioni di piGardenSched tramite api
+#PIGARDENSCHED_PATH="/home/pi/piGardenSched/piGardenSched.sh"
+
 
 # Se impostato con il valore 1, indica che il sistema gestisce elettrovalvole monostabili, 
 # se impostato a 0 il sistema gestirà elettrovalvole bistabili

conf/piGarden.conf.rainsensorqty.example

@@ -57,6 +57,9 @@ STAT="/usr/bin/stat"
 # # Installare con apt install mosquitto-clients
 MOSQUITTO_PUB="/usr/bin/mosquitto_pub"
 
+# Percorso di piGardenSched, se non definito non verranno gestire le schedulazioni di piGardenSched tramite api
+#PIGARDENSCHED_PATH="/home/pi/piGardenSched/piGardenSched.sh"
+
 
 # Se impostato con il valore 1, indica che il sistema gestisce elettrovalvole monostabili, 
 # se impostato a 0 il sistema gestirà elettrovalvole bistabili
@@ -79,15 +82,18 @@ RELE_GPIO_CLOSE=0
 RELE_GPIO_OPEN=1
 
 # Id del gpio usato per collegare il sensore di rilevamento pioggia
+# attraverso il driver rainsensorqty
 RAIN_GPIO="drv:rainsensorqty:25"        # Physical 22 - wPi 6
 
 # Valore in ingresso sul gpio definito in RAIN_GPIO che indica lo stato di pioggia
+# variabile usata anche da drv:rainsensorqty, se e' a 1, significa che il reed contact e' collegato ad un circuito pull-down, vuol dire che attende l'impulso a 1 per contare le vaschette, normalmente e' a 0.
+# se e' a 0, significa che il reed contact e' collegato ad un circuito pull-up, vuol dire che attende l'impulso a 0 per contare le vaschette, normalmente e' a 0.
 RAIN_GPIO_STATE=0
 
+RAINSENSORQTY_LOOPSFORSETRAINING=16 # dopo 16 impulsi, 16 vaschette riempite si considera pioggia
+RAINSENSORQTY_SECSBETWEENRAINEVENT=10800 # =3h, significa che dopo 3 ore si resetta il numero di vaschette riempire e solo dopo un nuovo ciclo di riempimento si considera una nuova pioggia
 
-RAINSENSORQTY_LOOPSFORSETRAINING=10 # dopo 10 impulsi, 10 vaschette riempite si considera pioggia
-RAINSENSORQTY_SECSBETWEENRAINEVENT=10800 # =3h, significa che dopo 3 si resetta il numero di vaschette da riempire e solo dopo il riempimento del numero di vaschette si considera una nuova pioggia
-
+RAINSENSORQTY_MMEACH=0.33 # see RAINSENSORQTY driver readme for details
 
 
 

conf/piGarden.conf.remote.example

@@ -57,6 +57,9 @@ STAT="/usr/bin/stat"
 # Installare con apt install mosquitto-clients
 MOSQUITTO_PUB="/usr/bin/mosquitto_pub"
 
+# Percorso di piGardenSched, se non definito non verranno gestire le schedulazioni di piGardenSched tramite api
+#PIGARDENSCHED_PATH="/home/pi/piGardenSched/piGardenSched.sh"
+
 
 # Se impostato con il valore 1, indica che il sistema gestisce elettrovalvole monostabili, 
 # se impostato a 0 il sistema gestirà elettrovalvole bisstabili

conf/piGarden.conf.sonoff_tasmota_http.example

@@ -57,6 +57,9 @@ STAT="/usr/bin/stat"
 # # Installare con apt install mosquitto-clients
 MOSQUITTO_PUB="/usr/bin/mosquitto_pub"
 
+# Percorso di piGardenSched, se non definito non verranno gestire le schedulazioni di piGardenSched tramite api
+#PIGARDENSCHED_PATH="/home/pi/piGardenSched/piGardenSched.sh"
+
 
 # Se impostato con il valore 1, indica che il sistema gestisce elettrovalvole monostabili, 
 # se impostato a 0 il sistema gestirà elettrovalvole bisstabili

conf/piGarden.conf.spb16ch.example

@@ -57,6 +57,9 @@ STAT="/usr/bin/stat"
 # Installare con apt install mosquitto-clients
 MOSQUITTO_PUB="/usr/bin/mosquitto_pub"
 
+# Percorso di piGardenSched, se non definito non verranno gestire le schedulazioni di piGardenSched tramite api
+#PIGARDENSCHED_PATH="/home/pi/piGardenSched/piGardenSched.sh"
+
 
 # Se impostato con il valore 1, indica che il sistema gestisce elettrovalvole monostabili, 
 # se impostato a 0 il sistema gestirà elettrovalvole bisstabili

drv/openweathermap/rainonline.include.sh

@@ -34,11 +34,11 @@ function drv_openweathermap_rain_online_get {
   "local_epoch": "$(cat $TMP_PATH/check_rain_online.openweathermap.json | $JQ -r -M ".dt")",
   "local_tz_long": "$OPENWEATHERMAP_TZ",
   "weather": "$weather",
-  "temp_c": $(cat $TMP_PATH/check_rain_online.openweathermap.json | $JQ -r -M ".main.temp"),
+  "temp_c": "$(cat $TMP_PATH/check_rain_online.openweathermap.json | $JQ -r -M ".main.temp")",
   "relative_humidity": "$(cat $TMP_PATH/check_rain_online.openweathermap.json | $JQ -r -M ".main.humidity")%",
   "wind_dir": "$(deg2dir $wind_deg)",
-  "wind_degrees": $wind_deg,
-  "wind_kph": $wind_speed,
+  "wind_degrees": "$wind_deg",
+  "wind_kph": "$wind_speed",
   "wind_gust_kph": "--",
   "pressure_mb": "$(cat $TMP_PATH/check_rain_online.openweathermap.json | $JQ -r -M ".main.pressure")",
   "dewpoint_c": "--",

drv/rainsensorqty/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+.set_var
+# Except this file
+!.gitignore

drv/rainsensorqty/README.md

@@ -2,8 +2,8 @@
 # Driver rainsensorqty - driver for measure the rain volume
 # Author: androtto
 # file README.md
-# Version: 0.2.0
-# Data: 11/Aug/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
-
-

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

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
+ 

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

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

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'
@@ -57,13 +62,28 @@ en_echo() # enhanched echo - check verbose variable
 
 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 +91,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 +110,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 ]] && { skilast=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
+}

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
+}
+

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"
 

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.5b
+# Data: 12/May/2020
 
 resetcounter()
 {
@@ -58,13 +58,13 @@ rain_history
 
 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" 
 	$GPIO -g wfi $gpio_port $RAINSENSORQTY_PULSE
 	now=`date +%s`
 	(( elapsed = now - before ))
@@ -75,10 +75,9 @@ do
 		rain_history &
 	fi
   	(( counter+=1 ))
-	en_echo "$RAINSENSORQTY_PULSE PULSE #$counter RECEIVED" 
-	echo "$now:$counter" > ${RAINSENSORQTY_STATE} &
-	echo "$now:$counter" >> ${RAINSENSORQTY_STATE_HIST} &
+	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" &

include/cron.include.sh

@@ -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
 }

include/events.include.sh

@@ -94,10 +94,12 @@ function trigger_event {
 				local ec=$?
 				#echo "$EVENT ec=$ec" >> /tmp/piGarden.testevent
 
-				CURRENT_EVENT="$EVENT"
-				mqtt_status &
+				#CURRENT_EVENT="$EVENT"
+				#mqtt_status &
 
 				if [ $ec -ne 0 ]; then
+					CURRENT_EVENT="$EVENT"
+					mqtt_status &
 					log_write "Stop events chain for exit code $ec in $current_event_dir/$f"
 					return $ec
 				fi
@@ -106,6 +108,9 @@ function trigger_event {
 
 	fi
 
+	CURRENT_EVENT="$EVENT"
+	mqtt_status &
+
 }
 
 

include/socket.include.sh

@@ -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
@@ -205,6 +211,21 @@ function socket_server_command {
 
 			;;
 
+		cmd_pigardensched)
+			local vret=""
+
+			vret=`cmd_pigardensched $arg2 $arg3 $arg4 $arg5 $arg6`
+
+			if [[ ! -z $vret ]]; then
+				json_error 0 "piGardenSched command failed"
+				log_write "piGardenSched command failed: $vret"
+			else
+				message_write "success" "Schedule set successfull"
+				json_status
+			fi
+
+			;;
+
 		reboot)
 			message_write "warning" "System reboot is started"
 			json_status

piGarden.sh

@@ -223,9 +223,6 @@ function ev_open_in {
 
 	trigger_event "ev_open_in_after" "$3" "$4" "$cron_start" "$cron_stop"
 
-	#echo $cron_start
-	#echo $cron_stop
-
 }
 
 
@@ -299,6 +296,14 @@ function log_write {
 		fi
 	fi
 
+	if [ -e "$LOG_OUTPUT_DRV_FILE" ]; then
+		local actualsize=$($WC -c <"$LOG_OUTPUT_DRV_FILE")
+		if [ $actualsize -ge $LOG_FILE_MAX_SIZE ]; then
+			$GZIP $LOG_OUTPUT_DRV_FILE
+			$MV $LOG_OUTPUT_DRV_FILE.gz $LOG_OUTPUT_DRV_FILE.`date +%Y%m%d%H%M`.gz	
+		fi
+	fi
+
 	echo -e "`date`\t\t$1" >> $LOG_FILE
 }
 
@@ -498,8 +503,9 @@ function list_alias {
 #
 # Stampa un json contanente lo status della centralina
 # $1 .. $6 parametri opzionali
-# 	- get_cron: aggiunge i dati relativi ai crontab delle scehdulazioni di apertura/chisura delle elettrovalvole
+# 	- get_cron: aggiunge i dati relativi ai crontab delle scehdulazioni di apertura/chisura
 #	- get_cron_open_in: aggiunge i dati relativi ai crontab degli avvii ritardati eseguiti con il comando open_in
+#       - get_schedule: aggiunge i dati relativi alle schedulazioni di piGardenSched
 #
 function json_status {
 	local json=""
@@ -513,6 +519,7 @@ function json_status {
 	local last_success=""
 	local with_get_cron="0"
 	local with_get_cron_open_in="0"
+	local with_get_schedule="0"
 	local current_pid=$!
 	local json_event="\"event\": {\"event\": \"$CURRENT_EVENT\", \"alias\": \"$CURRENT_EVENT_ALIAS\"}"
 
@@ -531,9 +538,12 @@ function json_status {
 			with_get_cron_open_in="1"
 		elif [[ "$i" == get_cron_open_in:* ]]; then
 			with_get_cron_open_in="${i#get_cron_open_in:}"
+		elif [ $i = "get_schedule" ] && [[ $PIGARDENSCHED == "1" ]]; then
+			with_get_schedule="1"
 		fi
 	done
 
+	local json_ev=""
 	for i in $(seq $EV_TOTAL)
 	do
 		local a=EV"$i"_ALIAS
@@ -543,10 +553,14 @@ function json_status {
 		if [ -n "$json" ]; then
 			json="$json,"
 		fi
-		#json="$json\"$i\":{\"name\":\"$av\",\"state\":$sv}"
 		json="$json\"$av\":{\"name\":\"$av\",\"state\":$sv}"
+
+		if [ -n "$json_ev" ]; then
+			json_ev="$json_ev,"
+		fi
+		json_ev="$json_ev\"$a\":{\"alias\":\"$av\"}"
 	done
-	json="\"zones\":{$json}"
+	json="\"zones\":{$json},\"ev\":{$json_ev}"
 
 	local last_rain_sensor=`cat "$STATUS_DIR/last_rain_sensor" 2> /dev/null`
 	local last_rain_online=`cat "$STATUS_DIR/last_rain_online" 2> /dev/null`
@@ -555,15 +569,7 @@ function json_status {
 	if [[ ! -z "$last_weather_online" ]]; then
 		json_last_weather_online=$last_weather_online
 	fi
-	#if [ -f "$LAST_INFO_FILE.$current_pid" ]; then
-	#	last_info=`cat "$LAST_INFO_FILE.$current_pid"`
-	#fi
-	#if [ -f "$LAST_WARNING_FILE.$current_pid" ]; then
-	#	last_warning=`cat "$LAST_WARNING_FILE.$current_pid"`
-	#fi
-	#if [ -f "$LAST_SUCCESS_FILE.$current_pid" ]; then
-	#	last_success=`cat "$LAST_SUCCESS_FILE.$current_pid"`
-	#fi
+
 	last_info="$MESSAGE_INFO"
 	last_warning="$MESSAGE_WARNING"
 	last_success="$MESSAGE_SUCCESS"
@@ -607,6 +613,24 @@ function json_status {
 	fi
 	local json_cron="\"cron\":{$json_get_cron}"			
 
+	local json_get_schedule=""			
+	local json_schedule=""
+	if [ $with_get_schedule != "0" ]; then
+		json_get_schedule=""
+		for scheduled in `$PIGARDENSCHED_PATH sched`
+		do
+			local ev=$(echo $scheduled|$CUT -f1 -d";")
+			local evcomplete="$ev"_ALIAS
+			local al=${!evcomplete}
+			local json_get_schedule="\"$ev\": {\"alias\": \"$al\", \"entry\": \"$scheduled\"}, $json_get_schedule"
+		done
+		if [[ !  -z  $json_get_schedule ]]; then
+			json_get_schedule="${json_get_schedule::-2}"
+		fi
+	
+		local json_schedule=", \"schedule\":{$json_get_schedule}"
+	fi
+
 	local json_get_cron_open_in=""			
 	if [ $with_get_cron_open_in != "0" ]; then
 		local values_open_in="" 
@@ -641,7 +665,7 @@ function json_status {
 	local json_cron_open_in="\"cron_open_in\":{$json_get_cron_open_in}"
 	local json_timestamp="\"timestamp\": $(date +%s)"
 
-	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="{$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}"
 
 	echo "$json"
 
@@ -683,7 +707,7 @@ 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 "\t$NAME_SCRIPT json_status [get_cron|get_cron_open_in]      show status in json format"
+	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 "\t$NAME_SCRIPT check_rain_sensor                            check rain from hardware sensor"
@@ -715,6 +739,8 @@ function show_usage {
 	echo -e "\t$NAME_SCRIPT del_cron_close alias                         remove all crontab for close a solenoid"
 	echo -e "\t$NAME_SCRIPT get_cron_close alias                         get all crontab for close a solenoid"
 	echo -e "\n"
+	echo -e "\t$NAME_SCRIPT cmd_pigardensched [prm1 [prm2 [prm3]...]]    performs a pigardensched command"
+	echo -e "\n"
 	echo -e "\t$NAME_SCRIPT debug1 [parameter]|[parameter]|..]           Run debug code 1"
 	echo -e "\t$NAME_SCRIPT debug2 [parameter]|[parameter]|..]           Run debug code 2"
 }
@@ -835,6 +861,31 @@ function exec_reboot {
 	trigger_event "exec_reboot_after" 
 }
 
+#
+# Esegue un comando con piGardenSched
+#
+# $1	parametro 1 
+# $2	parametro 2 
+# $3	parametro 3 
+# $4	parametro 4 
+# $5	parametro 5 
+
+function cmd_pigardensched {
+	local foo="bar"
+
+	if [ $PIGARDENSCHED == 0 ]; then
+		echo "piGardenSched not configured in piGarden" >&2
+		log_write "piGardenSched not configured in piGarden"
+		return
+	fi
+
+	$PIGARDENSCHED_PATH $1 $2 $3 $4 $5
+
+	if [ $? -ne 0 ]; then
+		echo "piGardenSched command failed"
+	fi
+}
+
 
 #
 # Converte da gradi a direzione
@@ -932,8 +983,8 @@ function debug2 {
 }
 
 VERSION=0
-SUB_VERSION=5
-RELEASE_VERSION=11
+SUB_VERSION=6
+RELEASE_VERSION=0
 
 DIR_SCRIPT=`dirname $0`
 NAME_SCRIPT=${0##*/}
@@ -961,9 +1012,6 @@ fi
 . "$DIR_SCRIPT/include/rain.include.sh"
 . "$DIR_SCRIPT/include/events.include.sh"
 
-#LAST_INFO_FILE="$STATUS_DIR/last_info"
-#LAST_WARNING_FILE="$STATUS_DIR/last_warning"
-#LAST_SUCCESS_FILE="$STATUS_DIR/last_success"
 MESSAGE_INFO=""
 MESSAGE_WARNING=""
 MESSAGE_SUCCESS=""
@@ -987,6 +1035,11 @@ elif [ "$WEATHER_SERVICE" != "none" ]; then
 	WEATHER_SERVICE="drv:$WEATHER_SERVICE"
 fi
 
+PIGARDENSCHED="0"
+if [[ -x "$PIGARDENSCHED_PATH" ]]; then
+	PIGARDENSCHED="1"
+fi
+
 # Elimina il file di lock se più vecchio di 11 secondi
 if [ -f "$LOCK_FILE" ]; then
 	max_age_lock_file=11
@@ -1160,6 +1213,10 @@ case "$1" in
 		get_cron_close $2
 		;;
 
+	cmd_pigardensched)
+		cmd_pigardensched $2 $3 $4 $5
+		;;
+	
 	reboot)
 		exec_reboot
 		;;