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

update

Browse Source
This commit is contained in:
David Schroeder
2024-04-21 21:18:49 -05:00
parent ffe50f2d0a
commit cd4b79a07d
2 changed files with 9 additions and 7 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.6.99-04212024' VERS='2.7.1-04212024'
noheader=' update service dailytemp confsync -r -report ' noheader=' update service dailytemp confsync -r -report '

14
inc/temp.inc.sh
View File

@@ -127,7 +127,7 @@ CHECKTEMP(){
until [ ${c} = ${spc1} ]; do spct="${spct} "; c=`expr ${c} + 1`; done until [ ${c} = ${spc1} ]; do spct="${spct} "; c=`expr ${c} + 1`; done
reading="${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}" reading="${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}"
if [ "${average}" = "" ] && [ -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ]; then if [ "${average}" = "" ] && [[ "${SENSOR}" != *"FAN"* ]] && [ -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ]; then
if [ $(bc -l <<< "${temp_f} <= $(echo "scale=2; $(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1)+1.5" | bc)") -eq 1 ] && [ $(bc -l <<< "${temp_f} >= $(echo "scale=2; $(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1)-1.5" | bc)") -eq 1 ]; then if [ $(bc -l <<< "${temp_f} <= $(echo "scale=2; $(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1)+1.5" | bc)") -eq 1 ] && [ $(bc -l <<< "${temp_f} >= $(echo "scale=2; $(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1)-1.5" | bc)") -eq 1 ]; then
reading="${reading} ${idsCL[LightCyan]}\u23F9 " reading="${reading} ${idsCL[LightCyan]}\u23F9 "
elif [ $(bc -l <<< "$(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1) < ${temp_f}") -eq 1 ]; then elif [ $(bc -l <<< "$(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1) < ${temp_f}") -eq 1 ]; then
@@ -1001,13 +1001,15 @@ Previous Temp: ${last_temp}${GAUGESH}"
if [ "${QRY}" != "" ]; then if [ "${QRY}" != "" ]; then
${mysql_conn} -e "${QRY}" ${mysql_conn} -e "${QRY}"
echo "${temp_f}" >| ${PW_TMPFOLDER}/.lastinsert/${SENSOR} echo "${temp_f}" >| ${PW_TMPFOLDER}/.lastinsert/${SENSOR}
if [ ! -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre ]; then if [[ "${SENSOR}" != *"FAN"* ]]; then
echo "${temp_f}" > ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre if [ ! -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre ]; then
echo "${temp_f}" > ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre
elif ([ ! -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre)) -ge 600 ]) || ([ -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old)) -ge 600 ]); then elif ([ ! -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre)) -ge 600 ]) || ([ -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old)) -ge 600 ]); then
mv ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old 2> /dev/null mv ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old 2> /dev/null
echo "${temp_f}" > ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre echo "${temp_f}" > ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre
fi
fi fi