This commit is contained in:
2025-03-16 14:06:03 -05:00
parent 5e0acc0896
commit 3749eeffa3
2 changed files with 14 additions and 5 deletions

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
VERS='2.8.27b-03132025'
VERS='2.8.28-03162025'
noheader=' update service dailytemp confsync -r -report test '

View File

@@ -679,7 +679,7 @@ CHECKPOWER_SERVICE(){
[ "${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`
PW_DISCHARGE=0
if (( $(bc <<<"${BATTVOLT} >= ${FLOAT_CHARGE}") )); then
if (( $(bc <<<"${BATTVOLT} >= ${BULK_CHARGE}") )); then
BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Bulk Charging"
@@ -690,6 +690,7 @@ CHECKPOWER_SERVICE(){
BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Standby"
else
BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Discharging"
PW_DISCHARGE=1
fi
if [ ${TESTMODE} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/power.testmode.enabled ]; then
@@ -706,7 +707,7 @@ CHECKPOWER_SERVICE(){
[ ! "${last_battvolt}" ] && last_battvolt=${BATTVOLT}
if (( $(bc <<<"${INPUTACV} >= ${min_acvolt}") )); then
if (( $(bc <<<"${INPUTACV} >= ${min_acvolt}") )) && [ ${PW_DISCHARGE} -eq 0 ]; then
[ "${last_battvolt}" != "${BATTVOLT}" ] && last_battvolt=${BATTVOLT}
if [ -f ${PW_TMPFOLDER}/power.ac.low ]; then
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Back to Normal Voltage" >> ${PW_LOGPOWER}
@@ -761,11 +762,19 @@ BATT AMPS: ${BATTA_disp}" 1
touch ${PW_TMPFOLDER}/power.ac.low
elif [ -f ${PW_TMPFOLDER}/power.ac.good ]; then
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Power OFF or LOW voltage detected" >> ${PW_LOGPOWER}
SENDNOTICE "POWER ALERT - POWER OFF/LOW!!" "Power off or low voltage detected
if (( $(bc <<<"${INPUTACV} >= ${min_acvolt}") )); then
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Power OFF or LOW voltage detected" >> ${PW_LOGPOWER}
SENDNOTICE "POWER ALERT - POWER OFF/LOW!!" "Power off or low voltage detected
GRID VOLTAGE: ${INPUTACV}'volts
BATT VOLTAGE: `IDS_NUMBER_FORMAT ${BATTVOLT}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`% @ ${BATT_FULL}'V)
BATT AMPS: ${BATTA_disp}" 1
else
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Running on Batteries" >> ${PW_LOGPOWER}
SENDNOTICE "POWER ALERT - RUNNING ON BATTERIES!!" "Running on Batteries
GRID VOLTAGE: ${INPUTACV}'volts
BATT VOLTAGE: `IDS_NUMBER_FORMAT ${BATTVOLT}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`% @ ${BATT_FULL}'V)
BATT AMPS: ${BATTA_disp}" 1
fi
rm -f ${PW_TMPFOLDER}/power.ac.good
touch ${PW_TMPFOLDER}/power.ac.low