roberto/PiGarden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corretto timestamp su eventi ev_not_open_for_rain, ev_not_open_for_rain_online, ev_not_open_for_rain_sensor

Browse Source
This commit is contained in:
lejubila
2018-05-03 12:02:48 +02:00
parent 78fa176848
commit c664bea16a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
events/scripts/sendmail.sh
View File

@@ -67,9 +67,8 @@ case "$EVENT" in
"ev_not_open_for_rain" | "ev_not_open_for_rain_online" | "ev_not_open_for_rain_sensor") "ev_not_open_for_rain" | "ev_not_open_for_rain_online" | "ev_not_open_for_rain_sensor")
ALIAS="$2" ALIAS="$2"
FORCE="$3" TIME=$3
TIME=$4 BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nZONE: $ALIAS\nTIME: $(/bin/date -d@$TIME)"
BODY="PiGarden triggered new event\n\nEVENT: $EVENT\nZONE: $ALIAS\nFORCED IRRIGATION: $FORCE\nTIME: $(/bin/date -d@$TIME)"
;; ;;
"check_rain_sensor_before" | "check_rain_sensor_after" | "check_rain_sensor_change") "check_rain_sensor_before" | "check_rain_sensor_after" | "check_rain_sensor_change")

8
piGarden.sh
View File

@@ -93,8 +93,8 @@ function ev_open {
local dif=0 local dif=0
let "dif = now - last_rain" let "dif = now - last_rain"
if [ $dif -lt $NOT_IRRIGATE_IF_RAIN_ONLINE ]; then 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_online" "$1"
trigger_event "ev_not_open_for_rain" "$1" "$2" trigger_event "ev_not_open_for_rain" "$1"
log_write "Solenoid '$1' not open for rain (online check)" log_write "Solenoid '$1' not open for rain (online check)"
message_write "warning" "Solenoid not open for rain" message_write "warning" "Solenoid not open for rain"
return return
@@ -108,8 +108,8 @@ function ev_open {
local dif=0 local dif=0
let "dif = now - last_rain" let "dif = now - last_rain"
if [ $dif -lt $NOT_IRRIGATE_IF_RAIN_SENSOR ]; then 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_sensor" "$1"
trigger_event "ev_not_open_for_rain" "$1" "$2" trigger_event "ev_not_open_for_rain" "$1"
log_write "Solenoid '$1' not open for rain (sensor check)" log_write "Solenoid '$1' not open for rain (sensor check)"
message_write "warning" "Solenoid not open for rain" message_write "warning" "Solenoid not open for rain"
return return