From 729ecbb3d20b67cf4d49753a116a36437bc72f37 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 10 Mar 2024 00:00:36 -0600
Subject: [PATCH] update

---
 defaults.inc     | 2 +-
 inc/power.inc.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 10682a87..ed1013e9 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.6.57-03092024'
+VERS='2.6.58-03092024'
 
 noheader=' update service dailytemp confsync -r -report '
 
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index de10c0ea..794fbd06 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -375,8 +375,8 @@ CHECKPOWER(){
 		[ "${avgdays}" != "" ] && echo -e "							--${idsCL[LightYellow]}${avgdays_disp}-Averages---"
 		echo -en "${idsCL[LightCyan]}Totals                     Amps        Watts"
 		[ "${avgdays}" != "" ] && echo -e "		Amps        Watts" || echo
-		[ "${OFFSITE_AMPS}" != "0" ] && AD=${OFFSITE_AMPS} || AD=${TOTAL_MISC_AMPS}
-		[ "${OFFSITE_WATTS}" != "0" ] && AW=${OFFSITE_WATTS} || AW=${TOTAL_MISC_WATTS}
+		(( $(bc <<<"${OFFSITE_AMPS} < ${TOTAL_MISC_WATTS}") )) && AD=${TOTAL_MISC_AMPS} || AD=${OFFSITE_AMPS}
+		(( $(bc <<<"${OFFSITE_WATTS} < ${TOTAL_MISC_WATTS}") )) && AW=${TOTAL_MISC_WATTS} || AW=${OFFSITE_WATTS}
 		AD=$(IDS_NUMBER_FORMAT ${AD} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 		echo -en "${idsCL[White]}Offsite Equipment        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 0`'W"
 		if [ "${avgdays}" != "" ]; then