From 88606390363d8a93ff79e848cdc3e70a14ab7575 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 11 Feb 2024 17:25:46 -0600
Subject: [PATCH] update

---
 defaults.inc     |  2 +-
 inc/power.inc.sh | 28 ++++++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index cb48b0e7..8663465f 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.6.1-02112024'
+VERS='2.6.10-02112024'
 
 noheader=' update service dailytemp confsync -r -report '
 
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 57947f3d..3104ce43 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -235,7 +235,7 @@ CHECKPOWER(){
 			DIVIDER . darkGray ${PRI_WIDTH}
 			
 			AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			MSG="${idsCL[White]}Equipment Subtotal       ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W"
+			MSG="${idsCL[LightCyan]}Equipment Subtotal       ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W"
 			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}	Calculating Server Room Total Averages  ... "
@@ -271,7 +271,7 @@ CHECKPOWER(){
 			DIVIDER . darkGray ${PRI_WIDTH}
 			
 			AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			MSG="${idsCL[White]}Server Room Total w/AIR  ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
+			MSG="${idsCL[LightCyan]}Server Room Total w/AIR  ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
 			echo -en "${MSG}"
 			if [ "${avgdays}" != "" ]; then
 				echo -en "${idsCL[Yellow]}	Calculating Server Room w/AIR Total Averages  ... "
@@ -314,6 +314,17 @@ CHECKPOWER(){
 			OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc`
 			OFFSITE_BATT_VOLT=$(echo "${upsinfo}" | grep 'battery.voltage:' | sed 's/.*: //')
 			OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //')
+			
+			OFFSITE_FIREWALL_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['offsite-firewall']} | jq '.dps')
+			OFFSITE_FIREWALL_AMP=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
+			OFFSITE_FIREWALL_AMP=$(ROUND_NUMBER $(echo "scale=3; ${OFFSITE_FIREWALL_AMP}/1000" | bc -l) 2)
+			OFFSITE_FIREWALL_WATT=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
+			OFFSITE_FIREWALL_WATT=$(echo "scale=1; ${OFFSITE_FIREWALL_WATT}/10" | bc -l)
+			OFFSITE_WIFI_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['offsite-wifi']} | jq '.dps')
+			OFFSITE_WIFI_AMP=$(echo "${OFFSITE_WIFI_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
+			OFFSITE_WIFI_AMP=$(ROUND_NUMBER $(echo "scale=3; ${OFFSITE_WIFI_AMP}/1000" | bc -l) 2)
+			OFFSITE_WIFI_WATT=$(echo "${OFFSITE_WIFI_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
+			OFFSITE_WIFI_WATT=$(echo "scale=1; ${OFFSITE_WIFI_WATT}/10" | bc -l)
 		fi
 		
 		[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
@@ -324,10 +335,15 @@ CHECKPOWER(){
 		echo -e "${idsCL[White]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}"
 		echo -e "${idsCL[White]}UPS Load Usage           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_LOAD}%${idsCL[Default]}"
 		[ ${REPORT} -eq 0 ] && echo
-		echo -e "${idsCL[White]}Battery Capacity         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`%${idsCL[Default]}"
-		echo -e "${idsCL[White]}Battery Runtime          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'Mins${idsCL[Default]}"
-		echo -e "${idsCL[White]}Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_VOLT}'volts${idsCL[Default]}"
-				
+		echo -e "${idsCL[White]}UPS Battery Capacity         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`%${idsCL[Default]}"
+		echo -e "${idsCL[White]}UPS Battery Runtime          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'Mins${idsCL[Default]}"
+		echo -e "${idsCL[White]}UPS Battery Voltage          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_VOLT}'volts${idsCL[Default]}"
+		[ ${REPORT} -eq 0 ] && echo
+		AD=$(IDS_NUMBER_FORMAT ${OFFSITE_FIREWALL_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+		echo -e "${idsCL[White]}Firewall Power Usage         ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_FIREWALL_WATT} 0`'W"
+		AD=$(IDS_NUMBER_FORMAT ${OFFSITE_WIFI_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+		echo -e "${idsCL[White]}WiFo Power Usage             ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WIFI_WATT} 0`'W"
+		
 		DIVIDER . lightCyan ${PRI_WIDTH}
 		[ "${avgdays}" != "" ] && echo -e "							--${idsCL[LightYellow]}${avgdays_disp}-Averages---"
 		echo -en "${idsCL[LightCyan]}Totals                   : Amps        Watts"