wbruno/Home-Assistant-Addons
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtlamr fix for missing meter ids

Browse Source
This commit is contained in:
Bogdan Vlaicu
2020-05-07 17:38:06 -04:00
parent bd227ef015
commit c6bc47e7f1
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rtlamr/config.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "RTLAMR to MQTT Bridge", "name": "RTLAMR to MQTT Bridge",
"version": "0.1.11", "version": "0.1.12",
"slug": "rtlamr", "slug": "rtlamr",
"description": "RF to MQTT Bridge based on RTL_SDR/RTL_433 for RTL2832U based DVB-T USB tuners", "description": "RF to MQTT Bridge based on RTL_SDR/RTL_433 for RTL2832U based DVB-T USB tuners",
"url": "https://github.com/bvlaicu/home-assistant-addons/tree/master/rtlamr", "url": "https://github.com/bvlaicu/home-assistant-addons/tree/master/rtlamr",
rtlamr/run.sh
+13 -13
View File
@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
export LANG=C export LANG=C
PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
@@ -11,8 +11,8 @@ CONFIG_PATH=/data/options.json
MQTT_HOST="$(jq --raw-output '.mqtt_host' $CONFIG_PATH)" MQTT_HOST="$(jq --raw-output '.mqtt_host' $CONFIG_PATH)"
MQTT_USER="$(jq --raw-output '.mqtt_user' $CONFIG_PATH)" MQTT_USER="$(jq --raw-output '.mqtt_user' $CONFIG_PATH)"
MQTT_PASS="$(jq --raw-output '.mqtt_password' $CONFIG_PATH)" MQTT_PASS="$(jq --raw-output '.mqtt_password' $CONFIG_PATH)"
MQTT_MSGTYPE="$(jq --raw-output '.msg_type' $CONFIG_PATH)" MSG_TYPE="$(jq --raw-output '.msg_type' $CONFIG_PATH)"
MQTT_IDS="$(jq --raw-output '.meter_ids' $CONFIG_PATH)" METER_IDS="$(jq --raw-output '.meter_ids // empty' $CONFIG_PATH)"
# Start the listener and enter an endless loop # Start the listener and enter an endless loop
@@ -21,8 +21,8 @@ echo "MQTT Host =" $MQTT_HOST
echo "MQTT User =" $MQTT_USER echo "MQTT User =" $MQTT_USER
#MQTT_PASS_REDACTED=$(sed 's/^......./*******/' <<<$MQTT_PASS) #MQTT_PASS_REDACTED=$(sed 's/^......./*******/' <<<$MQTT_PASS)
#echo "MQTT Password =" $MQTT_PASS_REDACTED #echo "MQTT Password =" $MQTT_PASS_REDACTED
echo "Message Type =" $MQTT_MSGTYPE echo "Message Type =" $MSG_TYPE
echo "Meter IDs =" $MQTT_IDS echo "Meter IDs =" $METER_IDS
#set -x ## uncomment for MQTT logging... #set -x ## uncomment for MQTT logging...
@@ -37,16 +37,16 @@ LASTVAL="0"
#tail -f /dev/null #tail -f /dev/null
if [ -z ${METER_IDS+x} ] || [${METER_IDS} = ""]; then
ID_FILTER_OPTION=""
else
ID_FILTER_OPTION="-filterid=$METER_IDS"
fi
# Do this loop, so will restart if buffer runs out # Do this loop, so will restart if buffer runs out
while true; do while true; do
/go/bin/rtlamr -format json -msgtype=$MSG_TYPE $ID_FILTER_OPTION | while read line
if [[ -z ${MQTT_IDS+x} ] || [${MQTT_IDS} = ""] || [${MQTT_IDS} = "null"]]; then
ID_FILTER_OPTION=""
else
ID_FILTER_OPTION="-filterid=$MQTT_IDS"
fi
/go/bin/rtlamr -format json -msgtype=$MQTT_MSGTYPE $ID_FILTER_OPTION | while read line
do do
VAL="$(echo $line | jq --raw-output '.Message.Consumption' | tr -s ' ' '_')" # replace ' ' with '_' VAL="$(echo $line | jq --raw-output '.Message.Consumption' | tr -s ' ' '_')" # replace ' ' with '_'