From c42cdeaf812227bd871c74056a8810ef137ec356 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 19 May 2025 22:30:53 -0500
Subject: [PATCH] update

---
 inc/power.inc.sh | 18 +++++++++---------
 inc/temp.inc.sh  |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index b3161632..bef7d41e 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -190,7 +190,7 @@ CHECKPOWER(){
 			echo
 		fi
 		
-		echo -en "${idsCL[White]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTV}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`% @ ${BATT_FULL}'V)"
+		echo -en "${idsCL[White]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTV}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`'% @ ${BATT_FULL}'V)"
 		[ "${TEST_BATTVOLT}" != "" ] && echo -e "  ${idsCL[Yellow]}***TEST MODE***" || echo ""
 		echo -e "${idsCL[White]}Battery Amps Chg/DChg    ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}"
 		echo
@@ -346,9 +346,9 @@ CHECKPOWER(){
 			echo -e "${idsCL[White]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTIN}`'volts${idsCL[Default]}"
 			echo -e "${idsCL[White]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}"
 		fi
-		echo -e "${idsCL[White]}UPS Load Usage           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_LOAD}%${idsCL[Default]}"
+		echo -e "${idsCL[White]}UPS Load Usage           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_LOAD}'%${idsCL[Default]}"
 		[ ${REPORT} -eq 0 ] && echo
-		echo -e "${idsCL[White]}UPS Battery Capacity     ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`%${idsCL[Default]}"
+		echo -e "${idsCL[White]}UPS Battery Capacity     ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`'%${idsCL[Default]}"
 		echo -e "${idsCL[White]}UPS Battery Runtime      ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'mins${idsCL[Default]}"
 		if [ ${REPORT} -eq 0 ]; then
 			echo -e "${idsCL[White]}UPS Battery Voltage      ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_VOLT}'volts${idsCL[Default]}"
@@ -713,7 +713,7 @@ CHECKPOWER_SERVICE(){
 					echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Back to Normal Voltage" >> ${PW_LOGPOWER}
 					SENDNOTICE "POWER NOMINAL AGAIN" "Normal voltage detected
 GRID VOLTAGE:	${INPUTACV}'volts
-BATT VOLTAGE:	`IDS_NUMBER_FORMAT ${BATTVOLT}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`% @ ${BATT_FULL}'V)
+BATT VOLTAGE:	`IDS_NUMBER_FORMAT ${BATTVOLT}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`'% @ ${BATT_FULL}'V)
 BATT AMPS:		${BATTA_disp}"
 				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}
@@ -721,7 +721,7 @@ BATT AMPS:		${BATTA_disp}"
 						SENDNOTICE "POWER Startup - Nominal" "Service Startup
 Normal voltage detected
 GRID VOLTAGE:	${INPUTACV}'volts
-BATT VOLTAGE:	`IDS_NUMBER_FORMAT ${BATTVOLT}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`% @ ${BATT_FULL}'V)
+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}
@@ -754,7 +754,7 @@ BATT AMPS:		${BATTA_disp}"
 					SENDNOTICE "POWER Startup - POWER OFF/LOW -${PW_DISCHARGE}- !!" "Service Startup
 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 VOLTAGE:	`IDS_NUMBER_FORMAT ${BATTVOLT}`'volts ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`'% @ ${BATT_FULL}'V)
 BATT AMPS:		${BATTA_disp}" 1
 					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
@@ -766,13 +766,13 @@ BATT AMPS:		${BATTA_disp}" 1
 						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 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 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
@@ -938,7 +938,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F"
 				# elif [ ${OFFSITE_BATT_CAP%.*} -lt 100 ] && [ ! -f ${PW_TMPFOLDER}/power.offsite.charging ]; then
 				elif [ ${OFFSITE_BATT_CAP%.*} -lt 100 ] && ([ ! -f ${PW_TMPFOLDER}/power.offsite.charging ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.charging)) -gt 60 ]); then
 					# touch ${PW_TMPFOLDER}/power.offsite.charging
-					echo "${OFFSITE_BATT_CAP%.*}%" >| ${PW_TMPFOLDER}/power.offsite.charging
+					echo "${OFFSITE_BATT_CAP%.*}'%" >| ${PW_TMPFOLDER}/power.offsite.charging
 				fi
 				if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; then
 					if [ -f ${PW_TMPFOLDER}/shutdown.OFFSITE ]; then
diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index fcd41743..6c4f99d9 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -135,6 +135,7 @@ CHECKTEMP(){
 							lclr="${idsCL[Green]}"
 							lmd="Normal  "
 						fi
+						
 						c=0; spct=''; [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && spc1=`expr 4 - ${#temp_f}` || spc1=`expr 7 - ${#temp_f}`
 						until [ ${c} = ${spc1} ]; do spct="${spct} "; ((c++)); done
 						if [[ "${SENSOR}" = *"FAN"* ]]; then
@@ -142,6 +143,7 @@ CHECKTEMP(){
 						else
 							reading="${lclr}${lmd}${spct}"$(IDS_NUMBER_FORMAT ${temp_f} 2 yes)"${GAUGESH}"
 						fi
+						
 						[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
 						echo -en "${idsCL[White]}${idsST[Bold]}${SENSOR_DESC}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading} "