aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-12-28 07:52:24 -0800
committerAnton Tananaev <anton@traccar.org>2022-12-28 07:52:24 -0800
commit6c8fdbbf5f44db7eb88bc75dbaf89c679aa25cd5 (patch)
tree5d317d2757a1283d6a7bf019917ee7ea8263f5c0
parent2e1b77d6aa5a2c2d2e07b29f80c40ec741004819 (diff)
downloadtrackermap-server-6c8fdbbf5f44db7eb88bc75dbaf89c679aa25cd5.tar.gz
trackermap-server-6c8fdbbf5f44db7eb88bc75dbaf89c679aa25cd5.tar.bz2
trackermap-server-6c8fdbbf5f44db7eb88bc75dbaf89c679aa25cd5.zip
Fix event and ignition
-rw-r--r--src/main/java/org/traccar/protocol/CellocatorProtocolDecoder.java10
-rw-r--r--src/test/java/org/traccar/protocol/CellocatorProtocolDecoderTest.java5
2 files changed, 11 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/protocol/CellocatorProtocolDecoder.java b/src/main/java/org/traccar/protocol/CellocatorProtocolDecoder.java
index 07f7f1692..3573a95ca 100644
--- a/src/main/java/org/traccar/protocol/CellocatorProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/CellocatorProtocolDecoder.java
@@ -119,14 +119,16 @@ public class CellocatorProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_STATUS, buf.readUnsignedByte() & 0x0f);
buf.readUnsignedByte(); // operator / configuration flags
- position.set(Position.KEY_EVENT, buf.readUnsignedByte());
- position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte()));
+ buf.readUnsignedByte(); // reason data
+ short event = buf.readUnsignedByte();
+ position.set(Position.KEY_ALARM, decodeAlarm(event));
+ position.set(Position.KEY_EVENT, event);
position.set("mode", buf.readUnsignedByte());
- long input = buf.readUnsignedIntLE();
+ long input = buf.readUnsignedInt();
+ position.set(Position.KEY_IGNITION, BitUtil.check(input, 3 * 8 + 5));
position.set(Position.KEY_DOOR, BitUtil.check(input, 3 * 8));
- position.set(Position.KEY_IGNITION, BitUtil.check(input, 2 * 8 + 7));
position.set(Position.KEY_CHARGE, BitUtil.check(input, 7));
position.set(Position.KEY_INPUT, input);
diff --git a/src/test/java/org/traccar/protocol/CellocatorProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/CellocatorProtocolDecoderTest.java
index 7e96b073b..27cad39a3 100644
--- a/src/test/java/org/traccar/protocol/CellocatorProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/CellocatorProtocolDecoderTest.java
@@ -2,6 +2,7 @@ package org.traccar.protocol;
import org.junit.Test;
import org.traccar.ProtocolTest;
+import org.traccar.model.Position;
public class CellocatorProtocolDecoderTest extends ProtocolTest {
@@ -10,6 +11,10 @@ public class CellocatorProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new CellocatorProtocolDecoder(null));
+ verifyAttribute(decoder, binary(
+ "4d4347500098ab31000856b12b2c041016002c0023b3000021f3f5ffb04c8f0100000000000078dd0004020f716445f75f3b0701126e0200b303000036002538151b0ce607ab"),
+ Position.KEY_IGNITION, true);
+
verifyPosition(decoder, binary(
"4D43475000856308000004B2DE1F04009E00200100000000696CF7AB002F1A00000000000000325C000402069BFDE70857E22502F41C000036000000DF0B0932100B09DC0719"));