Aggiunto driver 'remote' per gestire da un'installazione master di piGarden più installazioni remote

Corretto errore variabile in drv_rain_sensor_get

CHANGELOG.md

@@ -1,3 +1,25 @@
+# 0.5.5 - 25/03/2018
+- Added "remote" driver to control remote pigarden
+
+# 0.5.4 - 13/11/2017
+- Fix bad initialization LOG_OUTPUT_DRV_FILE variable if not defined in config file
+
+# 0.5.3 - 19/11/2017
+- Fix send parameter on event init_before and init_after
+- Added WEATHER argument in check_rain_sensor_after and check_rain_sensor_change event
+- Added events cron_add_before, cron_add_after, cron_del_before, cron_del_after, ev_open_in_before, ev_open_in_after, exec_poweroff_before, exec_poweroff_after, exec_reboot_before, exec_reboot_after
+- Added to sendmail.sh argument passed form check_rain_sensor_after and check_rain_sensor_change event
+- Added to sendmail.sh new events
+- Fix wrong state on event script sendmail.sh
+
+# 0.5.2 - 01/11/2017
+- Fix problem inconsistent return value in drv_rain_sensor_get
+- Fix get parameter in event script sendmail.sh
+
+# 0.5.1 - 28/10/2017
+- Added events managemets
+- Added support for zones not subject to rainfall (with parameter EVx_NORAIN)
+
 # 0.5.0 - 12/10/2017
 - Implemented driver subsystem for interfacing with other board
 - Added driver spb16ch for interfacing with "Smart Power Board 16 channel with RTC"

README.md

@@ -4,7 +4,7 @@ Bash script to manage an irrigation system built with a Raspberry Pi
 
 ## Official documentation 
 
