From 81b3c0b2d043de3063a76b775e711e178d42a50b Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 2 Nov 2023 14:05:34 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 6f01d71d..d4e671d4 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -554,9 +554,9 @@ CHECKPOWER(){
 			INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'`
 			INPUTA=`echo ${INVSTATSINFO} | jq '.inputs .inA'`
 			OUTPUTV=`echo ${INVSTATSINFO} | jq '.outputs .outV'`
-			OUTPUTV2=`echo "scale=1; ${OUTPUTV}/2" | bc`
+			OUTPUTV2=`echo "scale=2; ${OUTPUTV}/2" | bc`
 			OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'`
-			OUTPUTA2=`echo "scale=1; ${OUTPUTA}*2" | bc`
+			OUTPUTA2=`echo "scale=2; ${OUTPUTA}*2" | bc`
 			OUTPUTW=`echo ${INVSTATSINFO} | jq '.outputs .outW'`
 			[[ "${OUTPUTW}" == *"."* ]] && [[ "${OUTPUTW}" != *".0"* ]] && OUTPUTW=`printf "%'.2f\n" ${OUTPUTW}` || OUTPUTW=`printf "%'.0f\n" ${OUTPUTW}`
 			BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
@@ -577,7 +577,7 @@ CHECKPOWER(){
 
 		if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then
 			SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
-			SVRRM_VOLT=`echo "scale=1; ${SVRRM_VOLT}/10" | bc`
+			SVRRM_VOLT=`echo "scale=2; ${SVRRM_VOLT}/10" | bc`
 			SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
 			[[ "${SVRRM_WATT}" == *"."* ]] && [[ "${SVRRM_WATT}" != *".0"* ]] && SVRRM_WATT_disp=`printf "%'.2f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
 			SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //')
@@ -586,7 +586,7 @@ CHECKPOWER(){
 
 		if [ "$(CHECK_HOST 10.10.1.210)" != "false" ]; then
 			APCPDU_AMP=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //')
-			APCPDU_AMP=`echo "scale=1; ${APCPDU_AMP}/10" | bc`
+			APCPDU_AMP=`echo "scale=2; ${APCPDU_AMP}/10" | bc`
 			# APCPDU_WATT=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
 			APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
 			[[ "${APCPDU_WATT}" == *"."* ]] && [[ "${APCPDU_WATT}" != *".0"* ]] && APCPDU_WATT_disp=`printf "%'.2f\n" ${APCPDU_WATT}` || APCPDU_WATT_disp=`printf "%'.0f\n" ${APCPDU_WATT}`
@@ -598,7 +598,7 @@ CHECKPOWER(){
 
 		if [ "${SVRRM_VOLT}" != "" ]; then
 			if [ "${APCPDU_AMP}" != "" ]; then
-				NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
+				NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
 				NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
 				[[ "${NETRK_WATT}" == *"."* ]] && [[ "${NETRK_WATT}" != *".0"* ]] && NETRK_WATT=`printf "%'.2f\n" ${NETRK_WATT}` || NETRK_WATT=`printf "%'.0f\n" ${NETRK_WATT}`
 			fi
@@ -624,13 +624,13 @@ CHECKPOWER(){
 	
 	if [ "$(CHECK_HOST 10.2.1.100)" != "false" ]; then
 		OFFSITE_VOLTIN=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.3.2.1.0 | sed 's/.*: //')
-		OFFSITE_VOLTIN=`echo "scale=1; ${OFFSITE_VOLTIN}/10" | bc`
+		OFFSITE_VOLTIN=`echo "scale=2; ${OFFSITE_VOLTIN}/10" | bc`
 		OFFSITE_VOLTOUT=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.1.0 | sed 's/.*: //')
-		OFFSITE_VOLTOUT=`echo "scale=1; ${OFFSITE_VOLTOUT}/10" | bc`	
+		OFFSITE_VOLTOUT=`echo "scale=2; ${OFFSITE_VOLTOUT}/10" | bc`	
 		OFFSITE_LOAD=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.3.0 | sed 's/.*: //')
 		OFFSITE_LOAD=`echo "scale=2; ${OFFSITE_LOAD}/100" | bc`
-		OFFSITE_WATTS=`echo "scale=1; ${OFFSITE_LOAD}*900" | bc`
-		OFFSITE_AMPS=`echo "scale=1; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc`	
+		OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*900" | bc`
+		OFFSITE_AMPS=`echo "scale=2; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc`	
 		
 	fi
 	
@@ -661,7 +661,7 @@ CHECKPOWER(){
 						elif [ "${watts}" == "0" ]; then
 							hostpower="${idsCL[Default]}n/a"
 						else
-							[[ "${watts}" == *"."* ]] && [[ "${watts}" != *".0"* ]] && watts=`printf "%'.1f\n" ${watts}` || watts=`printf "%'.0f\n" ${watts}`
+							[[ "${watts}" == *"."* ]] && [[ "${watts}" != *".0"* ]] && watts=`printf "%'.2f\n" ${watts}` || watts=`printf "%'.0f\n" ${watts}`
 							hostpower="${idsCL[Green]}${watts}'W"
 						fi
 						echo -e "${idsCL[LightCyan]}${PW_iDRACHOST_SHORTNAMES[${host}]}            ${idsCL[Default]}: ${hostpower}${idsCL[Default]}"