diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2014-04-19 13:48:06 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2014-04-19 13:48:06 +1200 |
| commit | 5d5ba5b00a390cb510e8d547788846ae2bc9fe93 (patch) | |
| tree | 7ceaf4508d22a58f9134bcae464fe267bded092e /src/org | |
| parent | 7b9f06cfc4b453693e3f6abec00a59a68f3456a3 (diff) | |
| download | trackermap-server-5d5ba5b00a390cb510e8d547788846ae2bc9fe93.tar.gz trackermap-server-5d5ba5b00a390cb510e8d547788846ae2bc9fe93.tar.bz2 trackermap-server-5d5ba5b00a390cb510e8d547788846ae2bc9fe93.zip | |
Add more Galileo tags (fix #667)
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/protocol/GalileoProtocolDecoder.java | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/src/org/traccar/protocol/GalileoProtocolDecoder.java b/src/org/traccar/protocol/GalileoProtocolDecoder.java index 1cc98a6ba..079b76ea4 100644 --- a/src/org/traccar/protocol/GalileoProtocolDecoder.java +++ b/src/org/traccar/protocol/GalileoProtocolDecoder.java @@ -39,32 +39,40 @@ public class GalileoProtocolDecoder extends BaseProtocolDecoder { public GalileoProtocolDecoder(ServerManager serverManager) { super(serverManager); } + + private static final int TAG_IMEI = 0x03; + private static final int TAG_DATE = 0x20; + private static final int TAG_COORDINATES = 0x30; + private static final int TAG_SPEED_COURSE = 0x33; + private static final int TAG_ALTITUDE = 0x34; + private static final int TAG_STATUS = 0x40; + private static final int TAG_POWER = 0x41; + private static final int TAG_BATTERY = 0x42; + private static final int TAG_MILAGE = 0xd4; + private static final int TAG_REFRIGERATOR = 0x5b; + private static final int TAG_PRESSURE = 0x5c; private static final Map<Integer, Integer> tagLengthMap = new HashMap<Integer, Integer>(); static { - int[] l1 = {0x01,0x02,0x35,0x43,0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd5}; + int[] l1 = {0x01,0x02,0x35,0x43,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd5,0x88,0x8a,0x8b,0x8c,0xa0,0xaf,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae}; int[] l2 = {0x04,0x10,0x34,0x40,0x41,0x42,0x45,0x46,0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x60,0x61,0x62,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xd6,0xd7,0xd8,0xd9,0xda}; - int[] l4 = {0x20,0x33,0x44,0x90,0xc0,0xc1,0xc2,0xc3,0xd3,0xd4,0xdb,0xdc,0xdd,0xde,0xdf,0xf0,0xf1,0xf2,0xf3}; + int[] l3 = {0x63,0x64,0x6f,0x5d,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e}; + int[] l4 = {0x20,0x33,0x44,0x90,0xc0,0xc1,0xc2,0xc3,0xd3,0xd4,0xdb,0xdc,0xdd,0xde,0xdf,0xf0,0xf9,0x5a,0x47,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8}; for (int i : l1) { tagLengthMap.put(i, 1); } for (int i : l2) { tagLengthMap.put(i, 2); } + for (int i : l3) { tagLengthMap.put(i, 3); } for (int i : l4) { tagLengthMap.put(i, 4); } + tagLengthMap.put(TAG_COORDINATES, 9); + tagLengthMap.put(TAG_IMEI, 15); + tagLengthMap.put(TAG_REFRIGERATOR, 7); // variable length + tagLengthMap.put(TAG_PRESSURE, 68); } private static int getTagLength(int tag) { return tagLengthMap.get(tag); } - private static final int TAG_IMEI = 0x03; - private static final int TAG_DATE = 0x20; - private static final int TAG_COORDINATES = 0x30; - private static final int TAG_SPEED_COURSE = 0x33; - private static final int TAG_ALTITUDE = 0x34; - private static final int TAG_STATUS = 0x40; - private static final int TAG_POWER = 0x41; - private static final int TAG_BATTERY = 0x42; - private static final int TAG_MILAGE = 0xd4; - private void sendReply(Channel channel, int checksum) { ChannelBuffer reply = ChannelBuffers.directBuffer(ByteOrder.LITTLE_ENDIAN, 3); reply.writeByte(0x02); |