-Documentation of piGarden and build system irrigation with Raspberry Pi can be found on the [www.lejubila.net/tag/pigarden/](http://www.lejubila.net/tag/pigarden/)
+Documentation of piGarden and build system irrigation with Raspberry Pi can be found on the [www.lejubila.net/pigarden/](http://www.lejubila.net/pigarden/)
 
 ## License
 
@@ -66,5 +66,3 @@ sudo cp piGarden/conf/piGarden.conf.example /etc/piGarden.conf
 Customize the configuration file. 
 For more information see 
 [www.lejubila.net/2015/12/impianto-di-irrigazione-con-raspberry-pi-pigarden-lo-script-di-gestione-quinta-parte/](https://www.lejubila.net/2015/12/impianto-di-irrigazione-con-raspberry-pi-pigarden-lo-script-di-gestione-quinta-parte/)
-and
-[www.lejubila.net/2017/04/pigarden-0-2-easter-egg/](https://www.lejubila.net/2017/04/pigarden-0-2-easter-egg/)

conf/piGarden.conf.example

@@ -8,6 +8,9 @@ LOG_OUTPUT_DRV_FILE="/tmp/piGarden.drv.log"
 # Status directory
 STATUS_DIR="/home/pi/piGarden/state"
 
+# Event directory
+EVENT_DIR="/home/pi/piGarden/events"
+
 # Posizione gpio
 GPIO="/usr/local/bin/gpio"
 
@@ -86,6 +89,7 @@ EV_TOTAL=6
 # Definizione delle elettrovalvole
 EV1_ALIAS="1" #
 EV1_GPIO=17   #		Physical 11 - wPi 0
+#EV1_NORAIN=1 # 	Non interrompe l'irrigazione di questa zona in caso di pioggia
 
 EV2_ALIAS="2" #
 EV2_GPIO=27   #		Physical 13 - wPi 2

conf/piGarden.conf.remote.example

@@ -0,0 +1,142 @@
+# Log file
+LOG_FILE="/home/pi/piGarden/log/piGarden.log"
+LOG_FILE_MAX_SIZE=1048576 # 1MB
+
+# Log file for driver output
+#LOG_OUTPUT_DRV_FILE="/tmp/piGarden.drv.log"
+
+# Status directory
+STATUS_DIR="/home/pi/piGarden/state"
+
+# Event directory
+EVENT_DIR="/home/pi/piGarden/events"
+
+# Posizione gpio
+GPIO="/usr/local/bin/gpio"
+
+# Posizione js
+JQ="/usr/local/bin/jq"
+
+# Percorso curl
+CURL="/usr/bin/curl"
+
+# Percorso wc
+WC="/usr/bin/wc"
+
+# Percorso gzip
+GZIP="/bin/gzip"
+
+# Percorso mv
+MV="/bin/mv"
+
+# Percorso di tr
+TR="/usr/bin/tr"
+
+# Percorso di cut
+CUT="/usr/bin/cut"
+
+# Percorso tcpserver
+TCPSERVER="/usr/bin/tcpserver"
+
+# Percorso cron
+CRONTAB="/usr/bin/crontab"
+
+# Percorso grep
+GREP="/bin/grep"
+
+# Percorsp sed
+SED="/bin/sed"
+
+# Percorso readlink
+READLINK="/bin/readlink"
+
+# Percorso stat
+STAT="/usr/bin/stat"
+
+# Se impostato con il valore 1, indica che il sistema gestisce elettrovalvole monostabili, 
+# se impostato a 0 il sistema gestirà elettrovalvole bisstabili
+EV_MONOSTABLE=0
+
+# Id gpio usati per simulare il doppio deviatore con cui eseguire l'alimentazione alle elettrovalvole
+SUPPLY_GPIO_1=2
+SUPPLY_GPIO_2=3
+
+# Stato dei due gpio per impartire l'alimentazione positiva alle elettrovalvole (aperta)
+SUPPLY_GPIO_POS=0
+
+# Stato dei due gpio per impartire l'alimentazione negativa alle elettrovalvole (chiusa)
+SUPPLY_GPIO_NEG=1
+
+# Stato di ingresso da assegnare al gpio per chiudere il rele
+RELE_GPIO_CLOSE=0
+
+# Stato di ingresso da assegnare al gpio per aprire il rele
+RELE_GPIO_OPEN=1
+
+# Id del gpio usato per collegare il sensore di rilevamento pioggia
+RAIN_GPIO=25		# Physical 22 - wPi 6
+
+# Valore in ingresso sul gpio definito in RAIN_GPIO che indica lo stato di pioggia
+RAIN_GPIO_STATE=0
+
+
+
+
+# Numero totale di elettrovalvole
+EV_TOTAL=4
+
+# Definizione delle elettrovalvole
+EV1_ALIAS="Giardino_Posteriore_DX" #
+EV1_GPIO="drv:remote:PIREMOTE1:Giardino_Posteriore_DX"
+#EV1_NORAIN=1 #         Non interrompe l'irrigazione di questa zona in caso di pioggia
+
+EV2_ALIAS="Giardino_Posteriore_CN" #
+EV2_GPIO="drv:remote:PIREMOTE2:Giardino_Posteriore_CN"
+
+EV3_ALIAS="Giardino_Posteriore_SX" #
+EV3_GPIO="drv:remote:PIREMOTE2:Giardino_Posteriore_SX"
+
+EV4_ALIAS="Giardino_Posteriore_GPIO" #
+EV4_GPIO="18"
+
+
+
+# Definisce l'api key e il luogo per recuperare lo stato meteo online
+WUNDERGROUND_KEY=""
+WUNDERGROUND_LOCATION="IT/Pieve%20a%20Nievole"	# http://www.wunderground.com/weather/api/d/docs?d=resources/country-to-iso-matching&MR=1
+
+# Blocca l'irrigazione se l'ultima pioggia rilevata online è avvenuta nell'ultima quantità di tempo inserita.
+# Il tempo è espresso in secondi. Quindi inserendo 86400, se nelle ultime 24 ore ha piovuto viene bloccata l'irrigazione. Inserendo il valore zero non viene eseguito nessun controllo.
+NOT_IRRIGATE_IF_RAIN_ONLINE=86400
+
+# Il parametro è simile a quello precedente, il controllo però anziché essere fatto attingendo a wunderground, viene eseguito direttamente sul sensore se installato. Inserendo il valore zero non viene eseguito nessun controllo.
+NOT_IRRIGATE_IF_RAIN_SENSOR=86400
+
+# Indirizzo ip e porta di ascolto del socket server
+TCPSERVER_IP="127.0.0.1"
+TCPSERVER_PORT="8084"
+
+# Utente e password che i clients devono utilizzare per stabilire una connessione tramite socket server
+TCPSERVER_USER=""
+TCPSERVER_PWD=""
+
+# Con impostato il valore 1 non invia l'identificativi per statistiche di utilizzo
+NO_SEND_IDENTIFIER=0
+
+
+#
+# Configurazione piGarden remoti
+#
+PIREMOTE1_IP="192.168.1.51"
+PIREMOTE1_PORT="8084"
+PIREMOTE1_USER=""
+PIREMOTE1_PWD=""
+
+PIREMOTE2_IP="192.168.1.52"
+PIREMOTE2_PORT="8084"
+PIREMOTE2_USER=""
+PIREMOTE2_PWD=""
+
+
+
+

conf/piGarden.conf.spb16ch.example

@@ -8,6 +8,9 @@ LOG_FILE_MAX_SIZE=1048576 # 1MB
 # Status directory
 STATUS_DIR="/home/pi/piGarden/state"
 
+# Event directory
+EVENT_DIR="/home/pi/piGarden/events"
+
 # Posizione gpio
 GPIO="/usr/local/bin/gpio"
 
@@ -85,6 +88,7 @@ EV_TOTAL=128
 # Definizione delle elettrovalvole
 EV1_ALIAS="Zona_1" #
 EV1_GPIO="drv:spb16ch:1"
+#EV1_NORAIN=1 #         Non interrompe l'irrigazione di questa zona in caso di pioggia
 
 EV2_ALIAS="Zona_2" #
 EV2_GPIO="drv:spb16ch:2"

drv/remote/README.md

@@ -0,0 +1,4 @@
+# Driver per controllare pigarden remoti in rete da un'installazione pigarden master
+
+Per maggiori informazioni consulta https://www.lejubila.net/2018/03/pigardent-0-5-5-driver-master-per-implementare-un-architettura-master-slave/
+

drv/remote/common.include.sh

@@ -0,0 +1,38 @@
+#
+# Funzioni comuni utilizzate dal driver
+#
+
+#
+# Esegue un comando su un pigarden remoto tramite socket
+#
+# $1	identificativo pigarden remoto
+# $2	comando da eseguire
+#
+function drv_remote_command {
+
+	local remote="$1"
+	local command="$2"
+
+	local remote_ip_var=$remote"_IP"
+	local remote_port_var=$remote"_PORT"
+	local remote_user_var=$remote"_USER"
+	local remote_pwd_var=$remote"_PWD"
+
+	local remote_ip="${!remote_ip_var}"
+	local remote_port="${!remote_port_var}"
+	local remote_user="${!remote_user_var}"
+	local remote_pwd="${!remote_pwd_var}"
+
+	exec 5<>/dev/tcp/$remote_ip/$remote_port
+	
+	if [[ ! -z $remote_user ]] && [[ ! -z $remote_pwd ]]; then
+		command="$remote_user\n$remote_pwd\n$command"
+	fi
+
+	echo -e "$command" >&5
+
+	cat <&5
+
+}
+
+

drv/remote/config.include.sh

@@ -0,0 +1,7 @@
+#
+# File di configurazione del driver
+# 
+
+# Dichiarazione variabile di esempio
+#declare -g SAMPLE_FOO
+#SAMPLE_FOO="bar"

drv/remote/init.include.sh

@@ -0,0 +1,9 @@
+#
+# Questa funzione viene inviocata dalla funzione "init" di piGarden se sono presenti elettrovalvole o sensori che utilizzano questo driver
+#
+function drv_remote_init {
+
+	local FOO=bar
+
+}
+

drv/remote/rainsensor.include.sh

@@ -0,0 +1,23 @@
+#
+# Inizializza il sensore di rilevamento pioggia 
+#
+# $i 	identificativo gpio del sensore di pioggia
+#
+function drv_remote_rain_sensor_init {
+
+	local FOO="bar"
+
+}
+
+#
+# Ritorna lo stato del sensore di rilevamento pioggia 
+#
+# $i 	identificativo gpio del sensore di pioggia
+#
+function drv_remote_rain_sensor_get {
+
+	local FOO="bar"
+
+}
+
+

drv/remote/rele.include.sh

@@ -0,0 +1,76 @@
+#
+# Inizializzazione rele 
+#
+# $1 identificativo relè da inizializzare
+#
+function drv_remote_rele_init {
+
+	drv_remote_rele_open "$1"
+}
+
+#
+# Apertura rele 
+#
+# $1 identificativo relè da aprire (chiude l'elettrovalvola)
+#
+function drv_remote_rele_open {
+
+	local remote=`echo $1 | $CUT -d':' -f3,3`
+	local remote_alias=`echo $1 | $CUT -d':' -f4,4`
+
+	local command="close $remote_alias"
+
+	echo "remote=$remote"
+	echo "remote_alias=$remote_alias"
+	echo "command=$command"
+
+	local response=$(drv_remote_command "$remote" "$command")
+
+	echo "response=$response"
+
+	local result=$(echo $response|$JQ -M ".error.description")
+	echo "result=$result"
+	if [[ "$result" != "\"\"" ]]; then
+		local error=$result
+		error="${error%\"}"
+		error="${error#\"}"
+		echo "error=$error"
+	        log_write "Remote rele open error: $error"
+        	message_write "warning" "Remote rele open error: $error"
+		return 1
+	fi
+}
+
+#
+# Chiusura rele 
+#
+# $1 identificativo relè da chiudere (apre l'elettrovalvola)
+#
+function drv_remote_rele_close {
+
+	local remote=`echo $1 | $CUT -d':' -f3,3`
+	local remote_alias=`echo $1 | $CUT -d':' -f4,4`
+
+	local command="open $remote_alias force"
+
+	echo "remote=$remote"
+	echo "remote_alias=$remote_alias"
+	echo "command=$command"
+
+	local response=$(drv_remote_command "$remote" "$command")
+
+	echo "response=$response"
+
+	local result=`echo $response|$JQ -M ".error.description"`
+	echo "result=$result"
+	if [[ "$result" != "\"\"" ]]; then
+		local error=$result
+		error="${error%\"}"
+		error="${error#\"}"
+		echo "error=$error"
+	        log_write "Remote rele open error: $error"
+        	message_write "warning" "Remote rele open error: $error"
+		return 1
+	fi
+}
+

drv/remote/setup.include.sh

@@ -0,0 +1,27 @@
+#
+# Questa funzione viene invocata dalla funzione "setup_drv" di piGarden ad ogni avvio dello script
+# e serve per eseguire l'evenutale setup del driver se necessario
+#
+function drv_remote_setup {
+
+	local all_remote=0
+
+        # Imposta le zone come remote 
+        for i in $(seq $EV_TOTAL)
+        do
+                local a=EV"$i"_GPIO
+                local gpio="${!a}"
+                if [[ "$gpio" == drv:remote:* ]]; then
+		        local varname=EV"$i"_REMOTE
+			declare -g $varname=1
+			all_remote=$((all_remote+1))
+		fi
+        done
+
+	# Se tutte le zone sono remote disabilita la gestione dell'alimentazione bistabile
+	if [ $all_remote -eq $EV_TOTAL ]; then
+		EV_MONOSTABLE=1
+	fi
+
+}
+

drv/remote/supply.include.sh

@@ -0,0 +1,34 @@
+#
+# Inizializza i rele che gestiscono l'alimentazione per le valvole bistabili
+#
+# $1    identificativo relè 
+#
+function drv_remote_supply_bistable_init {
+
+	local FOO="bar"
+
+}
+
+#
+# Imposta l'alimentazione delle elettrovalvole con voltaggio positivo 
+#
+# $1    identificativo relè 
+#
+function drv_remote_supply_positive {
+
+	local FOO="bar"
+
+}
+
+#
+# Imposta l'alimentazione delle elettrovalvole con voltaggio negativo
+#
+# $1    identificativo relè 
+#
+function drv_remote_supply_negative {
+
+	local FOO="bar"
+
+}
+
+

events/check_rain_online_after/.gitignore

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

events/check_rain_online_before/.gitignore

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

events/check_rain_online_change/.gitignore

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

events/check_rain_sensor_after/.gitignore

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

events/check_rain_sensor_before/.gitignore

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

events/check_rain_sensor_change/.gitignore

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

events/cron_add_after/.gitignore

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

events/cron_add_before/.gitignore

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

events/cron_del_after/.gitignore

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

events/cron_del_before/.gitignore

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

events/ev_close_after/.gitignore

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

events/ev_close_before/.gitignore

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

events/ev_open_after/.gitignore

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

events/ev_open_before/.gitignore

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

events/ev_open_in_after/.gitignore

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

events/ev_open_in_before/.gitignore

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

events/exec_poweroff_after/.gitignore

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

events/exec_poweroff_before/.gitignore

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

events/exec_reboot_after/.gitignore

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

events/exec_reboot_before/.gitignore

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

events/init_after/.gitignore

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

events/init_before/.gitignore

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

events/scripts/.gitignore

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

events/scripts/sendmail.sh

@@ -0,0 +1,114 @@
+#!/bin/bash
+#
+# Send mail on triggered event
+#
+# $1 = event
+# $2 = cause
+# $3 = time
+#
+# To send an email with this script you must install and configure ssmtp and mailutils:
+# sudo apt-get install ssmtp mailutils
+#
+# edit the configuration file /etc/ssmtp/ssmtp.conf and insert the below lines:
+#
+# root=postmaster
+# mailhub=smtp.gmail.com:587
+# hostname=guard
+# FromLineOverride=YES
+# AuthUser=your_mail@gmail.com
+# AuthPass=your_password
+# UseSTARTTLS=YES
+#
+
+EVENT="$1"
+
+TO="mail@destination.com"
+FROM="piGarden@your_domain.com"
+SUBJECT="[piGarden notification mail] event $EVENT"
+BODY=""
+
+case "$EVENT" in
+	"init_before" | "init_after")
+		TIME=$2
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"ev_open_before" | "ev_open_after")
+		ALIAS="$2"
+		FORCE="$3"
+		TIME=$4
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nZONE: $ALIAS\nFORCED IRRIGATION: $FORCE\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"ev_open_in_before")
+		ALIAS="$2"
+		FORCE="$3"
+		MINUTE_START="$4"
+		MINUTE_STOP="$5"
+		TIME=$6
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nZONE: $ALIAS\nFORCED IRRIGATION: $FORCE\nMINUTE START: $MINUTE_START\nMINUTE STOP: $MINUTE_STOP\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"ev_open_in_after")
+		ALIAS="$2"
+		FORCE="$3"
+		CRON_START="$4"
+		CRON_STOP="$5"
+		TIME=$6
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nZONE: $ALIAS\nFORCED IRRIGATION: $FORCE\nCRON START: $CRON_START\nCRON STOP: $CRON_STOP\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+
+	"ev_close_before" | "ev_close_after")
+		ALIAS="$2"
+		TIME=$3
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nZONE: $ALIAS\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"check_rain_sensor_before" | "check_rain_sensor_after" | "check_rain_sensor_change")
+		STATE="$2"
+		TIME=$3
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nSTATE: $STATE\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"check_rain_online_before")
+		STATE="$2"
+		TIME=$3
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nSTATE: $STATE\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"check_rain_online_after" | "check_rain_online_change")
+		STATE="$2"
+		WEATHER="$3"
+		TIME=$4
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nSTATE: $STATE\nWEATHER: $WEARTHER\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"cron_add_before" | "cron_add_after")
+		CRON_TYPE="$2"
+		CRON_ARG="$3"
+		CRON_ELEMENT="$4"
+		TIME=$5
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nCRON TYPE: $CRON_TYPE\nCRON ARG: $CRON_ARG\nCRON ELEMENT: $CRON_ELEMENT\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"cron_del_before" | "cron_del_after")
+		CRON_TYPE="$2"
+		CRON_ARG="$3"
+		TIME=$4
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nCRON TYPE: $CRON_TYPE\nCRON ARG: $CRON_ARG\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	"exec_poweroff_before" | "exec_poweroff_after" | "exec_reboot_before" | "exec_reboot_after")
+		TIME=$2
+		BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nTIME: $(/bin/date -d@$TIME)"
+		;;
+
+	*)
+		exit
+		;;
+
+esac
+
+echo -e "$BODY" | /usr/bin/mail -s "$SUBJECT" $TO -r $FROM &
+

