Update power.inc.sh

This commit is contained in:
2024-10-22 22:25:14 -05:00
parent 1a74c1392b
commit 3acdb88274

View File

@@ -333,8 +333,7 @@ CHECKPOWER(){
declare -A OFFSITE_MISC
for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do
GET_TUYA_POWER ${mSENSOR}
#OFFSITE_MISC[${mSENSOR}]=$(GET_TUYA_POWER ${mSENSOR})
OFFSITE_MISC[${mSENSOR}]=$(GET_TUYA_POWER ${mSENSOR})
done
fi
@@ -1356,19 +1355,15 @@ OFFSITE_SENDPOWER(){
}
GET_TUYA_POWER(){
echo "HERE: $1 - http://${PW_REMOTE_SENSORS[${1}]}:8888/status/${PW_SENSOR_DEVICEID[${1}]}"
INFO=$(curl -m 3 -s http://${PW_REMOTE_SENSORS[${1}]}:8888/status/${PW_SENSOR_DEVICEID[${1}]} | jq '.dps')
if [ "${INFO}" != "" ]; then
WATT=-1
if [ "$(echo "${INFO}" | grep '"18":')" != "" ]; then
AMP=$(echo "${INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
echo "amp=$AMP"
AMP=$(ROUND_NUMBER $(echo "scale=3; ${AMP}/1000" | bc -l) 2)
WATT=$(echo "${INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
echo "wall=$WATT"
WATT=$(echo "scale=1; ${WATT}/10" | bc -l)
VOLT=$(echo "${INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
echo "volt=$VOLT"
VOLT=$(echo "scale=1; ${VOLT}/10" | bc -l)
elif [ "$(echo "${INFO}" | grep '"6":')" != "" ]; then
AMP=$(echo "${INFO}" | grep '"4":' | cut -d' ' -f 4 | sed 's/,//g')
@@ -1380,7 +1375,6 @@ GET_TUYA_POWER(){
fi
[ "${WATT}" != "-1" ] && echo "${AMP}:${WATT}:${VOLT}" || echo "0:0:0"
fi
echo
}