From 2a8e8a91c95c889f5d001f2341cf37f8a08c372c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 14 Dec 2023 16:57:56 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/{getInfo.tasmota.py => getInfo.lacrosse.py} | 0 inc/temp.inc.sh | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) rename inc/{getInfo.tasmota.py => getInfo.lacrosse.py} (100%) diff --git a/defaults.inc b/defaults.inc index 19057680..46f9a0d0 100755 --- a/defaults.inc +++ b/defaults.inc @@ -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 diff --git a/inc/getInfo.tasmota.py b/inc/getInfo.lacrosse.py similarity index 100% rename from inc/getInfo.tasmota.py rename to inc/getInfo.lacrosse.py diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 17ee60d8..f22e0d08 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -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