diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e7e9b2..c0634e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ -# 0.6.0 - xx/04/2020 +# 0.6.0 - 16/06/2020 - Add support for enable all cron fron api -- Update rainsensorqty driver to version 0.2.5 +- Update rainsensorqty driver to version 0.2.5b # 0.5.14 - 24/09/2019 - Updated rainsensorqty driver to version 0.2.3 diff --git a/drv/rainsensorqty/_version_0.2.5 b/drv/rainsensorqty/_version_0.2.5b similarity index 100% rename from drv/rainsensorqty/_version_0.2.5 rename to drv/rainsensorqty/_version_0.2.5b diff --git a/drv/rainsensorqty/drv_rainsensorqty_monitor.sh b/drv/rainsensorqty/drv_rainsensorqty_monitor.sh index 2b06b6b..4a89948 100755 --- a/drv/rainsensorqty/drv_rainsensorqty_monitor.sh +++ b/drv/rainsensorqty/drv_rainsensorqty_monitor.sh @@ -4,8 +4,8 @@ # Author: androtto # file "drv_rainsensorqty_monitor.sh" # monitor script -# Version: 0.2.5 -# Data: 08/Jan/2020 +# Version: 0.2.5b +# Data: 12/May/2020 resetcounter() { @@ -58,13 +58,13 @@ rain_history echo "" en_echo "---- NEW RUN ----" +en_echo "WAITING FOR $RAINSENSORQTY_PULSE PULSE" # loop forever while true do before=`date +%s` sleep $RAINSENSOR_DEBOUNCE - en_echo "WAITING FOR $RAINSENSORQTY_PULSE PULSE" $GPIO -g wfi $gpio_port $RAINSENSORQTY_PULSE now=`date +%s` (( elapsed = now - before )) @@ -75,9 +75,9 @@ do rain_history & fi (( counter+=1 )) - en_echo "$RAINSENSORQTY_PULSE PULSE #$counter RECEIVED" echo "$now:$counter" >> ${RAINSENSORQTY_HISTORYRAW} & MMWATER=$( $JQ -n "$counter*$MMEACH" ) + en_echo $( printf "%s PULSE #%d RECEIVED (%.2f mm)" $RAINSENSORQTY_PULSE $counter $MMWATER ) text=$(printf "%.2f mm height (#%d pulse)" $MMWATER $counter ) if (( counter >= RAINSENSORQTY_LOOPSFORSETRAINING )) ; then drv_rainsensorqty_writelog $f "RAINING - $text" &