From 79882bb29badc49620a75d6355656fd6b3d7981e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 25 Aug 2024 16:48:57 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/defaults.inc b/defaults.inc index db036de8..7de46721 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.7.95-08252024' +VERS='2.7.96-08252024' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 4586e116..baf778c9 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -306,7 +306,13 @@ CHECKPOWER(){ DIVIDER . lightCyan ${PRI_WIDTH} - #### KYLE + ####### KYLE #### + + DIVIDER . lightCyan ${PRI_WIDTH} + [ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---" + echo -en "${idsCL[LightCyan]}Kyle Amps Watts" + [ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo + AD=$(IDS_NUMBER_FORMAT ${KYLE_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done MSG="${idsBG[Blue]}${idsCL[White]}Kyle Total Power Usage ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${KYLE_WATT} 1 yes`'W ${idsBG[Default]}" echo -en "${MSG}" @@ -320,9 +326,9 @@ CHECKPOWER(){ AS=$(IDS_NUMBER_FORMAT ${KYLE_WATT} 1 yes); c=0; spcA=''; spc1=`expr ${wspc} - ${#AS} + 4`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; ((c++)); done AD=$(IDS_NUMBER_FORMAT ${KYLE_AMP_avg} 2 yes); c=0; spcB=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; ((c++)); done - echo -e "${MSG}${idsBG[Blue]}${spcA}${idsCL[LightYellow]}${AD}'A${spcB}`IDS_NUMBER_FORMAT ${KYLE_WATT_avg} 1 yes`'W ${idsBG[Default]}" + echo -e "${MSG}${spcA}${idsCL[LightYellow]}${AD}'A${spcB}`IDS_NUMBER_FORMAT ${KYLE_WATT_avg} 1 yes`'W ${idsCL[Default]}" else - echo -e "${idsBG[Default]}" + echo -e "${idsCL[Default]}" fi DIVIDER . lightCyan ${PRI_WIDTH}