This commit is contained in:
2023-12-14 16:57:56 -06:00
parent 81dd2cfbaf
commit 2a8e8a91c9
3 changed files with 3 additions and 4 deletions

View File

@@ -55,7 +55,7 @@ if [ -f ${PW_FOLDER}/settings.local.conf ]; then
declare -A PW_INVERTER_STATES
declare -A PW_INVERTER_MODES
declare -A PW_INVERTER_ERRORS
declare -A PW_TASMOTA_ID
declare -A PW_LACROSSE_ID
source ${PW_FOLDER}/settings.local.conf

View File

@@ -77,8 +77,7 @@ CHECKTEMP(){
echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}"
[ "${avgdays}" != "noavg" ] && echo -en "Pulling data and calculating ${avgdays} Day average ... " || echo -en "Pulling data ... "
reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${avgdays})
[ "${SENSOR}" == "ServerRoomTH" ] && tastemp=" - $(GET_TASMOTA_INFO 'ServerRoomTH')" || tastemp=""
echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}${tastemp}"
echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
echo
fi
fi
@@ -517,7 +516,7 @@ DAILYTEMP(){
GET_TASMOTA_INFO(){
INFO=$(/bin/python3 ${PW_INCFOLDER}/getInfo.tasmota.py "${PW_TASMOTA_ID[${1}]}" | sed -e "s/\[{'//g" | sed -e "s/}\]//g" | sed -e "s/', '/~/g" | sed -e "s/': '/:/g" | sed -e "s/': /:/g")
INFO=$(/bin/python3 ${PW_INCFOLDER}/getInfo.lacrosse.py "${PW_LACROSSE_ID[${1}]}" | 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 DINFO in "${INFO[@]}"; do