From 0b33d4c618e92814df00c3dc0eca54fced088f95 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 31 Jan 2021 17:54:25 -0800 Subject: Support second BLE type --- .../org/traccar/protocol/Minifinder2ProtocolDecoder.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/traccar') diff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java index c38fd740d..89217a39b 100644 --- a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 - 2020 Anton Tananaev (anton@traccar.org) + * Copyright 2019 - 2021 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -186,6 +186,17 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_BATTERY_LEVEL, BitUtil.from(status, 24)); position.set(Position.KEY_STATUS, status); break; + case 0x28: + int beaconFlags = buf.readUnsignedByte(); + position.set("tagId", ByteBufUtil.hexDump(buf.readSlice(6))); + buf.readUnsignedByte(); // rssi + buf.readUnsignedByte(); // 1m rssi + if (BitUtil.check(beaconFlags, 7)) { + position.setLatitude(buf.readIntLE() * 0.0000001); + position.setLongitude(buf.readIntLE() * 0.0000001); + hasLocation = true; + } + break; case 0x30: buf.readUnsignedInt(); // timestamp position.set(Position.KEY_STEPS, buf.readUnsignedInt()); -- cgit v1.2.3