From 1816dcd505d0d5d8201ce2e8f78030569e70322f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 20 Mar 2019 22:32:15 -0700 Subject: Decode T800x satellites --- src/org/traccar/protocol/T800xProtocolDecoder.java | 3 ++- test/org/traccar/protocol/T800xProtocolDecoderTest.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/traccar/protocol/T800xProtocolDecoder.java b/src/org/traccar/protocol/T800xProtocolDecoder.java index 866971090..9db5b22f0 100644 --- a/src/org/traccar/protocol/T800xProtocolDecoder.java +++ b/src/org/traccar/protocol/T800xProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2019 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. @@ -112,6 +112,7 @@ public class T800xProtocolDecoder extends BaseProtocolDecoder { buf.readUnsignedShort(); // speed alarm int status = buf.readUnsignedByte(); + position.set(Position.KEY_SATELLITES, BitUtil.to(status, 5)); buf.readUnsignedByte(); // gsensor manager status buf.readUnsignedByte(); // other flags diff --git a/test/org/traccar/protocol/T800xProtocolDecoderTest.java b/test/org/traccar/protocol/T800xProtocolDecoderTest.java index aa74ec417..fe77d91b7 100644 --- a/test/org/traccar/protocol/T800xProtocolDecoderTest.java +++ b/test/org/traccar/protocol/T800xProtocolDecoderTest.java @@ -13,6 +13,9 @@ public class T800xProtocolDecoderTest extends ProtocolTest { verifyNull(decoder, binary( "252501001504050880061689888888111111250350")); + verifyPosition(decoder, binary( + "2525020044a66d0862522030401350001403841409c40064edc000051100960000071701370000003ea7ee0019032010581300000000aad3e1bda6f24d42000000001281")); + verifyPosition(decoder, binary( "252502004400010880616898888888000A00FF2001000020409600989910101010055501550000101005050005051010050558866B4276D6E342912AB441111500051010")); -- cgit v1.2.3