From 32eeee313f2164e4885d05cd602d7a2ad1592f47 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 10 Feb 2024 22:37:39 -0600
Subject: [PATCH] update

---
 defaults.inc     |  2 +-
 inc/power.inc.sh | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/defaults.inc b/defaults.inc
index d6cd820f..f5a70139 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.5.289-02102024'
+VERS='2.5.290-02102024'
 
 noheader=' update service dailytemp confsync -r -report '
 
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index f94d573a..02c368d5 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -186,6 +186,28 @@ CHECKPOWER(){
 			echo -en "${idsCL[White]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'watts ${idsCL[Default]}~ est"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "		${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2} 0` watts) ${idsCL[Default]}~ est${idsCL[Default]}"
 		
+			DIVIDER . lightCyan ${PRI_WIDTH}
+			[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data for 'Air Conditioner' ... "
+			AC_INFO=$(curl -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps')
+			AC_AMP=$(echo "${AC_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
+			AC_AMP=$(ROUND_NUMBER $(echo "scale=3; ${AC_AMP}/1000" | bc -l) 2)
+			AC_WATT=$(echo "${AC_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
+			AC_WATT=$(ROUND_NUMBER $(echo "scale=3; ${AC_WATT}/10" | bc -l) 2)
+			
+			# if [ "${avgdays}" != "" ]; then
+			# 	[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
+			# 	echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages  ... "
+			# 	NETRK_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays} both)
+			# 	NETRK_AMP_avg=$(echo ${NETRK_avg} | cut -d'~' -f 1)
+			# 	NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2)
+			# 	echo -en "\r\033[K"
+			# fi
+			[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
+			echo -en "${idsCL[White]}Air Conditioner Amps     ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${AC_AMP}`'amps ${idsCL[Default]}~ est"
+			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${NETRK_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
+			echo -en "${idsCL[White]}Air Conditioner Wattage  ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${AC_WATT} 0`'watts ${idsCL[Default]}~ est"
+			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "		${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2} 0` watts) ${idsCL[Default]}~ est${idsCL[Default]}"
+		
 			DIVIDER . lightCyan ${PRI_WIDTH}
 		fi
 		if [ "${avgdays}" != "" ]; then