From dafd4e0a334dfbcd2dd98e86ba5bb6132bb9f0a1 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 12 Jan 2024 09:28:25 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index cf0a030c..822843c8 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -235,6 +235,14 @@ CHECKPOWER(){ fi [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" + if [ "${avgdays}" != "" ]; then + echo -en "${idsCL[Yellow]}Calculating Offsite Averages ... " + OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both) + OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1) + OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2) + echo -en "\r\033[K" + fi + echo -e "${idsCL[White]}UPS Voltage In ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTIN}`'volts${idsCL[Default]}" echo -e "${idsCL[White]}UPS Voltage Out ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}" [ ${REPORT} -eq 0 ] && echo @@ -243,15 +251,10 @@ CHECKPOWER(){ echo -e "${idsCL[White]}Battery Runtime ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'Mins${idsCL[Default]}" [ ${REPORT} -eq 0 ] && echo - echo -e "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ${idsCL[Default]}~ est${idsCL[Green]}${idsCL[Default]}" - MSG="${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'watts ${idsCL[Default]}~ est" - echo -en "${MSG}" - if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average} 0`'watts" - echo -en "\r\033[K"; echo -e "${MSG}${idsCL[LightYellow]}${average_disp}" - fi - echo -e "${idsCL[Default]}\n" + echo -en "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ${idsCL[Default]}~ est${idsCL[Green]}${idsCL[Default]}" + [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg}`'amps" || echo -e "${idsCL[Default]}" + echo -en "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'watts ${idsCL[Default]}~ est" + [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 0`'watts" || echo -e "${idsCL[Default]}\n" # echo -e "${idsCL[LightCyan]}Current Fan Speed ${idsCL[Default]}: ${idsCL[Green]}${FanSpeed}'%${idsCL[Default]}" # echo