From bbb8f70e4e0b6329a75161ebfd3839dcc33fbc09 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 19 Jul 2025 09:33:17 -0500
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 82c779fa..00cef04d 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -483,6 +483,7 @@ CHECKPOWER(){
 			POWER_STRIP_DATA=$(kasa --type strip --json --host 10.2.1.234 energy)
 			OFFSITE_WATTS=$(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.power_mw')/1000" | tr -d $'\r' | bc -l)
 			OFFSITE_AMPS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.current_ma')/1000" | tr -d $'\r' | bc -l))
+			OFFSITE_VOLTS=$(echo $(echo "scale=2; $(echo ${POWER_STRIP_DATA} | jq '.voltage_mv')/1000" | tr -d $'\r' | bc -l))
 			
 			declare -A OFFSITE_MISC
 			for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do
@@ -521,20 +522,22 @@ CHECKPOWER(){
 			AD2=$(IDS_NUMBER_FORMAT ${AMP} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done
 			AD3=$(IDS_NUMBER_FORMAT ${WATT} 1 yes)
 		
-			[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W"
-			if [ "${avgdays}" == "" ]; then
-				c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done
-				[ ${REPORT} -eq 0 ] && echo -e "${spc3}${VOLT}'V${idsCL[Default]}"
-			else
-				echo -en "${idsCL[Yellow]}	Calculating ${avgdays_disp} Average ... "
-				avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both)
-				AMP_avg=$(echo ${avg} | cut -d'~' -f 1)
-				WATT_avg=$(echo ${avg} | cut -d'~' -f 2)
-				[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
+			if [ ${REPORT} -eq 0 ]; then
 				echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W"
+				if [ "${avgdays}" == "" ]; then
+					c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done
+					[ ${REPORT} -eq 0 ] && echo -e "${spc3}${VOLT}'V${idsCL[Default]}"
+				else
+					echo -en "${idsCL[Yellow]}	Calculating ${avgdays_disp} Average ... "
+					avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both)
+					AMP_avg=$(echo ${avg} | cut -d'~' -f 1)
+					WATT_avg=$(echo ${avg} | cut -d'~' -f 2)
+					[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
+					echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W"
 			
-				AD=$(IDS_NUMBER_FORMAT ${AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-				echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${WATT_avg} 1 yes`'W"
+					AD=$(IDS_NUMBER_FORMAT ${AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+					echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${WATT_avg} 1 yes`'W"
+				fi
 			fi
 		done
 		
@@ -562,7 +565,8 @@ CHECKPOWER(){
 			AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 			echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 1 yes`'W"
 		else
-			echo
+			c=0; spc3=''; spca=`expr ${wspc} - ${#AW}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done
+			echo -e "${spc3}${OFFSITE_VOLTS}'V${idsCL[Default]}"
 		fi
 				
 		# echo -en "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${AD}'A ${idsCL[Default]}~ est${idsCL[Green]}${idsCL[Default]}"