Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Linptech Immersion sensor RS1BB #1300

Merged
merged 1 commit into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions custom_components/ble_monitor/ble_parser/xiaomi.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
0x20DB: "MJZNZ018H",
0x18E3: "ZX1",
0x11C2: "SV40",
0x3F0F: "RS1BB",
}

# Structured objects for data conversions
Expand Down Expand Up @@ -721,6 +722,12 @@ def obj4805(xobj):
return {"illuminance": illu}


def obj4806(xobj):
"""Moisture detected (wet/dry)"""
wet = xobj[0]
return {"moisture detected": wet}


def obj4810(xobj):
"""Sleep State"""
sleep_state = xobj[0]
Expand Down Expand Up @@ -1052,6 +1059,7 @@ def obj5a16(xobj):
0x4803: obj4803,
0x4804: obj4804,
0x4805: obj4805,
0x4806: obj4806,
0x4810: obj4810,
0x4811: obj4811,
0x4818: obj4818,
Expand Down
1 change: 1 addition & 0 deletions custom_components/ble_monitor/const.py
Original file line number Diff line number Diff line change
Expand Up @@ -1950,6 +1950,7 @@ class BLEMonitorBinarySensorEntityDescription(
'Tilt Pink' : 'Tilt',
'MMC-W505' : 'Xiaomi',
'SJWS01LM' : 'Xiaomi',
'RS1BB' : 'Linptech',
}


Expand Down
2 changes: 1 addition & 1 deletion custom_components/ble_monitor/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
"btsocket>=0.2.0",
"pyric>=0.1.6.3"
],
"version": "12.8.2"
"version": "12.9.0"
}
26 changes: 26 additions & 0 deletions custom_components/ble_monitor/test/test_xiaomi_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,32 @@ def test_Xiaomi_SJWS01LM(self):
assert sensor_msg["moisture detected"]
assert sensor_msg["rssi"] == -88

def test_Xiaomi_RS1BB(self):
"""Test Xiaomi parser for LINP-RS1BB."""
self.aeskeys = {}
data_string = "043E2902010000674cb938c1a41d020106191695fe58590F3F4A674CB938C1A4D6E57B83040000D01E0B4BC0"
data = bytes(bytearray.fromhex(data_string))

aeskey = "33ede53321bc73c790a8daae4581f3d5"

is_ext_packet = True if data[3] == 0x0D else False
mac = (data[8 if is_ext_packet else 7:14 if is_ext_packet else 13])[::-1]
mac_address = mac.hex()
p_mac = bytes.fromhex(mac_address.replace(":", "").lower())
p_key = bytes.fromhex(aeskey.lower())
self.aeskeys[p_mac] = p_key
# pylint: disable=unused-variable
ble_parser = BleParser(aeskeys=self.aeskeys)
sensor_msg, tracker_msg = ble_parser.parse_raw_data(data)

assert sensor_msg["firmware"] == "Xiaomi (MiBeacon V5 encrypted)"
assert sensor_msg["type"] == "RS1BB"
assert sensor_msg["mac"] == "A4C138B94C67"
assert sensor_msg["packet"] == 74
assert sensor_msg["data"]
assert sensor_msg["moisture detected"] == 0
assert sensor_msg["rssi"] == -64

def test_Xiaomi_MJYD02YL(self):
"""Test Xiaomi parser for MJYD02YL."""

Expand Down
16 changes: 16 additions & 0 deletions docs/_devices/RS1BB.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
manufacturer: Linptech
name: Water Immersion and Rainwater sensor
model: RS1BB
image: RS1BB.png
physical_description:
broadcasted_properties:
- moisture detected
- rssi
broadcasted_property_notes:
broadcast_rate:
active_scan:
encryption_key: true
custom_firmware:
notes:
---
2 changes: 1 addition & 1 deletion docs/_devices/SJWS01LM.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ model: SJWS01LM
image: SJWS01LM.png
physical_description:
broadcasted_properties:
- moisture
- moisture detected
- button
- battery
- rssi
Expand Down
Binary file added docs/assets/images/RS1BB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading