aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIrving Gonzalez <ialexis93@gmail.com>2015-07-27 23:05:26 -0600
committerIrving Gonzalez <ialexis93@gmail.com>2015-07-27 23:05:26 -0600
commit23785ccc618d65ea197ed9e081bf033ea8d64a7e (patch)
tree95855816fc68e2f6f216f6eb768585ba9d8b5e46
parentc4f6471ee18b97130e85efd488b5d102a1935366 (diff)
downloadtrackermap-server-23785ccc618d65ea197ed9e081bf033ea8d64a7e.tar.gz
trackermap-server-23785ccc618d65ea197ed9e081bf033ea8d64a7e.tar.bz2
trackermap-server-23785ccc618d65ea197ed9e081bf033ea8d64a7e.zip
Removing unnecessary try-catch and adding more commands to Totem protocol
-rw-r--r--src/org/traccar/model/Command.java5
-rw-r--r--src/org/traccar/protocol/TotemFrameDecoder.java12
-rw-r--r--src/org/traccar/protocol/TotemProtocol.java4
-rw-r--r--src/org/traccar/protocol/TotemProtocolEncoder.java9
-rw-r--r--test/org/traccar/protocol/TotemProtocolEncoderTest.java4
5 files changed, 18 insertions, 16 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index 90e4ba767..8c4e3f0f1 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -25,10 +25,11 @@ public class Command implements Factory {
public static final String TYPE_POSITION_STOP = "positionStop";
public static final String TYPE_POSITION_FIX = "positionFix";
public static final String TYPE_ENGINE_STOP = "engineStop";
- public static final String TYPE_ENGINE_RESUME = "engineResume";
- public static final String TYPE_IMEI = "imei";
+ public static final String TYPE_ENGINE_RESUME = "engineResume";
public static final String KEY_UNIQUE_ID = "uniqueId";
public static final String KEY_FREQUENCY = "frequency";
+ public static final String KEY_GPS_PASSWORD = "gpsPassword";
+
}
diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java
index 00eb5ec82..6f7c3a37c 100644
--- a/src/org/traccar/protocol/TotemFrameDecoder.java
+++ b/src/org/traccar/protocol/TotemFrameDecoder.java
@@ -19,8 +19,7 @@ import java.nio.charset.Charset;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.traccar.helper.Log;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
public class TotemFrameDecoder extends FrameDecoder {
@@ -40,17 +39,14 @@ public class TotemFrameDecoder extends FrameDecoder {
buf.skipBytes(2);
}
- try{
- // Read message
+ if(buf.toString(buf.readerIndex(), 2, Charset.defaultCharset()).equals("$$")){
int length = Integer.parseInt(buf.toString(buf.readerIndex() + 2, 2, Charset.defaultCharset()), 16);
if (length <= buf.readableBytes()) {
return buf.readBytes(length);
}
- }catch(Exception e){
+ }else{
//TODO: notify to user the GPS response
-
- Log.debug("GPS Response: " + buf.toString(buf.readerIndex(), buf.readableBytes(), Charset.defaultCharset()));
- //return buf.readBytes(buf.readableBytes());
+ return buf.readBytes(buf.readableBytes());
}
return null;
diff --git a/src/org/traccar/protocol/TotemProtocol.java b/src/org/traccar/protocol/TotemProtocol.java
index 8445f04b6..097f6a593 100644
--- a/src/org/traccar/protocol/TotemProtocol.java
+++ b/src/org/traccar/protocol/TotemProtocol.java
@@ -30,7 +30,9 @@ public class TotemProtocol extends BaseProtocol {
public TotemProtocol() {
super("totem");
setSupportedCommands(
- Command.TYPE_IMEI);
+ Command.TYPE_ENGINE_RESUME,
+ Command.TYPE_ENGINE_STOP
+ );
}
@Override
diff --git a/src/org/traccar/protocol/TotemProtocolEncoder.java b/src/org/traccar/protocol/TotemProtocolEncoder.java
index 02dabc5fb..d236a7e2c 100644
--- a/src/org/traccar/protocol/TotemProtocolEncoder.java
+++ b/src/org/traccar/protocol/TotemProtocolEncoder.java
@@ -15,7 +15,7 @@
*/
package org.traccar.protocol;
-import org.traccar.StringProtocolEncoder;
+import org.traccar.StringProtocolEncoder;
import org.traccar.model.Command;
/**
@@ -28,8 +28,11 @@ public class TotemProtocolEncoder extends StringProtocolEncoder{
protected Object encodeCommand(Command command) {
switch (command.getType()) {
- case Command.TYPE_IMEI:
- return "*000000,801#";
+ //Assuming PIN 8 (Output C) is the power wire, like manual says but it can be PIN 5,7,8
+ case Command.TYPE_ENGINE_STOP:
+ return formatCommand(command, "*{%s},025,C,1#", Command.KEY_GPS_PASSWORD);
+ case Command.TYPE_ENGINE_RESUME:
+ return formatCommand(command, "*{%s},025,C,0#", Command.KEY_GPS_PASSWORD);
}
return null;
diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/test/org/traccar/protocol/TotemProtocolEncoderTest.java
index 13c5b944f..1e7a95e41 100644
--- a/test/org/traccar/protocol/TotemProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/TotemProtocolEncoderTest.java
@@ -33,9 +33,9 @@ public class TotemProtocolEncoderTest {
Command command = new Command();
command.setDeviceId(2);
- command.setType(Command.TYPE_IMEI);
+ command.setType(Command.TYPE_ENGINE_STOP);
- Assert.assertEquals("*000000,801#", encoder.encodeCommand(command));
+ Assert.assertEquals("*000000,025,C,1#", encoder.encodeCommand(command));
}
}