From f0480665a2417f575f253a40d8c0de636f1ad415 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 10 Mar 2024 21:57:07 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index ed1013e9..e62440aa 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.6.58-03092024' +VERS='2.6.60-03102024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 1e0d6a60..a57f13db 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -571,13 +571,13 @@ CHECKPOWER_SERVICE(){ elif [ -f ${PW_TMPFOLDER}/power.ups.low ]; then rm -f ${PW_TMPFOLDER}/power.ups.low fi - echo 1 + if [ "${INVSTATSINFO}" != "" ] || [ ${TESTMODE} -eq 1 ]; then [ "${TEST_INPUTACV}" != "" ] && INPUTACV=${TEST_INPUTACV} || INPUTACV=$(echo ${INVSTATSINFO} | jq '.inputs .inV') [ "${TEST_BATTVOLT}" != "" ] && BATTVOLT=${TEST_BATTVOLT} || BATTVOLT=$(echo ${INVSTATSINFO} | jq '.inputs .battV') BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` BATTLIFE=`echo "scale=2; (${BATTVOLT}*100)/${BATT_FULL}" | bc` - echo "${BATTA} - ${BATTLIFE}" + if (( $(bc <<<"${BATTVOLT} >= ${FLOAT_CHARGE}") )); then if (( $(bc <<<"${BATTVOLT} >= ${BULK_CHARGE}") )); then BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Bulk Charging" @@ -589,7 +589,7 @@ CHECKPOWER_SERVICE(){ else BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Discharging" fi - echo 3 + if [ ${TESTMODE} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/power.testmode.enabled ]; then touch ${PW_TMPFOLDER}/power.testmode.enabled SENDNOTICE "TEST MODE" "***TEST MODE*** ENABLED!"