voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
David Schroeder
2025-02-08 14:45:21 -06:00
parent 5edf3f2c69
commit 644d69e23b
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='2.8.21-02062025' VERS='2.8.22-02082025'
noheader=' update service dailytemp confsync -r -report test ' noheader=' update service dailytemp confsync -r -report test '

10
inc/power.inc.sh
View File

@@ -649,6 +649,7 @@ CHECKPOWER_SERVICE(){
runEvery=10 #SECONDS runEvery=10 #SECONDS
while true; do while true; do
start=$(date +%s) start=$(date +%s)
log_start=$(date "+%Y-%m-%d %H:%M:%S")
source ${PW_FOLDER}/defaults.inc source ${PW_FOLDER}/defaults.inc
[ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ] && TESTMODE=1 || TESTMODE=0 [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ] && TESTMODE=1 || TESTMODE=0
@@ -843,6 +844,7 @@ Shutting down main servers" 1
end=`date +%s`; runtime=$((end-start)) end=`date +%s`; runtime=$((end-start))
# echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s"
echo "${log_start}~${runtime}~power" >> ${PW_LOGFOLDER}/service.scantimes
[ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy" [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy"
done # & done # &
} }
@@ -852,6 +854,7 @@ OFFSITE_CHECKPOWER_SERVICE(){
runEvery=10 #SECONDS runEvery=10 #SECONDS
while true; do while true; do
start=$(date +%s) start=$(date +%s)
log_start=$(date "+%Y-%m-%d %H:%M:%S")
source ${PW_FOLDER}/defaults.inc source ${PW_FOLDER}/defaults.inc
PW_OFFSITEHOSTS=$(echo ${PW_OFFSITE_HOSTS} | tr ',' ' ') PW_OFFSITEHOSTS=$(echo ${PW_OFFSITE_HOSTS} | tr ',' ' ')
@@ -1008,6 +1011,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F"
end=`date +%s`; runtime=$((end-start)) end=`date +%s`; runtime=$((end-start))
# echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s"
echo "${log_start}~${runtime}~offsite-power" >> ${PW_LOGFOLDER}/service.scantimes
[ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy" [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s ###|| echo "Not sleeping, ran for ${runtime}s previsoulsy"
done done
} }
@@ -1016,6 +1020,9 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F"
POWERLOGGER_SERVICE(){ POWERLOGGER_SERVICE(){
SENDPOWER "POWER LOGGING Service Startup" & SENDPOWER "POWER LOGGING Service Startup" &
while true; do while true; do
start=$(date +%s)
log_start=$(date "+%Y-%m-%d %H:%M:%S")
LogDataTime=`date +'%Y-%m-%d %H:%M:%S'` LogDataTime=`date +'%Y-%m-%d %H:%M:%S'`
source ${PW_FOLDER}/defaults.inc source ${PW_FOLDER}/defaults.inc
@@ -1215,6 +1222,9 @@ POWERLOGGER_SERVICE(){
sleep ${PW_MYSQL_LOG_INTERVAL_NORMAL}m sleep ${PW_MYSQL_LOG_INTERVAL_NORMAL}m
fi fi
end=`date +%s`; runtime=$((end-start))
# echo -e "runtime: ${runtime}s"
echo "${log_start}~${runtime}~powerlogger" >> ${PW_LOGFOLDER}/service.scantimes
done done
} }

4
inc/temp.inc.sh
View File

@@ -804,7 +804,7 @@ AVERAGETEMP(){
fi fi
} }
CHECKTEMP_SERVICE(){ CHECKTEMP_SERVICE(){
cw=20 cw=20
runEvery=60 #SECONDS runEvery=60 #SECONDS
SCAN_THREADS=4 SCAN_THREADS=4
@@ -818,6 +818,7 @@ CHECKTEMP_SERVICE(){
while true; do while true; do
start=$(date +%s) start=$(date +%s)
log_start=$(date "+%Y-%m-%d %H:%M:%S")
source ${PW_FOLDER}/defaults.inc source ${PW_FOLDER}/defaults.inc
# time="$(date +%H)$(date +%M)" # time="$(date +%H)$(date +%M)"
@@ -856,6 +857,7 @@ CHECKTEMP_SERVICE(){
done done
end=`date +%s`; runtime=$((end-start)) end=`date +%s`; runtime=$((end-start))
# echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s" # echo -e "runtime: ${runtime}s"; [ ${runtime} -lt ${runEvery} ] && echo "Sleeping for $(expr ${runEvery} - ${runtime})s"
echo "${log_start}~${runtime}~temp" >> ${PW_LOGFOLDER}/service.scantimes
[ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s [ ${runtime} -lt ${runEvery} ] && sleep $(expr ${runEvery} - ${runtime})s
done # & done # &
} }