diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cb48aa..2e6376c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 0.5.15 - xx/xx/2019 +- Added api for manage piGardenSched scheduling + # 0.5.13 - 12/08/2019 - Added driver rainsensorqty for menage rainfall detection based on quantity diff --git a/include/socket.include.sh b/include/socket.include.sh index 33259fa..a4d334b 100644 --- a/include/socket.include.sh +++ b/include/socket.include.sh @@ -205,6 +205,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 diff --git a/piGarden.sh b/piGarden.sh index 1511957..792d80f 100755 --- a/piGarden.sh +++ b/piGarden.sh @@ -732,6 +732,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" } @@ -852,6 +854,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 @@ -1178,6 +1205,10 @@ case "$1" in get_cron_close) get_cron_close $2 ;; + + cmd_pigardensched) + cmd_pigardensched $2 $3 $4 $5 + ;; reboot) exec_reboot