From bae8966ce35f10bb667b879289197b2134d3d5b1 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 15 May 2024 21:44:12 -0500
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 3f6874be..d37eecd8 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -786,9 +786,8 @@ OFFSITE_CHECKPOWER_SERVICE(){
 			
 			if (( $(bc <<<"${OFFSITE_WATTS} < 100") )); then
 				TOTAL_MISC_WATTS=0
-				for mSENSOR in "${!OFFSITE_MISC[@]}"; do
-					IFS=: read -r AMP WATT VOLT <<< ${OFFSITE_MISC[${mSENSOR}]}; unset IFS
-					TOTAL_MISC_WATTS=`echo "scale=2; ${TOTAL_MISC_WATTS}+${WATT}" | bc`
+				for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do
+					TOTAL_MISC_WATTS=`echo "scale=2; ${TOTAL_MISC_WATTS}+$(GET_TUYA_POWER ${mSENSOR})" | bc`
 				done
 				(( $(bc <<<"${OFFSITE_WATTS} < ${TOTAL_MISC_WATTS}") )) && OFFSITE_WATTS=${TOTAL_MISC_WATTS}
 			fi
@@ -999,16 +998,15 @@ POWERLOGGER_SERVICE(){
 			
 			if (( $(bc <<<"${OFFSITE_WATTS} < 100") )); then
 				TOTAL_MISC_WATTS=0; TOTAL_MISC_AMPS=0
-				for mSENSOR in "${!OFFSITE_MISC[@]}"; do
-					IFS=: read -r AMP WATT VOLT <<< ${OFFSITE_MISC[${mSENSOR}]}; unset IFS
-					echo "- ${mSENSOR} - $WATT"
+				for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do
+					IFS=: read -r AMP WATT VOLT <<< $(GET_TUYA_POWER ${mSENSOR}); unset IFS
 					TOTAL_MISC_WATTS=`echo "scale=2; ${TOTAL_MISC_WATTS}+${WATT}" | bc`
 					TOTAL_MISC_AMPS=`echo "scale=2; ${TOTAL_MISC_AMPS}+${AMP}" | bc`
 				done
+				echo "2: ${TOTAL_MISC_WATTS}"
 				if (( $(bc <<<"${OFFSITE_WATTS} < ${TOTAL_MISC_WATTS}") )); then
 					OFFSITE_WATTS=${TOTAL_MISC_WATTS}
 					OFFSITE_AMPS=${TOTAL_MISC_AMPS}
-					echo "2: ${TOTAL_MISC_WATTS}"
 				fi
 			fi
 			echo "HERE: ${OFFSITE_WATTS}"