From 1e2c3fe10f9ed59e21000037ceb7eb1f3b7bf848 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 11 Dec 2023 21:11:25 -0600 Subject: [PATCH] update --- defaults.inc | 4 ++++ powerwall.sh | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/defaults.inc b/defaults.inc index 4c8aec14..8394d901 100755 --- a/defaults.inc +++ b/defaults.inc @@ -37,6 +37,10 @@ if [ -f ${PW_FOLDER}/settings.local.conf ]; then declare -A PW_ESXI_HOST_NAMES declare -A PW_VCENTER_HOST_NAMES declare -A PW_iDRACHOST_SHORTNAMES + declare -A PW_INVERTER_ALARMS + declare -A PW_INVERTER_STATES + declare -A PW_INVERTER_MODES + declare -A PW_INVERTER_ERRORS source ${PW_FOLDER}/settings.local.conf diff --git a/powerwall.sh b/powerwall.sh index c87ccc7d..6c737637 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -570,6 +570,12 @@ CHECKPOWER(){ if [ "${INVSTATSINFO}" != "" ]; then INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'` INPUTA=`echo ${INVSTATSINFO} | jq '.inputs .inA'` + INV_ALARM=`echo ${INVSTATSINFO} | jq '.errors .Alms'` + [ "${INV_ALARM}" == "0" ] && INV_ALARM_disp="${idsCL[Green]}No Alarms (${INV_ALARM})" || INV_ALARM_disp="${idsCL[LightRed]}${PW_INVERTER_ALARMS[${INV_ALARM}]}" + INV_ERROR=`echo ${INVSTATSINFO} | jq '.errors .Err'` + [ "${INV_ERROR}" == "0" ] && INV_ERROR_disp="${idsCL[Green]}No Alarms" || INV_ERROR_disp="${idsCL[LightRed]}${PW_INVERTER_ERRORS[${INV_ERROR}]}" + INV_STATE=`echo ${INVSTATSINFO} | jq '.stats .invSTATES'` + INV_MODE=`echo ${INVSTATSINFO} | jq '.stats .power'` OUTPUTV=`echo ${INVSTATSINFO} | jq '.outputs .outV'` OUTPUTV2=`echo "scale=2; ${OUTPUTV}/2" | bc` OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'` @@ -592,6 +598,11 @@ CHECKPOWER(){ fi echo -en "\r\033[K" + echo -e "${idsCL[White]}Inverter State ${idsCL[Default]}: ${idsCL[Green]}${PW_INVERTER_STATES[${INV_STATE}]}" + echo -e "${idsCL[White]}Inverter Mode ${idsCL[Default]}: ${idsCL[Green]}${PW_INVERTER_MODES[${INV_MODE}]}" + echo -e "${idsCL[White]}Inverter Alarms ${idsCL[Default]}: ${INV_ALARM_disp}" + echo -e "${idsCL[White]}Inverter Errors ${idsCL[Default]}: ${INV_ERROR_disp}" + echo echo -e "${idsCL[White]}Inverter Input Volts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTV}`'volts" echo -e "${idsCL[White]}Inverter Input Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTA}`'amps" echo