From 7beabf009f8d74ba7d87ed28425600405019c489 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 31 May 2025 21:18:43 -0500 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index abe43e4f..80ce1798 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -350,7 +350,7 @@ CHECKPOWER(){ fi AD2=$(IDS_NUMBER_FORMAT ${UPS_AMPSOUT} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done - echo -e "${idsCL[White]}UPS Output ${idsCL[Default]}: ${idsCL[Green]}${AD2}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[Default]}" + echo -en "${idsCL[White]}UPS Output ${idsCL[Default]}: ${idsCL[Green]}${AD2}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[Default]}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ups-output']} ${avgdays} amp) @@ -362,7 +362,9 @@ CHECKPOWER(){ echo fi - echo -e "${idsCL[White]}UPS Load Usage ${idsCL[Default]}: ${idsCL[Green]}${UPS_LOAD}'%${idsCL[Default]}" + echo -en "${idsCL[White]}UPS Load Usage ${idsCL[Default]}: ${idsCL[Green]}${UPS_LOAD}'%${idsCL[Default]}" + [ "${avgdays}" != "" ] && echo -e "${idsCL[LightCyan]} Watts" || echo "" + echo -en "${idsCL[White]}UPS Watts ${idsCL[Default]}: ${idsCL[Green]}${UPS_WATTS}'W${idsCL[Default]}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... "