events/scripts/testevent.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Send mail on triggered event
+#
+# $1 = event
+EVENT="$1"
+P2="$2"
+P3="$3"
+P4="$4"
+P5="$5"
+
+echo "$(date) $EVENT $P2 $P3 $P4 $P5" >> /tmp/piGarden.testevent
+
+

events/scripts/testeventbreak.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Send mail on triggered event
+#
+# $1 = event
+EVENT="$1"
+P2="$2"
+P3="$3"
+P4="$4"
+P5="$5"
+
+echo "testevent break $(date) $EVENT $P2 $P3 $P4 $P5" >> /tmp/piGarden.testevent
+
+exit 1

include/cron.include.sh

@@ -39,10 +39,10 @@ function cron_del {
 		return 1
 	fi
 
-
+	trigger_event "cron_del_before" "$1" "$2"
 	$SED "$START,${END}d" "$TMP_CRON_FILE" | $SED '$!N; /^\(.*\)\n\1$/!P; D' | $CRONTAB -
-	#$CRONTAB "$TMP_CRON_FILE"
 	rm "$TMP_CRON_FILE"
+	trigger_event "cron_del_after" "$1" "$2"
 
 }
 
@@ -206,8 +206,10 @@ function cron_add {
 	echo "$CRON_DISABLED$CRON_M $CRON_H $CRON_DOM $CRON_MON $CRON_DOW $CRON_COMMAND" >> "$TMP_CRON_FILE2"
 	echo "# END cron $CRON_TYPE $CRON_ARG" >> "$TMP_CRON_FILE2"
 
+	trigger_event "cron_add_before" "$CRON_TYPE" "$CRON_ARG" "$CRON_DISABLED$CRON_M $CRON_H $CRON_DOM $CRON_MON $CRON_DOW $CRON_COMMAND"
 	$CRONTAB "$TMP_CRON_FILE2"
 	rm "$TMP_CRON_FILE" "$TMP_CRON_FILE2"
+	trigger_event "cron_add_after" "$CRON_TYPE" "$CRON_ARG" "$CRON_DISABLED$CRON_M $CRON_H $CRON_DOM $CRON_MON $CRON_DOW $CRON_COMMAND"
 
 }
 

