diff --git a/defaults.inc b/defaults.inc index 41c85ac7..4ca0b711 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PW_VERS='2.11.9-07122025' +PW_VERS='2.11.11-07122025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index d1fbbc81..75d64473 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -874,7 +874,7 @@ BATT VOLTAGE: `IDS_NUMBER_FORMAT ${BATTVOLT}`'V ~ (`IDS_NUMBER_FORMAT ${BATTLIFE else [ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge $(echo "scale=0; ${PW_LOG_INTERVAL_NORMAL}*60" | tr -d $'\r' | bc) ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'V - Normal Voltage" >> ${PW_LOGPOWER} if [ -f ${PW_TMPFOLDER}/power.ac.start ]; then - SENDNOTICE "POWER Startup - Nominal" "Service Startup + [ ! -f ${NM_TMPFOLDER}/.nosend_update ] && SENDNOTICE "POWER Startup - Nominal" "Service Startup Normal voltage detected GRID VOLTAGE: ${INPUTACV}'V BATT VOLTAGE: `IDS_NUMBER_FORMAT ${BATTVOLT}`'V ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`'% @ ${BATT_FULL}'V)" @@ -901,11 +901,11 @@ BATT VOLTAGE: `IDS_NUMBER_FORMAT ${BATTVOLT}`'V ~ (`IDS_NUMBER_FORMAT ${BATTLIFE else [ $(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) -ge 300 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'V / ${BATTVOLT}'V - Power OFF or LOW" >> ${PW_LOGPOWER} if [ -f ${PW_TMPFOLDER}/power.ac.start ]; then - SENDNOTICE "POWER Startup - POWER OFF/LOW -${PW_DISCHARGE}- !!" "Service Startup + [ ! -f ${NM_TMPFOLDER}/.nosend_update ] && SENDNOTICE "POWER Startup - POWER OFF/LOW -${PW_DISCHARGE}- !!" "Service Startup Power off or low voltage detected GRID VOLTAGE: ${INPUTACV}'V BATT VOLTAGE: `IDS_NUMBER_FORMAT ${BATTVOLT}`'V ~ (`IDS_NUMBER_FORMAT ${BATTLIFE}`'% @ ${BATT_FULL}'V)" 1 - echo "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Power' Service Startup - Normal voltage detected - Input: ${INPUTACV}'V" >> ${PW_LOGPOWER} + echo "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Power' Service Startup - OWER OFF/LOW - Input: ${INPUTACV}'V" >> ${PW_LOGPOWER} rm -f ${PW_TMPFOLDER}/power.ac.start rm -f ${PW_TMPFOLDER}/power.ac.good touch ${PW_TMPFOLDER}/power.ac.low @@ -1089,7 +1089,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F" if [ "${startup}" = "true" ]; then echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'V - ${OFFSITE_WATTS}'W - ${OFFSITE_BATT_CAP}'% Battery - ${OFFSITE_BATT_RUNTIME}'mins - Service startup" >> ${PW_LOGPOWER} echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'V - ${OFFSITE_BATT_CAP}'% Battery - Service startup" >> ${PW_LOGFILE} - OFFSITE_SENDPOWER "OFFSITE MONITOR Service Startup" & + [ ! -f ${NM_TMPFOLDER}/.nosend_update ] && OFFSITE_SENDPOWER "OFFSITE MONITOR Service Startup" & startup=false fi @@ -1190,7 +1190,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F" POWERLOGGER_SERVICE(){ - SENDPOWER "POWER LOGGING Service Startup" & + [ ! -f ${NM_TMPFOLDER}/.nosend_update ] && SENDPOWER "POWER LOGGING Service Startup" & while true; do start=$(date +%s) log_start=$(date "+%Y-%m-%d %H:%M:%S") diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index f02b44a2..30a53378 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -847,7 +847,7 @@ AVERAGETEMP(){ CHECKTEMP_SERVICE(){ cw=20 - [[ "${IP}" != "10.6."* ]] && SENDTEMPS "TEMP Service Startup" & + ([ ! -f ${NM_TMPFOLDER}/.nosend_update ] && [[ "${IP}" != "10.6."* ]]) && SENDTEMPS "TEMP Service Startup" & [ ! -d ${PW_TMPFOLDER}/.lastfancheck ] && mkdir ${PW_TMPFOLDER}/.lastfancheck [ ! -d ${PW_TMPFOLDER}/.lastinsert ] && mkdir ${PW_TMPFOLDER}/.lastinsert diff --git a/run.sh b/run.sh index dc61eee4..f7389856 100755 --- a/run.sh +++ b/run.sh @@ -49,6 +49,7 @@ if [ "${1}" == "update" ]; then echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[Green]}Update to v${PW_VERS} complete${idsCL[Default]}" fi + touch ${NM_TMPFOLDER}/.nosend_update if [ "${2}" != "q" ] && [ "${2}" != "y" ] && [ "${2}" != "n" ]; then if [ -f ${NM_TMPFOLDER}/.singleserver.PW.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO.primary ]; then echo -en "${idsCL[LightCyan]}Do you want to restart PowerWall Services as well? (y/N): " @@ -68,6 +69,7 @@ if [ "${1}" == "update" ]; then elif [ "${2}" == "q" ]; then ([ -f ${NM_TMPFOLDER}/.singleserver.PW.primary ] || [ -f ${NM_TMPFOLDER}/.singleserver.PWO.primary ]) && ${PW_SCRIPT} service all restart >/dev/null 2>&1 fi + rm -f ${NM_TMPFOLDER}/.nosend_update elif [ "${2}" != "q" ]; then echo -en "\e[1A";