From d93ad66f3958c436695d3f95cc5c92c0b5a8bc7c Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 15 Dec 2017 10:44:59 +0100 Subject: [PATCH] Revert "Bugfix when temperature is not present or readings are invalid" This reverts commit 7f2337ed538abcbc09845617c2cc0ba0522ed25a. --- packages/bsp/common/usr/bin/armbianmonitor | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/bsp/common/usr/bin/armbianmonitor b/packages/bsp/common/usr/bin/armbianmonitor index edba2a41b5..2a49f50293 100755 --- a/packages/bsp/common/usr/bin/armbianmonitor +++ b/packages/bsp/common/usr/bin/armbianmonitor @@ -344,23 +344,18 @@ MonitorMode() { ;; esac if [ "X${SocTemp}" != "Xn/a" ]; then - read SocTemp <"${Sensors}/soctemp" 2>/dev/null - if [ ! -z $(echo "$SocTemp" | grep -o "^[1-9][0-9]*\.\?[0-9]*$") ] && (( $(echo "${SocTemp} > 1000" |bc -l) )); then + read SocTemp <"${Sensors}/soctemp" + if [ ${SocTemp} -ge 1000 ]; then SocTemp=$(awk '{printf ("%0.1f",$1/1000); }' <<<${SocTemp}) - echo -e " $(printf "%4s" ${SocTemp})°C\c" - else - echo -e " n/a\c" fi + echo -e " $(printf "%4s" ${SocTemp})°C\c" fi if [ "X${PMICTemp}" != "Xn/a" ]; then - read PMICTemp <"${Sensors}/pmictemp" 2>/dev/null - if [ ! -z $(echo "$PMICTemp" | grep -o "^[1-9][0-9]*\.\?[0-9]*$") ] && (( $(echo "${PMICTemp} > 1000" |bc -l) )); then + read PMICTemp <"${Sensors}/pmictemp" + if [ ${PMICTemp} -ge 1000 ]; then PMICTemp=$(awk '{printf ("%0.1f",$1/1000); }' <<<${PMICTemp}) - echo -e " $(printf "%4s" ${PMICTemp})°C\c" - else - echo -e " n/a\c" fi - + echo -e " $(printf "%4s" ${PMICTemp})°C\c" fi [ "X${DCIN}" != "Xn/a" ] && \ (DCINvoltage=$(awk '{printf ("%0.2f",$1/1000000); }' <"${DCIN}") ; echo -e " $(printf "%5s" ${DCINvoltage})V\c")