include/drv.include.sh

@@ -111,9 +111,13 @@ function drv_rele_close {
 	elif [ "$fnc" == "drvnotfound" ]; then
 	        log_write "Driver not found: $idx"
         	message_write "warning" "Driver not found: $idx"
+		return 1
 	else
 		echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
 		$fnc "$idx" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
+		if [ $? -eq 1 ]; then
+			return 1
+		fi
 	fi
 }
 
@@ -133,9 +137,13 @@ function drv_rele_open {
 	elif [ "$fnc" == "drvnotfound" ]; then
 	        log_write "Driver not found: $idx"
         	message_write "warning" "Driver not found: $idx"
+		return 1
 	else
 		echo "$(date) $fnc arg:$idx" >> "$LOG_OUTPUT_DRV_FILE"
 		$fnc "$idx" >> "$LOG_OUTPUT_DRV_FILE" 2>&1
+		if [ $? -eq 1 ]; then
+			return 1
+		fi
 	fi
 }
 
@@ -294,7 +302,7 @@ function drv_rain_sensor_get {
 
 	# Nessun driver definito, esegue la lettura del sensore tramite gpio del raspberry
 	if [ -z "$fnc" ]; then
-		val=`$GPIO -g read $idx`
+		vret=`$GPIO -g read $idx`
 	# Il driver definito non è stato trovato
 	elif [ "$fnc" == "drvnotfound" ]; then
 	        log_write "Driver not found: $idx"

include/events.include.sh

@@ -0,0 +1,103 @@
+#
+# Triggered an event and executge associated scripts
+# $1 event
+#
+
+function trigger_event {
+
+	local EVENT="$1"
+	local CAUSE="$2"
+	local current_event_dir="$EVENT_DIR/$EVENT"
+
+	if [ -d "$current_event_dir" ]; then
+		local FILES="$current_event_dir/*"
+		for f in $FILES
+		do
+			if [ -x "$f" ]; then
+				case "$EVENT" in
+					"ev_open_before" | "ev_open_after")
+						ALIAS="$2"
+						FORCE="$3"
+						$f "$EVENT" "$ALIAS" "$FORCE" `date +%s`  &> /dev/null 
+						;;
+
+					"ev_open_in_before")
+						ALIAS="$2"
+						FORCE="$3"
+						local MINUTE_START="$4"
+						local MINUTE_STOP="$5"
+						$f "$EVENT" "$ALIAS" "$FORCE" "$MINUTE_START" "$MINUTE_STOP" `date +%s`  &> /dev/null 
+						;;
+
+					"ev_open_in_after")
+						ALIAS="$2"
+						FORCE="$3"
+						local CRON_START="$4"
+						local CRON_STOP="$5"
+						$f "$EVENT" "$ALIAS" "$FORCE" "$CRON_START" "$CRON_STOP" `date +%s`  &> /dev/null 
+						;;
+
+					"ev_close_before" | "ev_close_after")
+						ALIAS="$2"
+						$f "$EVENT" "$ALIAS" `date +%s`  &> /dev/null 
+						;;
+
+
+					"check_rain_sensor_before" | "check_rain_sensor_after" | "check_rain_sensor_change")
+						STATE="$2"
+						$f "$EVENT" "$STATE" `date +%s`  &> /dev/null 
+						;;
+
+					"check_rain_online_before")
+						STATE="$2"
+						$f "$EVENT" "$STATE" `date +%s`  &> /dev/null 
+						;;
+
+					"check_rain_online_after" | "check_rain_online_change")
+						STATE="$2"
+						WEATHER="$3"
+						$f "$EVENT" "$STATE" "$WEATHER" `date +%s`  &> /dev/null 
+						;;
+
+
+					"init_before" | "init_after")
+						STATE="$2"
+						$f "$EVENT" `date +%s`  &> /dev/null 
+						;;
+
+					"cron_add_before" | "cron_add_after")
+						local CRON_TYPE="$2"
+						local CRON_ARG="$3"
+						local CRON_ELEMENT="$4"
+						$f "$EVENT" "$CRON_TYPE" "$CRON_ARG" "$CRON_ELEMENT" `date +%s`  &> /dev/null 
+						;;
+
+					"cron_del_before" | "cron_del_after")
+						local CRON_TYPE="$2"
+						local CRON_ARG="$3"
+						$f "$EVENT" "$CRON_TYPE" "$CRON_ARG" `date +%s`  &> /dev/null 
+						;;
+
+					"exec_poweroff_before" | "exec_poweroff_after" | "exec_reboot_before" | "exec_reboot_after" )
+						$f "$EVENT" `date +%s`  &> /dev/null 
+						;;
+
+					*)
+						$f "$EVENT" "$CAUSE" `date +%s`  &> /dev/null 
+						;;
+				esac
+
+				local ec=$?
+				#echo "$EVENT ec=$ec" >> /tmp/piGarden.testevent
+				if [ $ec -ne 0 ]; then
+					log_write "Stop events chain for exit code $ec in $current_event_dir/$f"
+					return $ec
+				fi
+			fi
+		done
+
+	fi
+
+}
+
+

