From c3cfcecd2f02134658a94ca90b5960f0f866010f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 15 May 2023 09:24:39 -0500 Subject: [PATCH] update --- defaults.inc | 9 +++++---- powerwall.sh | 8 ++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index 1421cf90..d387ce47 100755 --- a/defaults.inc +++ b/defaults.inc @@ -14,11 +14,12 @@ min_battvolt_sys=47 #47 FOLDER='/opt/idssys/powerwall' -logfile=${FOLDER}/logfile -logacv=${FOLDER}/log-acv +LOGFOLDER=${FOLDER}/logs +[ ! -d ${LOGFOLDER} ] && mkdir ${LOGFOLDER} +logfile=${LOGFOLDER}/logfile +logacv=${LOGFOLDER}/log-acv [ ! -f ${logacv} ] && touch ${logacv} -logtemp=${FOLDER}/log-temp -[ ! -f ${logtemp} ] && touch ${logtemp} + declare -A TEMP_THRESHOLDS TEMP_THRESHOLDS['ServerRoomTH']="83,88,95" diff --git a/powerwall.sh b/powerwall.sh index e357eae7..5e98c2aa 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -77,9 +77,13 @@ CHECKTEMP_SERVICE(){ cw=20 declare -A last_temp while true; do - errtime=$(expr `date +%s` - $(stat -c %Y ${logtemp})) - [ $errtime -ge 3600 ] && relog=1 || relog=0 + for SENSOR in ${!SENSOR_ID[@]}; do + logtemp=${LOGFOLDER}/log-temp-${SENSOR} + [ ! -f ${logtemp} ] && touch ${logtemp} + errtime=$(expr `date +%s` - $(stat -c %Y ${logtemp})) + [ $errtime -ge 3600 ] && relog=1 || relog=0 + if [ "${SENSOR_TYPE[${SENSOR}]}" == "mqtt" ]; then mqtt_message=`${mqtt_conn} -t tele/${SENSOR}/SENSOR -C 1` echo $mqtt_message | cut -d':' -f 7 | cut -d',' -f 1 | read temp_h