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

Update temp.inc.sh

Browse Source
This commit is contained in:
David Schroeder
2023-12-14 22:23:23 -06:00
parent 1b1a394b07
commit b6936fd99f
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inc/temp.inc.sh
View File

@@ -271,19 +271,10 @@ CHECKTEMP_SERVICE(){
elif [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "lacrosse" ]; then elif [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "lacrosse" ]; then
INFO=$(curl -s --get -d "deviceid=${PW_LACROSSE_ID[${1}]}" -d "limit=1" -d "metric=1" -d "timezone=2" https://decent-destiny-704.appspot.com/laxservices/device_info.php | jq) INFO=$(curl -s --get -d "deviceid=${PW_LACROSSE_ID[${1}]}" -d "limit=1" -d "metric=1" -d "timezone=2" https://decent-destiny-704.appspot.com/laxservices/device_info.php | jq)
temp_c=$(echo ${INFO} | jq -r '.device0 .obs[].ambient_temp') temp_probe_c=$(echo ${INFO} | jq -r '.device0 .obs[].ambient_temp')
temp_probe_c=$(echo ${INFO} | jq -r '.device0 .obs[].probe_temp') temp_c=$(echo ${INFO} | jq -r '.device0 .obs[].probe_temp')
temp_h=$(echo ${INFO} | jq -r '.device0 .obs[].humidity') temp_h=$(echo ${INFO} | jq -r '.device0 .obs[].humidity')
INFO=$(/bin/python3 ${PW_INCFOLDER}/getInfo.lacrosse.py "${PW_LACROSSE_ID[${SENSOR}]}" | sed -e "s/\[{'//g" | sed -e "s/}\]//g" | sed -e "s/', '/~/g" | sed -e "s/': '/:/g" | sed -e "s/': /:/g")
IFS=$'~'; read -rd '' -a INFO <<<"${INFO}"; unset IFS; declare -A DEVICE_INFO
for DINFOtmp in "${INFO[@]}"; do key=${DINFOtmp%%:*}; val=${DINFOtmp##*:}; val=${val//[$'\t\r\n ']}; DEVICE_INFO[${key}]=${val}; done
temp_c=${DEVICE_INFO['ambient_temp']}
temp_probe_c=${DEVICE_INFO['probe_temp']}
temp_h=${DEVICE_INFO['humidity']}
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ]; then elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ]; then
temp_c=$(vcgencmd measure_temp) temp_c=$(vcgencmd measure_temp)
temp_c=${temp_c%\'*}; temp_c=${temp_c#*=} temp_c=${temp_c%\'*}; temp_c=${temp_c#*=}
@@ -470,7 +461,8 @@ Previous Temp: ${last_temp[${SENSOR//-/}]}${GAUGESH}"
fi fi
${mysql_conn} -e "${QRY}" ${mysql_conn} -e "${QRY}"
if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "lacrosse" ]; then if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "lacrosse" ]; then
${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID["${SENSORa}-Probe"]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_probe_c}')" temp_probe_f=$(bc <<< "scale=1; ${temp_probe_c}*1.8+32")
${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID["${SENSORa}-Probe"]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_probe_f}')"
fi fi
touch ${PW_TMPFOLDER}/${SENSOR}.insert touch ${PW_TMPFOLDER}/${SENSOR}.insert
fi fi