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

update

Browse Source
This commit is contained in:
David Schroeder
2023-12-14 17:11:51 -06:00
parent 063b1d1112
commit b5e359ef6f
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
VERS='2.5.23-12142023'
VERS='2.5.25-12142023'
noheader=' update service dailytemp confsync '

2
inc/getInfo.lacrosse.py
View File

@@ -5,7 +5,7 @@ sys.path.insert(0, os.path.abspath('/opt/pylacrossapi'))
from pylacrossapi import lacrosse
device_id = sys.argv[1]
unit_measure = 1
unit_measure = 0
time_zone = 2
device1 = lacrosse(device_id,unit_measure,time_zone)

14
inc/temp.inc.sh
View File

@@ -133,9 +133,15 @@ CHECKTEMPSENSOR(){
fi
if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then
[ "${PW_SENSOR_TYPE[${1}]}" == "cpu" ] && temp_f=$(echo "scale=2; $temp_c/1" | bc -l) || temp_f=$(bc <<< "scale=1; ${temp_c}*1.8+32")
(( $(bc <<<"${temp_f} < 1") )) && [[ "${temp_f}" = *"."* ]] && temp_f="0${temp_f}"
[ "${1}" == "ServerRoomTH" ] && temp_f=`echo "scale=1; ${temp_f}+${PW_ServerRoomTH_Dev}" | bc`
if [ "${PW_SENSOR_TYPE[${1}]}" == "cpu" ]; then
temp_f=$(echo "scale=2; $temp_c/1" | bc -l) || temp_f=$(bc <<< "scale=1; ${temp_c}*1.8+32")
elif (( $(bc <<<"${temp_f} < 1") )) && [[ "${temp_f}" = *"."* ]]; then
temp_f="0${temp_f}"
elif [ "${1}" == "ServerRoomTH" ]; then
temp_f=`echo "scale=1; ${temp_f}+${PW_ServerRoomTH_Dev}" | bc`
elif [ "${1}" == "ServerRoomLA" ]; then
temp_f=${temp_c}
fi
# echo "HERE: '${temp_c}' -> '${temp_f}'"
# echo -en ""
c=0; spct=''; spc1=`expr 6 - ${#temp_f}`; until [ ${c} = ${spc1} ]; do spct="${spct} "; c=`expr ${c} + 1`; done
@@ -526,7 +532,7 @@ GET_LACROSSE_INFO(){
key=${DINFO%%:*}
val=${DINFO##*:}; val=${val//[$'\t\r\n ']}
DEVICE_INFO[${key}]=${val}
echo "'${key}' => '${val}'"
# echo "'${key}' => '${val}'"
done
echo ${DEVICE_INFO['probe_temp']}