From f014ea7fbcdaa1ffdb11917e91448e6e6e85569b Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 6 Feb 2024 21:55:24 -0600
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 9b0c0d01..8d6a56d7 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -402,8 +402,8 @@ CHECKPOWER_SERVICE(){
 		
 		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')
-			
+			[ "${TEST_BATTVOLT}" != "" ] && BATTVOLT=${TEST_BATTVOLT} || BATTVOLT=$(echo ${INVSTATSINFO} | jq '.inputs .battV')	
+				
 			if [ ${TESTMODE} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/power.testmode.enabled ]; then
 				touch ${PW_TMPFOLDER}/power.testmode.enabled
 				SENDNOTICE "TEST MODE" "***TEST MODE*** ENABLED!"
@@ -427,10 +427,25 @@ VOLTAGE: ${INPUTACV}'volts"
 				else
 					[ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge $(echo "scale=0; ${PW_LOG_INTERVAL_NORMAL}*60" | bc) ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts - Normal Voltage" >> ${PW_LOGPOWER}
 					if [ -f ${PW_TMPFOLDER}/power.ac.start ]; then
+						BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
+						BATTLIFE=`echo "scale=2; (${BATTV}*100)/${BATT_FULL}" | bc`
+						if (( $(bc <<<"${BATTV} >= ${FLOAT_CHARGE}") )); then
+							if (( $(bc <<<"${BATTV} >= ${BULK_CHARGE}") )); then
+								BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Bulk Charging"
+							else
+								BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Float Charging"
+							fi
+						elif [ "${BATTA}" = "-0.1" ] || [ "${BATTA}" = "-0.2" ] || [ "${BATTA}" = "-0.3" ]; then
+							BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Standby"
+						else
+							BATTA_disp="`IDS_NUMBER_FORMAT ${BATTA}`'amps - Discharging"
+						fi	
 						SENDNOTICE "POWER Startup - Nominal" "Service Startup
 Normal voltage detected
 VOLTAGE: ${INPUTACV}'volts
-BATT VOLTAGE: ${BATTVOLT}'volts"
+BATT VOLTAGE: `IDS_NUMBER_FORMAT ${BATTVOLT}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`% @ ${BATT_FULL}'V)
+BATT AMPS: ${BATTA_disp}"
+
 						echo "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Power' Service Startup - Normal voltage detected - Input: ${INPUTACV}'volts" >> ${PW_LOGPOWER}
 						rm -f ${PW_TMPFOLDER}/power.ac.start
 					fi