include/rain.include.sh

@@ -2,11 +2,16 @@
 # Controlla se se piove tramite http://api.wunderground.com/
 #
 function check_rain_online {
+
+	trigger_event "check_rain_online_before" ""
+
 	# http://www.wunderground.com/weather/api/d/docs?d=resources/phrase-glossary&MR=1
 	$CURL http://api.wunderground.com/api/$WUNDERGROUND_KEY/conditions/q/$WUNDERGROUND_LOCATION.json > $TMP_PATH/check_rain_online.json
 	local weather=`cat $TMP_PATH/check_rain_online.json | $JQ -M ".current_observation.weather"`
 	local current_observation=`cat $TMP_PATH/check_rain_online.json | $JQ -M ".current_observation"`
 	local local_epoch=`cat $TMP_PATH/check_rain_online.json | $JQ -M -r ".current_observation.local_epoch"`
+	local current_state_rain_online=""
+	local last_state_rain_online=`cat "$STATUS_DIR/last_state_rain_online" 2> /dev/null`
 	#echo $weather
 	#weather="[Light/Heavy] Drizzle"
 	if [ "$weather" = "null" ]; then
@@ -22,12 +27,19 @@ function check_rain_online {
 		 	[[ "$weather" == *"Thunderstorm"* ]] || 
 			[[ "$weather" == *"Drizzle"* ]]; 
 		then
-			#echo "ECCOMI!!!!!"
+			current_state_rain_online='rain'
 			echo $local_epoch > "$STATUS_DIR/last_rain_online"
-			#return $local_epoch	
+		else
+			current_state_rain_online='norain'
 		fi
 		echo "$current_observation" > "$STATUS_DIR/last_weather_online"
+		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
+
+	trigger_event "check_rain_online_after" "$current_state_rain_online" "$weather"
 }
 
 #
@@ -36,16 +48,25 @@ function check_rain_online {
 function check_rain_sensor {
 
 	if [ -n "$RAIN_GPIO" ]; then 
-		#local s=`$GPIO -g read $RAIN_GPIO`
+		trigger_event "check_rain_sensor_before" ""
+		local current_state_rain_sensor=""
+		local last_state_rain_sensor=`cat "$STATUS_DIR/last_state_rain_sensor" 2> /dev/null`
 		local s=`drv_rain_sensor_get $RAIN_GPIO`
 		if [ "$s" = "$RAIN_GPIO_STATE" ]; then
+			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)"
-			return $local_epoch	
+			#return $local_epoch	
 		else
+			current_state_rain_sensor='norain'
 			log_write "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"
+			trigger_event "check_rain_sensor_change" "$current_state_rain_sensor"
+		fi
+		trigger_event "check_rain_sensor_after" "$current_state_rain_sensor"
 	else
 		log_write "Rain sensor not present"
 	fi
@@ -84,10 +105,12 @@ function close_all_for_rain {
 		do
 			local a=EV"$i"_ALIAS
 			local al=${!a}
+			local a=EV"$i"_NORAIN
+			local evnorain=${!a}
 			ev_status $al
 			local state=$?
 			#echo "$al = $state"
-			if [ "$state" = "1" ]; then
+			if [ "$state" = "1" ] && [ "$evnorain" != "1" ]; then
 				ev_close $al
 				log_write "close_all_for_rain - Close solenoid '$al' for rain"
 			fi

piGarden.sh

@@ -14,6 +14,8 @@ function initialize {
 
 	unlock
 
+	trigger_event "init_before" ""
+
 	# Inizializza i driver gpio
         for drv in "${list_drv[@]}"
         do
@@ -24,10 +26,6 @@ function initialize {
 	# Imposta l'alimentazione con voltaggio negativo e setta i gpio in scrittura per le elettrovalvole bistabili
 	if [ "$EV_MONOSTABLE" != "1" ]; then
 		drv_supply_bistable_init "$SUPPLY_GPIO_1" "$SUPPLY_GPIO_2"
-		#$GPIO -g write $SUPPLY_GPIO_1 0
-		#$GPIO -g write $SUPPLY_GPIO_2 0
-		#$GPIO -g mode $SUPPLY_GPIO_1 out
-		#$GPIO -g mode $SUPPLY_GPIO_2 out
 	fi
 
 	# Elimina tutti gli stati delle elettrovalvole preesistenti
@@ -38,8 +36,6 @@ function initialize {
 	do
 		g=EV"$i"_GPIO
 		drv_rele_init "${!g}"
-		#$GPIO -g write ${!g} RELE_GPIO_OPEN 	# chiude l'alimentazione all'elettrovalvole
-		#$GPIO -g mode ${!g} out		# setta il gpio nella modalita di scrittura
 		ev_set_state $i 0
 	done
 
@@ -54,12 +50,12 @@ function initialize {
 	# Inizializza il sensore di rilevamento pioggia
 	if [ -n "$RAIN_GPIO" ]; then 
 		drv_rain_sensor_init "$RAIN_GPIO"
-		#$GPIO -g mode $RAIN_GPIO in
 		log_write "Rain sensor initialized"
 	else
 		log_write "Rain sensor not present"
 	fi
 
+	trigger_event "init_after" ""
 	log_write "End initialize"
 
 }
@@ -82,7 +78,15 @@ function ev_open {
 
 	cron_del open_in $1 > /dev/null 2>&1
 
-	if [ ! "$2" = "force" ]; then
+	# Dall'alias dell'elettrovalvola recupero il numero e dal numero recupero gpio da usare
+	ev_alias2number $1
+	local EVNUM=$?
+	local g=`ev_number2gpio $EVNUM`
+	local EVNORAIN=`ev_number2norain $EVNUM`
+	local EV_IS_REMOTE_VAR=EV"$EVNUM"_REMOTE
+	local EV_IS_REMOTE=${!EV_IS_REMOTE_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`
@@ -114,28 +118,33 @@ function ev_open {
 		state=2
 	fi
 
-	# Dall'alias dell'elettrovalvola recupero il numero e dal numero recupero gpio da usare
+	trigger_event "ev_open_before" "$1" "$2"
-	ev_alias2number $1
+	if [ $? -ne 0 ]; then
-	EVNUM=$?
+		log_write "Solenoid '$1' not open due to external event"
-	g=`ev_number2gpio $EVNUM`
+		message_write 'warning' "Solenoid not open due to external event"
+		return
+	fi
 
 	lock
 
 	# Gestisce l'apertura dell'elettrovalvola in base alla tipologia (monostabile / bistabile) 
-	if [ "$EV_MONOSTABLE" == "1" ]; then
+	if [ "$EV_MONOSTABLE" == "1" ] || [ "$EV_IS_REMOTE" == "1" ]; then
-		#$GPIO -g write $g $RELE_GPIO_CLOSE
 		drv_rele_close "$g"
+		if [ $? -eq 1 ]; then
+			unlock
+			return		
+		fi
 	else
 		supply_positive
-		#$GPIO -g write $g $RELE_GPIO_CLOSE
 		drv_rele_close "$g"
 		sleep 1
-		#$GPIO -g write $g $RELE_GPIO_OPEN
 		drv_rele_open "$g"
 	fi
 
 	ev_set_state $EVNUM $state
 
+	trigger_event "ev_open_after" "$1" "$2"
+
 	unlock
 
 	log_write "Solenoid '$1' open"
@@ -177,6 +186,9 @@ function ev_open_in {
 		message_write "warning" "Alias solenoid not specified"
 		return 1
 	fi
+
+	trigger_event "ev_open_in_before" "$3" "$4" "$1" "$2"
+
 	gpio_alias2number $alias > /dev/null 2>&1
 
 	minute_start=$(($minute_start + 1))
@@ -188,6 +200,7 @@ function ev_open_in {
 
 	if [ "$minute_start" -eq "1" ]; then
 		ev_open $alias $force
+		cron_start="- - - - -"
 	else
 		cron_add open_in $cron_start "$alias" "$force"
 	fi
@@ -197,6 +210,8 @@ function ev_open_in {
 
 	message_write "success" "Scheduled start successfully performed"
 
+	trigger_event "ev_open_in_after" "$3" "$4" "$cron_start" "$cron_stop"
+
 	#echo $cron_start
 	#echo $cron_stop
 
@@ -213,24 +228,31 @@ function ev_close {
 	ev_alias2number $1
 	EVNUM=$?
 	g=`ev_number2gpio $EVNUM`
+	local EV_IS_REMOTE_VAR=EV"$EVNUM"_REMOTE
+	local EV_IS_REMOTE=${!EV_IS_REMOTE_VAR}
+
+	trigger_event "ev_close_before" "$1"
 
 	lock
 
 	# Gestisce l'apertura dell'elettrovalvola in base alla tipologia (monostabile / bistabile) 
-	if [ "$EV_MONOSTABLE" == "1" ]; then
+	if [ "$EV_MONOSTABLE" == "1" ] || [ "$EV_IS_REMOTE" == "1" ]; then
-		#$GPIO -g write $g $RELE_GPIO_OPEN
 		drv_rele_open "$g"
+		if [ $? -eq 1 ]; then
+			unlock
+			return		
+		fi
 	else
 		supply_negative
-		#$GPIO -g write $g $RELE_GPIO_CLOSE
 		drv_rele_close "$g"
 		sleep 1
-		#$GPIO -g write $g $RELE_GPIO_OPEN
 		drv_rele_open "$g"
 	fi
 
 	ev_set_state $EVNUM 0
 
+	trigger_event "ev_close_after" "$1"
+
 	unlock
 
 	log_write "Solenoid '$1' close"
@@ -244,8 +266,6 @@ function ev_close {
 #
 function supply_positive {
 	drv_supply_positive "$SUPPLY_GPIO_1" "$SUPPLY_GPIO_2"
-	#$GPIO -g write $SUPPLY_GPIO_1 $SUPPLY_GPIO_POS
-	#$GPIO -g write $SUPPLY_GPIO_2 $SUPPLY_GPIO_POS
 }
 
 #
@@ -253,8 +273,6 @@ function supply_positive {
 #
 function supply_negative {
 	drv_supply_negative "$SUPPLY_GPIO_1" "$SUPPLY_GPIO_2"
-	#$GPIO -g write $SUPPLY_GPIO_1 $SUPPLY_GPIO_NEG
-	#$GPIO -g write $SUPPLY_GPIO_2 $SUPPLY_GPIO_NEG
 }
 
 #
@@ -372,11 +390,20 @@ function alias_exists {
 # $1 numero elettrovalvola
 #
 function ev_number2gpio {
-#	echo "numero ev $1"
+	local i=$1
-	i=$1
+	local g=EV"$i"_GPIO
-	g=EV"$i"_GPIO
+	local gv=${!g}
-	gv=${!g}
+	echo "$gv"
-#	echo "gv = $gv"
+}
+
+#
+# Recupera il valore norain associato ad una elettrovalvola
+# $1 numero elettrovalvola
+#
+function ev_number2norain {
+	local i=$1
+	local g=EV"$i"_NORAIN
+	local gv=${!g}
 	echo "$gv"
 }
 
@@ -731,19 +758,22 @@ function send_identifier {
 # Spenge il sistema 
 #
 function exec_poweroff {
+	trigger_event "exec_poweroff_before" 
 	local PATH_SCRIPT=`$READLINK -f "$DIR_SCRIPT/scripts/poweroff.sh"`
-echo "$PATH_SCRIPT" > tmp/prova.txt
         sleep 15
 	. $PATH_SCRIPT
+	trigger_event "exec_poweroff_after" 
 }
 
 #
 # Spenge il sistema 
 #
 function exec_reboot {
+	trigger_event "exec_reboot_before" 
 	local PATH_SCRIPT=`$READLINK -f "$DIR_SCRIPT/scripts/reboot.sh"`
         sleep 15
 	. $PATH_SCRIPT
+	trigger_event "exec_reboot_after" 
 }
 
 function debug1 {
@@ -756,7 +786,7 @@ function debug2 {
 
 VERSION=0
 SUB_VERSION=5
-RELEASE_VERSION=0
+RELEASE_VERSION=5
 
 DIR_SCRIPT=`dirname $0`
 NAME_SCRIPT=${0##*/}
@@ -782,15 +812,21 @@ fi
 . "$DIR_SCRIPT/include/cron.include.sh"
 . "$DIR_SCRIPT/include/socket.include.sh"
 . "$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_worning"
+LAST_WARNING_FILE="$STATUS_DIR/last_warning"
 LAST_SUCCESS_FILE="$STATUS_DIR/last_success"
 
 if [ -z $LOG_OUTPUT_DRV_FILE ]; then
-	$LOG_OUTPUT_DRV_FILE="/dev/null"
+	LOG_OUTPUT_DRV_FILE="/dev/null"
 fi
 
+if [ -z "$EVENT_DIR" ]; then
+	EVENT_DIR="$DIR_SCRIPT/events"
+fi
+
+
 # Elimina il file di lock se più vecchio di 11 secondi
 if [ -f "$LOCK_FILE" ]; then
 	max_age_lock_file=11
@@ -804,6 +840,8 @@ fi
 send_identifier &
 setup_drv
 
+#echo "EV_MONOSTABLE=$EV_MONOSTABLE"
+
 case "$1" in
 	init) 
 		initialize