From 0d755bebbcb801ad7f1dd5ca6f085aa82c64cb26 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 19 May 2016 12:24:23 +0500 Subject: - Added device identification on ping packet for Wondex protocol - Store result of command execution to "result" field of position - Fixed wrong class in WondexFrameDecoderTest --- src/org/traccar/protocol/WondexFrameDecoder.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/org/traccar/protocol/WondexFrameDecoder.java') diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java index c217166e8..7502c3320 100644 --- a/src/org/traccar/protocol/WondexFrameDecoder.java +++ b/src/org/traccar/protocol/WondexFrameDecoder.java @@ -15,7 +15,9 @@ */ package org.traccar.protocol; +import java.nio.charset.StandardCharsets; import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.frame.FrameDecoder; @@ -40,6 +42,9 @@ public class WondexFrameDecoder extends FrameDecoder { if (channel != null) { channel.write(frame); } + // Pass deviceId to protocol decoder + long deviceId = ((Long.reverseBytes((frame.getLong(0)))) >> 32) & 0xFFFFFFFFL; + return ChannelBuffers.copiedBuffer("$ID:"+String.valueOf(deviceId), StandardCharsets.US_ASCII); } else { -- cgit v1.2.3