From 809cc694bad5eae9c4bd30b1d89ac9704cd2cc44 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 28 Oct 2023 13:42:48 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index daf78fd8..fd26ee6c 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -707,16 +707,17 @@ POWERLOGGER_SERVICE(){
 		outA=`echo ${INVSTATSINFO} | jq '.outputs .outA'`
 		battV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 		xfA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
-		
-		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_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`
 	
 		SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.2.1 | sed 's/.*: //')
 		SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.4.1 | sed 's/.*: //')
 		SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.3.1 | sed 's/.*: //')
 		SVRRM_AMP=`echo "scale=1; ${SVRRM_AMP}/10" | bc`
-	
+		
+		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_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=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
+			
 		NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
 		NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`		
 		QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('3','${datetime}','${inV}','${inA}')"