Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdr2mqtt/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ENV MQTT_HOST=127.0.0.1 \
DEBUG=False \
LANG=C.UTF-8

LABEL Maintainer="Jeffrey Stone" \
LABEL Maintainer="Art Hanner" \
Description="This image is used to start the RTL433 to HASS script that will monitor for 433Mhz devices and send the data to an MQTT server"

WORKDIR /data
Expand All @@ -34,4 +34,4 @@ RUN apk add --no-cache rtl-sdr rtl_433 libusb mosquitto-clients python3 py3-paho
chmod +x /scripts/rtl_433_mqtt_hass.py

# Execute entry script
ENTRYPOINT [ "/scripts/entry.sh" ]
ENTRYPOINT [ "/scripts/entry.sh" ]
4 changes: 2 additions & 2 deletions sdr2mqtt/config.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "SDR to Home Assistant",
"version": "0.1.24",
"version": "0.1.24.U10",
"slug": "sdr2mqtt",
"description": "SDR/RTL Sensors to Home Assistant via MQTT with Autodiscovery",
"url": "https://github.com/thejeffreystone/hassio_addons",
"url": "https://github.com/sandsnper/hassio_addons",

"startup": "services",
"arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
Expand Down
2 changes: 1 addition & 1 deletion sdr2mqtt/entry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ bashio::log.info "AUTO_DISCOVERY =" $AUTO_DISCOVERY
bashio::log.info "DEBUG =" $DEBUG
bashio::log.blue "::::::::rtl_433 running output::::::::"

rtl_433 $FREQUENCY $PROTOCOL -C $UNITS -F mqtt://$MQTT_HOST:$MQTT_PORT,user=$MQTT_USERNAME,pass=$MQTT_PASSWORD,retain=$MQTT_RETAIN,events=$MQTT_TOPIC/events,states=$MQTT_TOPIC/states,devices=$MQTT_TOPIC[/model][/id][/channel:A] -M time:tz:local -M protocol -M level | /scripts/rtl_433_mqtt_hass.py
rtl_433 $FREQUENCY $PROTOCOL -C $UNITS -F mqtt://$MQTT_HOST:$MQTT_PORT,user=$MQTT_USERNAME,pass=$MQTT_PASSWORD,retain=$MQTT_RETAIN,events=$MQTT_TOPIC/events,states=$MQTT_TOPIC/states,devices=$MQTT_TOPIC[/model][/id][/channel:A] -M time:tz:local -M protocol -M level | /scripts/rtl_433_mqtt_hass.py
12 changes: 11 additions & 1 deletion sdr2mqtt/rtl_433_mqtt_hass.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,8 +547,18 @@
}

},
"consumption_data": {
"device_type": "sensor",
"object_suffix": "meter",
"config": {
"device_class": "gas",
"name": "meter",
"unit_of_measurement": "ccf",
"value_template": "{{ value|float }}"
}
},
"consumption": {
"device_type": "meter",
"device_type": "sensor",
"object_suffix": "meter",
"config": {
"device_class": "gas",
Expand Down