From 9b1d9a276daee380c136a5ccf2c448e6a8e8e9f9 Mon Sep 17 00:00:00 2001 From: drecchia Date: Wed, 6 Jul 2016 11:39:43 -0300 Subject: - Pt502 output_control fix. - Added command for set maxSpeed and sms timezone. --- src/org/traccar/model/Command.java | 1 + src/org/traccar/protocol/Pt502Protocol.java | 2 ++ src/org/traccar/protocol/Pt502ProtocolEncoder.java | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/org/traccar') diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index d15eb9e70..d1b9aa793 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -44,6 +44,7 @@ public class Command extends Message { public static final String TYPE_ALARM_SOS = "alarmSos"; public static final String TYPE_ALARM_REMOVE = "alarmRemove"; public static final String TYPE_ALARM_CLOCK = "alarmClock"; + public static final String TYPE_ALARM_SPEED = "alarmSpeed"; public static final String KEY_UNIQUE_ID = "uniqueId"; public static final String KEY_FREQUENCY = "frequency"; diff --git a/src/org/traccar/protocol/Pt502Protocol.java b/src/org/traccar/protocol/Pt502Protocol.java index 04c758b22..75fe0f628 100644 --- a/src/org/traccar/protocol/Pt502Protocol.java +++ b/src/org/traccar/protocol/Pt502Protocol.java @@ -31,6 +31,8 @@ public class Pt502Protocol extends BaseProtocol { public Pt502Protocol() { super("pt502"); setSupportedCommands( + Command.TYPE_SET_TIMEZONE, + Command.TYPE_ALARM_SPEED, Command.TYPE_OUTPUT_CONTROL); } diff --git a/src/org/traccar/protocol/Pt502ProtocolEncoder.java b/src/org/traccar/protocol/Pt502ProtocolEncoder.java index 86c6703d4..b8ca8ab15 100644 --- a/src/org/traccar/protocol/Pt502ProtocolEncoder.java +++ b/src/org/traccar/protocol/Pt502ProtocolEncoder.java @@ -26,7 +26,11 @@ public class Pt502ProtocolEncoder extends StringProtocolEncoder { switch (command.getType()) { case Command.TYPE_OUTPUT_CONTROL: - return formatCommand(command, "000000OPC{%s},{%s}", Command.KEY_INDEX, Command.KEY_DATA); + return formatCommand(command, "#OPC{%s},{%s}\r\n", Command.KEY_INDEX, Command.KEY_DATA); + case Command.TYPE_SET_TIMEZONE: + return formatCommand(command, "#TMZ{%s}\r\n", Command.KEY_TIMEZONE); + case Command.TYPE_ALARM_SPEED: + return formatCommand(command, "#SPD{%s}\r\n", Command.KEY_DATA); default: Log.warning(new UnsupportedOperationException(command.getType())); break; -- cgit v1.2.3