From f36fbde9a2c197f5674284e9420733d9393159ad Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 31 May 2025 17:16:45 -0500 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 49b8d8e4..0c485898 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -764,7 +764,7 @@ CHECKPOWER_SERVICE(){ [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ] && TESTMODE=1 || TESTMODE=0 if [[ "${IP}" != "10.6.1"* ]]; then - echo 1 + INVSTATSINFO=$(curl -m 3 -s "http://${PW_INVERTER_IP}/stats.json") SVRRM_UPS_INPUTACV=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.2.2.1.3.1.1 | sed 's/.*: //') @@ -786,17 +786,18 @@ CHECKPOWER_SERVICE(){ fi else - echo 2 [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ] && INVSTATSINFO=1 fi if [ "${INVSTATSINFO}" != "" ] || [ ${TESTMODE} -eq 1 ]; then if [[ "${IP}" != "10.6.1"* ]]; then + echo 1 [ "${TEST_INPUTACV}" != "" ] && INPUTACV=${TEST_INPUTACV} || INPUTACV=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.2.1.33.1.3.3.1.3.1 | sed 's/.*: //') [ "${TEST_BATTVOLT}" != "" ] && BATTVOLT=${TEST_BATTVOLT} || BATTVOLT=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} .1.3.6.1.4.1.476.1.42.3.5.1.10.0 | sed 's/.*: //') BATTLIFE=`echo "scale=2; (${BATTVOLT}*100)/${BATT_FULL}" | bc` else + echo 2 [ "${TEST_INPUTACV}" != "" ] && INPUTACV=${TEST_INPUTACV} || INPUTACV=$(echo ${INVSTATSINFO} | jq '.inputs .inV') [ "${TEST_BATTVOLT}" != "" ] && BATTVOLT=${TEST_BATTVOLT} || BATTVOLT=$(echo ${INVSTATSINFO} | jq '.inputs .battV') BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`