From f07a5b41131153100fd85aa7602f2e3b4b388e81 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 31 May 2025 21:07:32 -0500 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 6dad8907..fe1cae0f 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -338,7 +338,17 @@ CHECKPOWER(){ AD2=$(IDS_NUMBER_FORMAT ${UPS_AMPSOUT} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done echo echo -e "${idsCL[LightCyan]} Amps Volts" - echo -e "${idsCL[White]}UPS Input ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[Default]}" + [ "${avgdays}" != "" ] && echo -e " Amps" + echo -en "${idsCL[White]}UPS Input ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[Default]}" + if [ "${avgdays}" == "" ]; then + echo "" + else + echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " + AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ups-input']} ${avgdays} amp) + AMP_avg=$(echo ${avg} | cut -d'~' -f 1) + [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" + echo -e "${idsCL[White]}UPS Input ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[LightYellow]} ${AD}'A${idsCL[Default]}" + fi echo -e "${idsCL[White]}UPS Output ${idsCL[Default]}: ${idsCL[Green]}${AD2}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[Default]}" echo fi