diff --git a/inc/power.inc.sh b/inc/power.inc.sh index be08f275..fe034ba5 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -1196,21 +1196,26 @@ OFFSITE_SENDPOWER(){ GET_TUYA_POWER(){ INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID[${1}]} | jq '.dps') - if [ "$(echo "${INFO}" | grep '"18":')" != "" ]; then - AMP=$(echo "${INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g') - AMP=$(ROUND_NUMBER $(echo "scale=3; ${AMP}/1000" | bc -l) 2) - WATT=$(echo "${INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g') - WATT=$(echo "scale=1; ${WATT}/10" | bc -l) - VOLT=$(echo "${INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g') - VOLT=$(echo "scale=1; ${VOLT}/10" | bc -l) - else - AMP=$(echo "${INFO}" | grep '"4":' | cut -d' ' -f 4 | sed 's/,//g') - AMP=$(ROUND_NUMBER $(echo "scale=3; ${AMP}/1000" | bc -l) 2) - WATT=$(echo "${INFO}" | grep '"5":' | cut -d' ' -f 4 | sed 's/,//g') - WATT=$(echo "scale=1; ${WATT}/10" | bc -l) - VOLT=$(echo "${INFO}" | grep '"6":' | cut -d' ' -f 4 | sed 's/,//g') - VOLT=$(echo "scale=1; ${VOLT}/10" | bc -l) + if [ "${INFO}" != "" ]; then WATT=0 + if [ "$(echo "${INFO}" | grep '"18":')" != "" ]; then + AMP=$(echo "${INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g') + AMP=$(ROUND_NUMBER $(echo "scale=3; ${AMP}/1000" | bc -l) 2) + WATT=$(echo "${INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g') + WATT=$(echo "scale=1; ${WATT}/10" | bc -l) + VOLT=$(echo "${INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g') + 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') + AMP=$(ROUND_NUMBER $(echo "scale=3; ${AMP}/1000" | bc -l) 2) + WATT=$(echo "${INFO}" | grep '"5":' | cut -d' ' -f 4 | sed 's/,//g') + WATT=$(echo "scale=1; ${WATT}/10" | bc -l) + VOLT=$(echo "${INFO}" | grep '"6":' | cut -d' ' -f 4 | sed 's/,//g') + VOLT=$(echo "scale=1; ${VOLT}/10" | bc -l) + fi + [ "${WATT}" != "0" ] && echo "${AMP}:${WATT}:${VOLT}" fi - echo "${AMP}:${WATT}:${VOLT}" } + + +