From 7813a6afa5070f5109959cf3b7fbd084590b1e36 Mon Sep 17 00:00:00 2001
From: MDW <mdeweerd@users.noreply.github.com>
Date: Thu, 4 Jan 2024 11:53:24 +0100
Subject: [PATCH] minor: Fix end of line and end of file whitespaces (#2778)
---
conf/CAME-TOP432.conf | 10 ++++-----
conf/DrivewayAlarm_I8-W1901.conf | 8 ++++----
conf/EV1527-4Button-Universal-Remote.conf | 2 +-
conf/EV1527-DDS-Sgooway.conf | 2 +-
conf/EV1527-PIR-Sgooway.conf | 2 +-
conf/FAN-53T.conf | 12 +++++------
conf/HeatmiserPRT-W.conf | 19 ++++++++---------
conf/LeakDetector.conf | 1 -
conf/MightyMule-FM231.conf | 2 +-
conf/SMC5326-Remote.conf | 10 ++++-----
conf/SalusRT300RF.conf | 14 ++++++-------
conf/fan-11t.conf | 25 +++++++++++------------
conf/heatilator.conf | 22 ++++++++++----------
conf/honeywell-fan.conf | 21 +++++++++----------
conf/verisure_alarm.conf | 2 --
conf/xmas-tree-remote-2APJZ-CW002.conf | 2 +-
examples/rtl_433_mqtt_hass.py | 2 +-
17 files changed, 74 insertions(+), 82 deletions(-)
diff --git a/conf/CAME-TOP432.conf b/conf/CAME-TOP432.conf
index 03cb7c97..2483cce5 100644
--- a/conf/CAME-TOP432.conf
+++ b/conf/CAME-TOP432.conf
@@ -1,12 +1,12 @@
# CAME-TOP432.conf
# Copyright (C) 2020 JFORESTIER
# Decode CAME remote control TOP-432EV, TOP-432NA, TOP-432EE.
-# This remote control is used for garage door and sliding gate.
-# It transmits on 433.92 MHz (as it is written on the case), built since 2006
+# This remote control is used for garage door and sliding gate.
+# It transmits on 433.92 MHz (as it is written on the case), built since 2006
# (as said on the FCC site https://www.fcc.gov/oet/ea/fccid with reference M48 TOP-NA)
-#
-# It works with CAME radio receiver cards "AF43S", capable of handling 4096 codes.
-# CAME is an Italian company. These remote controls are mainly sold in Europe (France, Italy, Belgium).
+#
+# It works with CAME radio receiver cards "AF43S", capable of handling 4096 codes.
+# CAME is an Italian company. These remote controls are mainly sold in Europe (France, Italy, Belgium).
# https://www.came.com and https://www.came-europe.com .
# Device information and test files:
diff --git a/conf/DrivewayAlarm_I8-W1901.conf b/conf/DrivewayAlarm_I8-W1901.conf
index e373a032..63a78481 100644
--- a/conf/DrivewayAlarm_I8-W1901.conf
+++ b/conf/DrivewayAlarm_I8-W1901.conf
@@ -1,4 +1,4 @@
-#
+#
# Driveway alarm sensor SKU I8-W1901
# This sensor Detects motion and comes with a receiver that plays 32 different
# melodies at selectable volumes. The receiver with the speaker plugs into a
@@ -22,12 +22,12 @@
# The following flex decoder was used for the above analysis.
# $ rtl_433 -R 0 -X 'n=driveway,m=OOK_PWM,s=200,l=596,r=6196,g=608,t=158,y=0,repeats>=10,bits>=20'
# repeats>=10 and bits>=20 was used to filter out any possible noise.
-#
+#
# Decoder
# -------
# After discussion with zuckschwerdt (https://github.com/merbanan/rtl_433/pull/2493)
# we decided to include the sync bit into the packet (for robustness) by increasing
-# the gap limit to 900 us and then matching on 26 bits as the ID. This gives us a
+# the gap limit to 900 us and then matching on 26 bits as the ID. This gives us a
# flex decoder like this:
# $ rtl_433 -R 0 -X 'n=motion,m=OOK_PWM,s=188,l=588,r=7000,g=900,t=160,y=0,match={26}c4ea674,repeats>=3'
#
@@ -38,7 +38,7 @@
# 3. Replace the value in the match= line below with the one you just got
#
# Voila! Enjoy!
-#
+#
# This sensor was tested at about 45 meters of distance and through layers of wood
# and walls and it worked well.
#
diff --git a/conf/EV1527-4Button-Universal-Remote.conf b/conf/EV1527-4Button-Universal-Remote.conf
index a1481591..5c5cfd81 100644
--- a/conf/EV1527-4Button-Universal-Remote.conf
+++ b/conf/EV1527-4Button-Universal-Remote.conf
@@ -10,7 +10,7 @@
# All possible combinations are matched for completeness, while not all
# are are useful because of the size of the remote.
# You can simply not press easily more than two buttons at the same time ;-)
-#
+#
# The shown example can distinguish between multiple remotes (two in this case).
# If this is not desired, a simple "match=abcde" can limit the detection of
# one unique EV1527 code.
diff --git a/conf/EV1527-DDS-Sgooway.conf b/conf/EV1527-DDS-Sgooway.conf
index d2c0bc3a..1af890de 100644
--- a/conf/EV1527-DDS-Sgooway.conf
+++ b/conf/EV1527-DDS-Sgooway.conf
@@ -3,7 +3,7 @@
# This decoder reads detections of the Sgooway EV1527 based Door sensor
#
# Link to this product can be found https://www.aliexpress.com/item/399798633.html?spm=a2g0s.9042311.0.0.6bf54c4dDH7uSk
-#
+#
# The shown example will display all sensors detected. Each device will have a separate code that can be used to differentiate between the
# different devices.
#
diff --git a/conf/EV1527-PIR-Sgooway.conf b/conf/EV1527-PIR-Sgooway.conf
index b18602b8..95fda2e0 100644
--- a/conf/EV1527-PIR-Sgooway.conf
+++ b/conf/EV1527-PIR-Sgooway.conf
@@ -1,7 +1,7 @@
# EV1527 based passive infrared sensor
#
# This decoder reads detections of the Sgooway EV1527 based PIR
-#
+#
# The shown example can distinguish between multiple of those PIR's (two in this case)
# and present the different PIR's as "channel : x" in the output. Adopt this line
# to your EV1527 unique codes. Put the decimal representation of the in here.
diff --git a/conf/FAN-53T.conf b/conf/FAN-53T.conf
index 227f26b7..72c2bf9d 100644
--- a/conf/FAN-53T.conf
+++ b/conf/FAN-53T.conf
@@ -5,7 +5,7 @@
#
# Code Format: 01 <Dipswitch Code> 0 <6-bit button map> (all bits inverted)
# Button Map Bits: [fan1, fan2, fan3, (some remotes send this when the button is released), fan0, light]
-#
+#
# Dip switches are used as a unique ID to talk to a specific unit
#
# Some remotes have buttons labeled 0,1,2,3
@@ -15,28 +15,28 @@
# Fan 1 = "High"
# Fan 2 = "Medium"
# Fan 3 = "Low"
-#
+#
# Dipswitch: 0000
# Fan 1 - 01 0000 0 100000
# Fan 2 - 01 0000 0 010000
# Fan 3 - 01 0000 0 001000
# Fan 0 - 01 0000 0 000010
# Light - 01 0000 0 000001
-#
+#
# Dipswitch: 0001
# Fan 1 - 01 0001 0 100000
# Fan 2 - 01 0001 0 010000
# Fan 3 - 01 0001 0 001000
# Fan 0 - 01 0001 0 000010
# Light - 01 0001 0 000001
-#
+#
# Dipswitch: 1000
# Fan 1 - 01 1000 0 100000
# Fan 2 - 01 1000 0 010000
# Fan 3 - 01 1000 0 001000
# Fan 0 - 01 1000 0 000010
# Light - 01 1000 0 000001
-
+
frequency 303.900M
@@ -51,4 +51,4 @@ decoder {
bits = 13,
get = id:@2:{4},
get = button:@7:{6}:[32:fan_Hi 16:fan_Med 8:fan_Low 4:button_Released 2:fan_Off 1:light 0: ],
-}
\ No newline at end of file
+}
diff --git a/conf/HeatmiserPRT-W.conf b/conf/HeatmiserPRT-W.conf
index f64634cc..d6209e65 100644
--- a/conf/HeatmiserPRT-W.conf
+++ b/conf/HeatmiserPRT-W.conf
@@ -29,20 +29,17 @@ report_meta time:iso
output mqtt://192.168.1.150,retain=1,devices=rtl_433[/channel]
decoder {
- name = Heatmiser_PRT-W_Thermostat,
- modulation = FSK_PCM,
- s = 416,
- l = 416,
- r = 20000,
+ name = Heatmiser_PRT-W_Thermostat,
+ modulation = FSK_PCM,
+ s = 416,
+ l = 416,
+ r = 20000,
unique,
- bits >= 120,
+ bits >= 120,
preamble = aaaa2dd4,
get = channel:@8:{16}:[0x8821:10 0x8831:10 0x8921:20 0x8931:20 0x8922:30 0x8932:30 0x8923:40 0x8933:40],
get = StatName:@8:{16}:[0x8821: Living_Room 0x8831:Living_Room 0x8921:Family_Room 0x8931:Family_Room 0x8922:Kitchen 0x8932:Kitchen 0x8923:Hallway 0x8933:Hallway],
- get = Receiver:@8:{8}:[0x88:L02 0x89:L00],
- get = StatID:@20:{4},
+ get = Receiver:@8:{8}:[0x88:L02 0x89:L00],
+ get = StatID:@20:{4},
get = event:@16:{4}:[0x3:ON 0x2:OFF],
}
-
-
-
diff --git a/conf/LeakDetector.conf b/conf/LeakDetector.conf
index dd3beb65..2f855954 100644
--- a/conf/LeakDetector.conf
+++ b/conf/LeakDetector.conf
@@ -19,4 +19,3 @@ decoder {
get=Message:@16:{8}:[250:Alarm],
get=Battery:@24:{4}:[14:Ok 12:Low]
}
-
diff --git a/conf/MightyMule-FM231.conf b/conf/MightyMule-FM231.conf
index 1780e683..2b57f4c1 100644
--- a/conf/MightyMule-FM231.conf
+++ b/conf/MightyMule-FM231.conf
@@ -8,7 +8,7 @@
# The DIP switches for setting a unique device ID are labeled 1-4
# from left to right, but appear in the # data stream in reverse
-# order.
+# order.
decoder {
name=MightyMule-FM231,
diff --git a/conf/SMC5326-Remote.conf b/conf/SMC5326-Remote.conf
index 74d995b8..7c6499c1 100644
--- a/conf/SMC5326-Remote.conf
+++ b/conf/SMC5326-Remote.conf
@@ -1,12 +1,12 @@
# SMC5326 remote control
-# This decoder reads two or four button pressed on the remote control. The
-# rubber buttons are directly connected to the SMC5326 data pins. Therefore,
-# pressing more than one button at the same time is possible. However this
+# This decoder reads two or four button pressed on the remote control. The
+# rubber buttons are directly connected to the SMC5326 data pins. Therefore,
+# pressing more than one button at the same time is possible. However this
# flex spec only match a single button press
#
-# SMC5326 are usually configured using 8-dip switch. All possible combinations
-# of keys are matched. You can simply press any button to
+# SMC5326 are usually configured using 8-dip switch. All possible combinations
+# of keys are matched. You can simply press any button to
# determine the remote unique keys ;-)
#
# see rtl_433_tests/tests/smc5326 for more information
diff --git a/conf/SalusRT300RF.conf b/conf/SalusRT300RF.conf
index abc13ebb..b60ca5d7 100644
--- a/conf/SalusRT300RF.conf
+++ b/conf/SalusRT300RF.conf
@@ -7,7 +7,7 @@
# Report iso time:
report_meta time:iso
-# Including the 'report_meta level' switch (commented out immediately below) means information on the signal quality and strength are added to the output.
+# Including the 'report_meta level' switch (commented out immediately below) means information on the signal quality and strength are added to the output.
#report_meta level
# specify MQTT output and formatting - replace the IP address (192.168.1.150) with your mosquitto broker's IP address and port number (I didn't need the port number)
@@ -15,13 +15,13 @@ output mqtt://192.168.1.150,retain=1,devices=rtl_433/Salus[/id]
decoder {
- name = SalusRT300RF,
- m = FSK_PCM,
- s = 833,
- l = 833,
- r = 16000,
+ name = SalusRT300RF,
+ m = FSK_PCM,
+ s = 833,
+ l = 833,
+ r = 16000,
unique,
preamble = {24}0xaaaaaa,
- get = @0:{8}:id,
+ get = @0:{8}:id,
get = @28:{4}:Heat:[1:ON 2:OFF]
}
diff --git a/conf/fan-11t.conf b/conf/fan-11t.conf
index 98804871..d59a89d1 100644
--- a/conf/fan-11t.conf
+++ b/conf/fan-11t.conf
@@ -5,34 +5,34 @@
# KUJCE9103 FAN-11T FAN-53T 2AAZPFAN-53T
#
# written: Peter Shipley
-#
+#
# https://www.amazon.com/s?k=Fan-11T
-#
+#
# Based on the Holtek the HT12E/HT12F chipsets
-#
+#
# HT12E : https://www.holtek.com/documents/10179/116711/2_12ev120.pdf
# HT12F : https://www.holtek.com/documents/10179/116711/2_12dv120.pdf
-#
+#
# FCC ID: L3HFAN11T
#
# https://fccid.io/L3HFAN11T
-#
+#
# 0.36ms Short
# 0.71ms Long
-#
+#
# 12bits of info ( 13 bits transmitted )
-#
+#
# receiver requires three matching transmissions optionally followed by one packet with all shorts
-#
+#
# The Fan-11T uses a 4 bits dip-switch as an identifier
-#
+#
# packets can be described as
-#
+#
# <short> <long> + 4 bit ID + <short> + 6 bit command
-#
+#
# The follow table uses '1001' as the ID code:
# if short is 0 and Long is 1
-#
+#
# Hi 0 1 1 0 0 1 0 1 0 0 0 0 0 = 0110010100000 = 3232 = 0xca0
# Med 0 1 1 0 0 1 0 0 1 0 0 0 0 = 0110010010000 = 3216 = 0xc90
# Low 0 1 1 0 0 1 0 0 0 1 0 0 0 = 0110010001000 = 3208 = 0xc88
@@ -94,4 +94,3 @@ decoder {
get = id:@2:{4},
get = button:@7:{6}:[32:fan_Hi 16:fan_Med 8:fan_Low 2:fan_Off 1:light 0: 4: ],
}
-
diff --git a/conf/heatilator.conf b/conf/heatilator.conf
index 08174e0e..d8b48197 100644
--- a/conf/heatilator.conf
+++ b/conf/heatilator.conf
@@ -1,45 +1,45 @@
# Decoder for Heatilator gas log remotes.
-#
+#
# Heatilator gas logs use OOK_PULSE_PPM encoding. The format is very similar to
# that decoded by 'generic_remote', but seems to differ slightly in timing. The
# device does _not_ use a discrete chip to generate the waveform; it's generated
# in code.
-#
+#
# The packet starts with 380 uS start pulse followed by an eternity (14.3 mS) of silence.
# - 0 is defined as a 1430 uS pulse followed by a 460 uS gap.
# - 1 is defined as a 380 uS pulse followed by a 1420 uS gap.
-#
+#
# Transmissions consist of the start bit followed by 24 data bits. These packets are
# repeated many times.
-#
+#
# Because there's such a long start bit/preamble, the decoder usually creates the first
# row with a single bit, followed by 'n' rows with 25 bits (the 24 data bits and the
# start bit of the following packet), then the last row with the expected 24 bits.
-#
+#
# Packet layout:
-#
+#
# Bit number
# 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
# - - - - - - - - - - DEVICE SERIAL NUMBER - - - - - - - - - |- COMMAND -
-#
+#
# The device serial number is (presumedly) burned into the device when manufactured.
# The command is further broken down into the following bits:
-#
+#
# 20 21 22 23
# X X S T
-#
+#
# X bits are unknown in function. S is the 'state' of the gas valve/flame. S = 0
# means 'flame off'. S = 1 means 'flame on'. T indicates whether or not the remote
# is in 'thermo' mode - this is a mode where the remote detects the room temperature
# and commands the gas logs on/off to maintain the temperature selected on the remote.
-#
+#
# There are safety mechanisms afoot - whenever the gas logs are 'on', on with a timer,
# or on in thermo mode, occasional 'keepalive' messages are sent to the gas logs to
# guarantee that the remote is still in range and the batteries are not dead. Generally
# these messages are exactly the same as the last command that the remote sent - that is,
# if you turn the logs 'on' manually, the remote will send the same 'on' command every so
# often.
-#
+#
# The COMMAND S and T bits have these meanings:
# S T
# ----
diff --git a/conf/honeywell-fan.conf b/conf/honeywell-fan.conf
index aa0129ee..2a9e19a0 100644
--- a/conf/honeywell-fan.conf
+++ b/conf/honeywell-fan.conf
@@ -1,23 +1,23 @@
# Decoder for Honeywell fan remotes.
-#
+#
# This fan is made by Intertek (model 4003229) but is sold by Honeywell
# as a model 'Salermo', number 10285. This fan may be sold under different
# makes and models, YMMV.
-#
+#
# Honeywell fans use OOK_PULSE_PPM encoding.
# The packet starts with a 300 uS start pulse.
# - 0 is defined as a 300 uS gap followed by a 900 uS pulse.
# - 1 is defined as a 900 uS gap followed by a 300 uS pulse.
-#
+#
# Transmissions consist of a short start bit followed by bursts of 24 bits.
# These packets are repeated up to 23 times.
-#
+#
# Possible packet layout:
-#
+#
# Bit number 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
# -----------------------------------------------------------------------
# Value 0 0 0 1 0 1 1 0 1 1 0 0 1 1 0 1 |Value| Cmd | 1 !d d
-#
+#
# It is pure supposition that the leading 0x16CD and bit 21 are fixed values.
# I do not have more than 1 remote to test and there's no mention in the manual about
# dip switch settings, nor are there any on the remote. It's also possible that the
@@ -25,7 +25,7 @@
# there's no such command/value distinction. It looks very suspicious that the fan
# speed commands all share command 000 and the speed value (bit-reversed) appears in the
# value area.
-#
+#
# Button Fixed Other Bits Function
# ONE 16CD 1 0 0 0 0 1 !d d Low speed fan
# TWO 16CD 0 1 0 0 0 1 !d d Medium speed fan
@@ -35,15 +35,15 @@
# STAR-M 16CD 1 1 0 1 0 1 !d d Light on/off (momentary press)
# STAR-C 16CD 0 1 1 1 0 1 !d d Light dim/brighten (continuous press)
# ONE+THREE-C 16CD 1 0 1 0 1 1 !d d Learn mode ONE+THREE (continuous press)
-#
+#
# The 'd' bit indicates whether the D/CFL button in the battery compartment
# is set to 'D' (1 bit) or 'CFL' (0 bit). This switch inhibits the dim
# function when set to CFL. The !d bit seems to just be the complement of 'd'.
-#
+#
# Since the COMMAND/VALUE paradigm is not verified and only seems to apply to the fan speed
# buttons, we'll decode using the full 3rd byte right-shifted by 3 bits to omit the fixed '1'
# and 'Dim' bits.
-#
+#
# byte[2] >> 3:
# -------------
# 0x10: Low fan speed
@@ -68,4 +68,3 @@ decoder {
get = button:@16:{5}:[16:fan_low 8:fan_med 24:fan_hi 2:fan_off 5:light_off_delayed 26:light_on_off 14:light_dim_brighten 21:learn_mode],
get = dimmable:@23:{1}:[0:no 1:yes]
}
-
diff --git a/conf/verisure_alarm.conf b/conf/verisure_alarm.conf
index 52f97d99..85629f5d 100644
--- a/conf/verisure_alarm.conf
+++ b/conf/verisure_alarm.conf
@@ -27,5 +27,3 @@ decoder {
get=@24:{24}:id,
get=@52:{12}:state,
}
-
-
diff --git a/conf/xmas-tree-remote-2APJZ-CW002.conf b/conf/xmas-tree-remote-2APJZ-CW002.conf
index 06c84294..e7e52ca2 100644
--- a/conf/xmas-tree-remote-2APJZ-CW002.conf
+++ b/conf/xmas-tree-remote-2APJZ-CW002.conf
@@ -23,4 +23,4 @@ decoder {
bits = 32,
get = id:@0:{20},
get = action:@20:{12},
-}
\ No newline at end of file
+}
diff --git a/examples/rtl_433_mqtt_hass.py b/examples/rtl_433_mqtt_hass.py
index b109fd29..b35e2e3b 100755
--- a/examples/rtl_433_mqtt_hass.py
+++ b/examples/rtl_433_mqtt_hass.py
@@ -625,7 +625,7 @@ mappings = {
"state_class": "measurement"
}
},
-
+
"storm_dist": {
"device_type": "sensor",
"object_suffix": "stdist",