From f1c1af26432ab9fd5e0d20e7a703e643261902a1 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 17 Dec 2023 15:56:20 -0600 Subject: [PATCH] update --- defaults.inc | 13 +++++++++++-- inc/power.inc.sh | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/defaults.inc b/defaults.inc index b8b27ba2..b416c055 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.37-12172023' +VERS='2.5.40-12172023' noheader=' update service dailytemp confsync ' @@ -69,9 +69,18 @@ fi # RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) SENDNOTICE(){ - [ "${PUSHOVER_APP_TOKEN}" != "" ] && PUSH_TO_MOBILE "${2} + if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then + if [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ]; then + PUSH_TO_MOBILE "***TEST MODE*** + +${2} $(date)" "${1}" ${3} & + else + PUSH_TO_MOBILE "${2} + +$(date)" "${1}" ${3} & + fi [ "${EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date +%Y-%m-%d-%H-%M-%S)" | mail -s "${1}" ${EMAIL_NOTICE} diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 540efa1d..f3731d2a 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -323,6 +323,8 @@ CHECKPOWER_SERVICE(){ while true; do source /opt/idssys/powerwall/defaults.inc + [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ] && TESTMODE=1 || TESTMODE=0 + INVSTATSINFO=$(curl -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/.*: //') @@ -343,9 +345,22 @@ CHECKPOWER_SERVICE(){ rm -f ${PW_TMPFOLDER}/power.ups.low fi - if [ "${INVSTATSINFO}" != "" ]; then + if [ "${INVSTATSINFO}" != "" ] || [ ${TESTMODE} -eq 1 ]; then [ "${TEST_INPUTACV}" != "" ] && INPUTACV=${TEST_INPUTACV} || INPUTACV=$(echo ${INVSTATSINFO} | jq '.inputs .inV') [ "${TEST_BATTVOLT}" != "" ] && BATTVOLT=${TEST_BATTVOLT} || BATTVOLT=$(echo ${INVSTATSINFO} | jq '.inputs .battV') + + if [ ${TESTMODE} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/power.testmode.enabled ]; then + touch ${PW_TMPFOLDER}/power.testmode.enabled + SENDNOTICE "TEST MODE" "***TEST MODE*** ENABLED!" + echo "($(date +'%Y-%m-%d %H:%M:%S')) - Input: ${INPUTACV}'volts - Battery: ${BATTVOLT}'volts - ***TEST MODE*** ENABLED" >> ${PW_LOGFILE} + echo "($(date +'%Y-%m-%d %H:%M:%S')) - Input: ${INPUTACV}'volts - Battery: ${BATTVOLT}'volts - ***TEST MODE*** ENABLED" >> ${PW_LOGPOWER} + elif [ ${TESTMODE} -eq 0 ] && [ -f ${PW_TMPFOLDER}/power.testmode.enabled ]; then + rm -f ${PW_TMPFOLDER}/power.testmode.enabled + SENDNOTICE "TEST MODE" "***TEST MODE*** DISABLED!" + echo "($(date +'%Y-%m-%d %H:%M:%S')) - Input: ${INPUTACV}'volts - Battery: ${BATTVOLT}'volts - ***TEST MODE*** DISABLED" >> ${PW_LOGFILE} + echo "($(date +'%Y-%m-%d %H:%M:%S')) - Input: ${INPUTACV}'volts - Battery: ${BATTVOLT}'volts - ***TEST MODE*** DISABLED" >> ${PW_LOGPOWER} + fi + [ ! "${last_battvolt}" ] && last_battvolt=${BATTVOLT} if (( $(bc <<<"${INPUTACV} >= ${min_acvolt}") )); then