diff --git a/defaults.inc b/defaults.inc index 63bfabeb..7d6fbd81 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.56-12242023' +VERS='2.5.57-12242023' noheader=' update service dailytemp confsync ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 28121405..f67bad01 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -321,7 +321,7 @@ CHECKPOWER_SERVICE(){ touch ${PW_TMPFOLDER}/power.ac.start touch ${PW_TMPFOLDER}/power.dc.start while true; do - source /opt/idssys/powerwall/defaults.inc + source ${PW_FOLDER}/defaults.inc [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ] && TESTMODE=1 || TESTMODE=0 @@ -543,6 +543,7 @@ Shutting down main servers" 1 POWERLOGGER_SERVICE(){ while true; do LogDataTime=`date +'%Y-%m-%d %H:%M:%S'` + source ${PW_FOLDER}/defaults.inc INVSTATSINFO=$(curl -s "http://${PW_INVERTER_IP}/stats.json") if [ "${INVSTATSINFO}" != "" ]; then diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index bf28f5e5..5087dc6c 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -245,7 +245,7 @@ CHECKTEMP_SERVICE(){ declare -A last_temp echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - 'Check Temp' Service Startup" >> ${PW_LOGFILE} while true; do - source /opt/idssys/powerwall/defaults.inc + source ${PW_FOLDER}/defaults.inc # start=`date +%s` # time="$(date +%H)$(date +%M)" diff --git a/run.sh b/run.sh index 5d896956..87afcb8c 100755 --- a/run.sh +++ b/run.sh @@ -40,7 +40,7 @@ if [ "${1}" == "update" ]; then git pull >/dev/null 2>&1 git submodule update --remote >/dev/null 2>&1 /bin/chmod +x /opt/idssys/powerwall/powerwall.sh 2>&1 - source /opt/idssys/powerwall/defaults.inc + source ${PW_FOLDER}/defaults.inc if [ "${2}" != "q" ]; then echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[Green]}Update to v${VERS} complete${idsCL[Default]}\n"