diff --git a/defaults.inc b/defaults.inc index d0ed2b3d..1325bdc8 100755 --- a/defaults.inc +++ b/defaults.inc @@ -63,6 +63,7 @@ if [ -f ${PW_FOLDER}/settings.local.conf ]; then declare -A PW_INVERTER_MODES declare -A PW_INVERTER_ERRORS declare -A PW_SENSOR_DEVICEID + declare -A PW_OFFSITE_UPS_CODES source ${PW_FOLDER}/settings.local.conf diff --git a/inc/power.inc.sh b/inc/power.inc.sh index f21eb691..b6c343e9 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -312,11 +312,13 @@ CHECKPOWER(){ OFFSITE_BATT_RUNTIME=$(echo "${upsinfo}" | grep 'battery.runtime:' | sed 's/.*: //') OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc` OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //') - + OFFSITE_STATUS=$(echo "${upsinfo}" | grep 'ups.status:' | sed 's/.*: //') fi [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" + echo -e "${idsCL[White]}UPS Status ${idsCL[Default]}: ${idsCL[Green]}${PW_OFFSITE_UPS_CODES[${OFFSITE_STATUS}]}${idsCL[Default]}" + 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