From f795076aad0b0e78533ddf62ff663690dcb29aef Mon Sep 17 00:00:00 2001
From: Bogdan Vlaicu <bogdanvlaicu@yahoo.com>
Date: Fri, 8 May 2020 18:10:56 -0400
Subject: [PATCH] rtlamr addon improvements

---
 rtlamr/config.json |  2 +-
 rtlamr/run.sh      | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/rtlamr/config.json b/rtlamr/config.json
index f579225..e705ba8 100755
--- a/rtlamr/config.json
+++ b/rtlamr/config.json
@@ -1,6 +1,6 @@
 {
   "name": "RTLAMR to MQTT Bridge",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "slug": "rtlamr",
   "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",
diff --git a/rtlamr/run.sh b/rtlamr/run.sh
index a1aa95f..248b956 100755
--- a/rtlamr/run.sh
+++ b/rtlamr/run.sh
@@ -31,8 +31,6 @@ echo "Meter IDs =" $METER_IDS
 # Sleep to fill buffer a bit
 sleep 15
 
-LASTVAL="0"
-
 # set a time to listen for. Set to 0 for unliminted
 
 #tail -f /dev/null
@@ -55,14 +53,14 @@ while true; do
     VAL="$(echo $line | jq --raw-output '.Message.Consumption' | tr -s ' ' '_')" # replace ' ' with '_'
     METERID="$(echo $line | jq --raw-output '.Message.ID' | tr -s ' ' '_')"
     MSGTYPE="$(echo $line | jq --raw-output '.Type' | tr -s ' ' '_')"
-    MQTT_PATH="rtlamr/$METERID/reading"
+    MQTT_PATH="rtlamr/$METERID"
 
     # Create file with touch /var/log/rtl_433.log if logging is needed
     [ -w /var/log/rtl_433.log ] && echo $line >> /var/log/rtl_433.log
-    if [ "$VAL" != "$LASTVAL" ]; then
-      echo $VAL | /usr/bin/mosquitto_pub -h $MQTT_HOST -u $MQTT_USER -P $MQTT_PASS -i RTL_433 -r -l -t $MQTT_PATH
-    LASTVAL=$VAL
-    fi
+
+    # Publish to MQTTT
+    echo $VAL | /usr/bin/mosquitto_pub -h $MQTT_HOST -u $MQTT_USER -P $MQTT_PASS -i RTL_433 -r -l -t $MQTT_PATH/reading
+    echo $MSGTYPE | /usr/bin/mosquitto_pub -h $MQTT_HOST -u $MQTT_USER -P $MQTT_PASS -i RTL_433 -r -l -t $MQTT_PATH/type
     
   done