jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 04:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix LoraWan manufacturer decoding (#22880)

Browse Source
This commit is contained in:
Theo Arends 2025-01-26 15:26:20 +01:00
parent 53dee5b002
commit 4d9dd0aa3f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/tasmota_xdrv_driver/xdrv_73_6_lorawan_decode.ino
View File

@ -88,7 +88,8 @@ void LoraWanDecode(struct LoraNodeData_t* node_data) {
uint8_t FPort; uint8_t FPort;
*/ */
if (bitRead(Lora->settings.flags, TAS_LORA_FLAG_DECODE_ENABLED)) { // LoraOption3 1 if (bitRead(Lora->settings.flags, TAS_LORA_FLAG_DECODE_ENABLED)) { // LoraOption3 1
if (0x00161600 == Lora->settings.end_node[node_data->node].DevEUIh) { // MerryIoT uint32_t manufacturer = Lora->settings.end_node[node_data->node].DevEUIh >> 8;
if (0x001616 == manufacturer) { // MerryIoT
if (120 == node_data->FPort) { // MerryIoT door/window Sensor (DW10) if (120 == node_data->FPort) { // MerryIoT door/window Sensor (DW10)
if (9 == node_data->payload_len) { // MerryIoT Sensor state if (9 == node_data->payload_len) { // MerryIoT Sensor state
// 1 2 3 4 5 6 7 8 9 // 1 2 3 4 5 6 7 8 9
@ -122,7 +123,7 @@ void LoraWanDecode(struct LoraNodeData_t* node_data) {
} }
} }
else if (0xA840410E == Lora->settings.end_node[node_data->node].DevEUIh) { // Dragino else if (0xA84041 == manufacturer) { // Dragino
if (10 == node_data->FPort) { // Dragino LDS02 if (10 == node_data->FPort) { // Dragino LDS02
// 8CD2 01 000010 000000 00 - Door Open, 3.282V // 8CD2 01 000010 000000 00 - Door Open, 3.282V
// 0CD2 01 000011 000000 00 - Door Closed // 0CD2 01 000011 000000 00 - Door Closed