roberto/PiGarden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix return value when get value of sensor

Browse Source
This commit is contained in:
lejubila
2021-08-28 12:17:22 +02:00
parent 81ce03e90a
commit a30e1cb6ef
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/sensor.include.sh
View File

@@ -20,7 +20,8 @@ function sensor_get_state {
sensor_set_state $1 $2 "" sensor_set_state $1 $2 ""
fi fi
return `cat "$STATUS_DIR/sensor$1_$2"` local state=$(cat "$STATUS_DIR/sensor$1_$2" 2> /dev/null)
echo $state
} }
# #
@@ -71,8 +72,8 @@ function sensor_status_all {
av=${!a} av=${!a}
for t in $SENSOR_STATE_TYPE for t in $SENSOR_STATE_TYPE
do do
sensor_get_state $i $t local state=$(sensor_get_state $i $t)
echo -e "$av: $t $?" echo -e "$av: $t $state"
done done
done done
} }
@@ -88,14 +89,12 @@ function sensor_status {
if [ -z "$2" ]; then if [ -z "$2" ]; then
for t in $SENSOR_STATE_TYPE for t in $SENSOR_STATE_TYPE
do do
sensor_get_state $i $t local state=$(sensor_get_state $i $t)
echo -e "$av: $t $?" echo -e "$av: $t $state"
done done
else else
sensor_get_state $i $2 local state=$(sensor_get_state $i $2)
local state=$?
echo -e "$state" echo -e "$state"
return $state
fi fi
} }
@@ -143,8 +142,8 @@ function json_sensor_status_all {
js_type="" js_type=""
for t in $SENSOR_STATE_TYPE for t in $SENSOR_STATE_TYPE
do do
sensor_get_state $i $t local state=$(sensor_get_state $i $t)
js_type="$js_type \"$t\": \"$?\", " js_type="$js_type \"$t\": \"$state\", "
done done
js_type="${js_type::-2}" js_type="${js_type::-2}"
js_item="$js_item \"$av\":{$js_type}, "; js_item="$js_item \"$av\":{$js_type}, ";