diff options
| -rw-r--r-- | src/org/traccar/protocol/SmokeyProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | test/org/traccar/protocol/SmokeyProtocolDecoderTest.java | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/SmokeyProtocolDecoder.java b/src/org/traccar/protocol/SmokeyProtocolDecoder.java index afdd40d1d..a3fa0e5ae 100644 --- a/src/org/traccar/protocol/SmokeyProtocolDecoder.java +++ b/src/org/traccar/protocol/SmokeyProtocolDecoder.java @@ -50,12 +50,12 @@ public class SmokeyProtocolDecoder extends BaseProtocolDecoder { if (type == 0) { - buf.readUnsignedShort(); // firmware version - /*if (channel != null) { // TODO send ack }*/ + buf.readUnsignedShort(); // firmware version + Position position = new Position(); position.setProtocol(getProtocolName()); position.setDeviceId(deviceSession.getDeviceId()); diff --git a/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java b/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java index 01950fdb5..fd862b437 100644 --- a/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java +++ b/test/org/traccar/protocol/SmokeyProtocolDecoderTest.java @@ -10,16 +10,19 @@ public class SmokeyProtocolDecoderTest extends ProtocolTest { SmokeyProtocolDecoder decoder = new SmokeyProtocolDecoder(new SmokeyProtocol()); - verifyNothing(decoder, binary( + verifyAttributes(decoder, binary( + "534D0300865628025161227F030100000000029E03020200A4021405028F0007010658300200028F0007010625F21D028F00070106000027028F00070106584E19028F000701065DCF2707537265696C6C69634E657400E8DE27400DF0A80084C9B2D85A1DB7537265696C6C69634E657400E8DE27401048D44350455F44423745393900A8A668DB7E99A94D794E6574776F726B4E616D6500002675ED6D70AB74686170616E6500002675F4DA3CA94D75666173610088CEFA735AFCA9C524")); + + verifyAttributes(decoder, binary( "534d0300865628025163272f031400000000001c000200000c0168028f000102c9f93a011f538d")); - verifyNothing(decoder, binary( + verifyAttributes(decoder, binary( "534d0300865628025163272f031400000000001f000200000c0167028f000102c9f93a011f5082")); - verifyNothing(decoder, binary( + verifyAttributes(decoder, binary( "534d0300865628025163272f031400000000001d000200000c0167028f000102c9f93a011f5282")); - verifyNothing(decoder, binary( + verifyAttributes(decoder, binary( "534d0300865628025163272f031400000000001e000200000c0167028f000102c9f93a011f5182")); } |