aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2022-01-09 23:30:16 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2022-01-09 23:30:16 -0800
commit8ceefb941be5109a402ec55cda5a65f3555fd204 (patch)
tree060d113f06a741aab3afe33c441a8670880ec484 /src/main/java/org
parent0ab8827dcfd144727f8470008f71fc49fa67618c (diff)
downloadtrackermap-server-8ceefb941be5109a402ec55cda5a65f3555fd204.tar.gz
trackermap-server-8ceefb941be5109a402ec55cda5a65f3555fd204.tar.bz2
trackermap-server-8ceefb941be5109a402ec55cda5a65f3555fd204.zip
Support eeLink version 2.2
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java b/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java
index 8fe12fe69..9856ad999 100644
--- a/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/EelinkProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2014 - 2022 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.
@@ -218,6 +218,24 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
buf.skipBytes(7); // bss2
}
+ if (BitUtil.check(flags, 7)) {
+ buf.readUnsignedByte(); // radio access technology
+ int count = buf.readUnsignedByte();
+ if (count > 0) {
+ buf.readUnsignedShort(); // mcc
+ buf.readUnsignedShort(); // mnc
+ buf.readUnsignedShort(); // lac
+ buf.readUnsignedShort(); // tac
+ buf.readUnsignedInt(); // cid
+ buf.readUnsignedShort(); // ta
+ }
+ for (int i = 0; i < count; i++) {
+ buf.readUnsignedShort(); // physical cid
+ buf.readUnsignedShort(); // e-arfcn
+ buf.readUnsignedByte(); // rssi
+ }
+ }
+
if (type == MSG_WARNING) {
position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte()));