diff --git a/inc/power.inc.sh b/inc/power.inc.sh index acda5584..af92c350 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -333,7 +333,6 @@ CHECKPOWER(){ declare -A OFFSITE_MISC for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do - echo "${mSENSOR} - $(GET_TUYA_POWER ${mSENSOR})" OFFSITE_MISC[${mSENSOR}]=$(GET_TUYA_POWER ${mSENSOR}) done @@ -1361,10 +1360,13 @@ GET_TUYA_POWER(){ 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')