From c664bea16a4eebc0ccf302577c6159c22835c304 Mon Sep 17 00:00:00 2001 From: lejubila Date: Thu, 3 May 2018 12:02:48 +0200 Subject: [PATCH] corretto timestamp su eventi ev_not_open_for_rain, ev_not_open_for_rain_online, ev_not_open_for_rain_sensor --- events/scripts/sendmail.sh | 5 ++--- piGarden.sh | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/events/scripts/sendmail.sh b/events/scripts/sendmail.sh index 53a3519..5e1ef01 100755 --- a/events/scripts/sendmail.sh +++ b/events/scripts/sendmail.sh @@ -67,9 +67,8 @@ case "$EVENT" in "ev_not_open_for_rain" | "ev_not_open_for_rain_online" | "ev_not_open_for_rain_sensor") ALIAS="$2" - FORCE="$3" - TIME=$4 - BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nZONE: $ALIAS\nFORCED IRRIGATION: $FORCE\nTIME: $(/bin/date -d@$TIME)" + 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") diff --git a/piGarden.sh b/piGarden.sh index 0a61e0f..d72094c 100755 --- a/piGarden.sh +++ b/piGarden.sh @@ -93,8 +93,8 @@ function ev_open { local dif=0 let "dif = now - last_rain" if [ $dif -lt $NOT_IRRIGATE_IF_RAIN_ONLINE ]; then - trigger_event "ev_not_open_for_rain_online" "$1" "$2" - trigger_event "ev_not_open_for_rain" "$1" "$2" + 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)" message_write "warning" "Solenoid not open for rain" return @@ -108,8 +108,8 @@ function ev_open { local dif=0 let "dif = now - last_rain" if [ $dif -lt $NOT_IRRIGATE_IF_RAIN_SENSOR ]; then - trigger_event "ev_not_open_for_rain_sensor" "$1" "$2" - trigger_event "ev_not_open_for_rain" "$1" "$2" + 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)" message_write "warning" "Solenoid not open for rain" return