From 3a5c3ef9340938cdb7d81a55c1ee0713513ef508 Mon Sep 17 00:00:00 2001 From: lejubila Date: Tue, 7 Apr 2020 23:20:41 +0200 Subject: [PATCH] Add support for enable all cron fron api --- CHANGELOG.md | 3 ++ include/cron.include.sh | 78 +++++++++++++++++++++++++++++++++++++-- include/socket.include.sh | 6 +++ piGarden.sh | 4 +- 4 files changed, 86 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f25feb..4489523 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 0.6.0 - xx/04/2020 +- Ass support for enable all cron fron api + # 0.5.14 - 24/09/2019 - Updated rainsensorqty driver to version 0.2.3 - Added api and command for manage piGardenSched scheduling diff --git a/include/cron.include.sh b/include/cron.include.sh index 9df8275..72a6445 100644 --- a/include/cron.include.sh +++ b/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 } diff --git a/include/socket.include.sh b/include/socket.include.sh index a4d334b..ba72156 100644 --- a/include/socket.include.sh +++ b/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 diff --git a/piGarden.sh b/piGarden.sh index b82f7db..55e0fc5 100755 --- a/piGarden.sh +++ b/piGarden.sh @@ -983,8 +983,8 @@ function debug2 { } VERSION=0 -SUB_VERSION=5 -RELEASE_VERSION=14 +SUB_VERSION=6 +RELEASE_VERSION=0 DIR_SCRIPT=`dirname $0` NAME_SCRIPT=${0##*/}