version 0.2.1

drv/rainsensorqty/commands/rainsensorqty_CHECK.sh

@@ -2,7 +2,7 @@
 #
 # Driver rainsensorqty - driver for measure the rain volume
 # Author: androtto
-# file "test_rainsensorqty_CHECK.sh"
+# file "rainsensorqty_CHECK.sh"
 # test script for checking rain status using drv_rainsensorqty_rain_sensor_get function
 # Version: 0.2.0
 # Data: 11/Aug/2019

drv/rainsensorqty/commands/rainsensorqty_HISTORY.sh

@@ -2,10 +2,10 @@
 #
 # Driver rainsensorqty - driver for measure the rain volume
 # Author: androtto
-# file "test_rainsensorqty_CHECK.sh"
+# file "rainsensorqty_CHECK.sh"
 # test script for checking rain status using drv_rainsensorqty_rain_sensor_get function
-# Version: 0.2.0
-# Data: 11/Aug/2019
+# Version: 0.2.0a
+# Data: 13/Aug/2019
 
 SCRIPTDIR="$(cd `dirname $0` ; pwd )"
 SCRIPTNAME=${0##*/}
@@ -27,14 +27,7 @@ LOG_OUTPUT_DRV_FILE="$DIR_SCRIPT/log/$LOG_OUTPUT_DRV_FILE"
 . ./init.include.sh
 . ./rainsensor.include.sh
 
+rain_history # update rain history file if not
+
 echo "RAIN HISTORY"
-rain_history
-
-cat $RAINSENSORQTY_HISTORY | while read line
-do
-	set -- ${line//:/ }
-	when=$1
-	howmuch=$2
-	printf "RAINED on %s for %.2f mm\n" "$(date --date="@$1")" $( $JQ -n "$howmuch * $RAINSENSORQTY_MMEACH" )
-done
-
+cat $RAINSENSORQTY_HISTORY | rain_when_amount

drv/rainsensorqty/commands/rainsensorqty_INIT.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # Driver rainsensorqty - driver for measure the rain volume
 # Author: androtto
-# file "test_rainsensorqty_INIT.sh"
+# file "rainsensorqty_INIT.sh"
 # test script for initialize driver and executing monitor process
 # Version: 0.2.0
 # Data: 11/Aug/2019

drv/rainsensorqty/commands/rainsensorqty_KILL.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
+# Driver rainsensorqty - driver for measure the rain volume
+# Author: androtto
+# file "rainsensorqty_KILL.sh"
+# script for killing monitor process(es)
+# Version: 0.2.0a
+# Data: 29/Aug/2019
+
 
 SCRIPTDIR="$(cd `dirname $0` ; pwd )"
 SCRIPTNAME=${0##*/}
@@ -43,6 +50,7 @@ if [[ -f "$RAINSENSORQTY_MONPID" ]] ; then
 	else
 		echo "no RAIN process alive"
         fi
-
+else
+	echo "no RAIN process alive"
 fi
 

drv/rainsensorqty/commands/rainsensorqty_RAINNOW.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 # Driver rainsensorqty - driver for measure the rain volume
 # Author: androtto
-# file "test_rainsensorqty_RAINNOW.sh"
+# file "rainsensorqty_RAINNOW.sh"
 # test script for simulate rain ... now!
-# Version: 0.2.0
-# Data: 11/Aug/2019
+# Version: 0.2.0a
+# Data: 13/Aug/2019
 
 SCRIPTDIR="$(cd `dirname $0` ; pwd )"
 SCRIPTNAME=${0##*/}
@@ -24,4 +24,8 @@ fi
 . ./init.include.sh
 . ./rainsensor.include.sh
 
+echo "RAIN now!"
 echo "$(date +%s):$RAINSENSORQTY_LOOPSFORSETRAINING" > ${RAINSENSORQTY_LASTRAIN}
+echo "file ${RAINSENSORQTY_LASTRAIN} updated."
+echo -e "\nLAST RAIN:"
+cat $RAINSENSORQTY_LASTRAIN | rain_when_amount

drv/rainsensorqty/commands/rainsensorqty_REMOVELASTRAIN.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+# Driver rainsensorqty - driver for measure the rain volume
+# Author: androtto
+# file "test_rainsensorqty_CHECK.sh"
+# test script for checking rain status using drv_rainsensorqty_rain_sensor_get function
+# Version: 0.2.0a
+# Data: 13/Aug/2019
+
+SCRIPTDIR="$(cd `dirname $0` ; pwd )"
+SCRIPTNAME=${0##*/}
+cd $SCRIPTDIR/.. # command is a subdirectory of driver
+
+DIR_SCRIPT=/home/pi/piGarden # home directory of piGarden
+CONFIG_ETC="/etc/piGarden.conf"
+TMP_PATH="/run/shm"
+if [ ! -d "$TMP_PATH" ]; then
+        TMP_PATH="/tmp"
+fi
+
+LOG_OUTPUT_DRV_FILE="$DIR_SCRIPT/log/$LOG_OUTPUT_DRV_FILE"
+
+. $CONFIG_ETC
+
+. ./common.include.sh
+. ./config.include.sh
+. ./init.include.sh
+. ./rainsensor.include.sh
+
+# two variables for store rain data
+# RAINSENSORQTY_LASTRAIN
+# RAINSENSORQTY_HISTORY
+
+rain_history # update rain history file if not
+
+echo "RAIN HISTORY - last five events"
+tail -5 $RAINSENSORQTY_HISTORY | rain_when_amount
+
+echo -e "\nLAST RAIN"
+cat $RAINSENSORQTY_LASTRAIN | rain_when_amount
+
+#exit # for test
+
+echo -e "\nbackup to .old files"
+cp -p $RAINSENSORQTY_HISTORY ${RAINSENSORQTY_HISTORY}.old
+cp -p  $RAINSENSORQTY_LASTRAIN ${RAINSENSORQTY_LASTRAIN}.old
+
+echo "...removing last event"
+head -n-1 ${RAINSENSORQTY_HISTORY}.old > $RAINSENSORQTY_HISTORY 
+tail -1 $RAINSENSORQTY_HISTORY > $RAINSENSORQTY_LASTRAIN 
+
+echo -e "\nnew RAIN HISTORY - last five events"
+tail -5 $RAINSENSORQTY_HISTORY | rain_when_amount
+
+echo -e "\nnew LAST RAIN"
+cat $RAINSENSORQTY_LASTRAIN | rain_when_amount

drv/rainsensorqty/commands/rainsensorqty_RESET.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+# Driver rainsensorqty - driver for measure the rain volume
+# Author: androtto
+# file "rainsensorqty_RESET.sh"
+# script for reset counter in monitor script
+# Version: 0.2.0a
+# Data: 29/Aug/2019
+
+SCRIPTDIR="$(cd `dirname $0` ; pwd )"
+SCRIPTNAME=${0##*/}
+cd $SCRIPTDIR/.. # command is a subdirectory of driver
+
+DIR_SCRIPT=/home/pi/piGarden # home directory of piGarden
+CONFIG_ETC="/etc/piGarden.conf"
+TMP_PATH="/run/shm"
+if [ ! -d "$TMP_PATH" ]; then
+        TMP_PATH="/tmp"
+fi
+
+. $CONFIG_ETC
+
+. ./config.include.sh
+. ./common.include.sh
+. ./init.include.sh
+. ./rainsensor.include.sh
+
+# check if rain monitor process is running...
+if [[ -f "$RAINSENSORQTY_MONPID" ]] ; then
+        pid="$( < "$RAINSENSORQTY_MONPID" )"
+        if ps -fp $pid >/dev/null ; then
+		echo "sending SIGUSR1 to $pid"
+		kill -SIGUSR1 $pid
+		echo -e "sent SIGUSR1 - reset will be shown after next cycle"
+	else
+		echo "no RAIN process alive"
+        fi
+else
+	echo "no RAIN process alive"
+fi