From de60cf9d75d669a8078df32f7e11bf7af1970777 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 30 Dec 2016 22:47:25 +1300 Subject: Add more MiniFinder commands --- src/org/traccar/model/Command.java | 1 + src/org/traccar/protocol/MiniFinderProtocol.java | 4 +++- src/org/traccar/protocol/MiniFinderProtocolEncoder.java | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/org') diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java index da73af1bb..84f5d95ce 100644 --- a/src/org/traccar/model/Command.java +++ b/src/org/traccar/model/Command.java @@ -53,6 +53,7 @@ public class Command extends Message { public static final String TYPE_ALARM_CLOCK = "alarmClock"; public static final String TYPE_ALARM_SPEED = "alarmSpeed"; public static final String TYPE_ALARM_FALL = "alarmFall"; + public static final String TYPE_ALARM_VIBRATION = "alarmVibration"; public static final String KEY_UNIQUE_ID = "uniqueId"; public static final String KEY_FREQUENCY = "frequency"; diff --git a/src/org/traccar/protocol/MiniFinderProtocol.java b/src/org/traccar/protocol/MiniFinderProtocol.java index 71a956d0f..3bbdc1beb 100644 --- a/src/org/traccar/protocol/MiniFinderProtocol.java +++ b/src/org/traccar/protocol/MiniFinderProtocol.java @@ -35,11 +35,13 @@ public class MiniFinderProtocol extends BaseProtocol { Command.TYPE_VOICE_MONITORING, Command.TYPE_ALARM_SPEED, Command.TYPE_ALARM_GEOFENCE, + Command.TYPE_ALARM_VIBRATION, Command.TYPE_SET_AGPS, Command.TYPE_ALARM_FALL, Command.TYPE_MODE_POWER_SAVING, Command.TYPE_MODE_DEEP_SLEEP, - Command.TYPE_SOS_NUMBER); + Command.TYPE_SOS_NUMBER, + Command.TYPE_SET_INDICATOR); } @Override diff --git a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java index 96079745c..e5c43e29a 100644 --- a/src/org/traccar/protocol/MiniFinderProtocolEncoder.java +++ b/src/org/traccar/protocol/MiniFinderProtocolEncoder.java @@ -58,6 +58,8 @@ public class MiniFinderProtocolEncoder extends StringProtocolEncoder implements return formatCommand(command, "{%s}J1{%s}", Command.KEY_DEVICE_PASSWORD, Command.KEY_DATA); case Command.TYPE_ALARM_GEOFENCE: return formatCommand(command, "{%s}R1{%s}", Command.KEY_DEVICE_PASSWORD, Command.KEY_RADIUS); + case Command.TYPE_ALARM_VIBRATION: + return formatCommand(command, "{%s}W1,{%s}", Command.KEY_DEVICE_PASSWORD, Command.KEY_DATA); case Command.TYPE_SET_AGPS: return formatCommand(command, "{%s}AGPS{%s}", this, Command.KEY_DEVICE_PASSWORD, Command.KEY_ENABLE); case Command.TYPE_ALARM_FALL: @@ -69,6 +71,8 @@ public class MiniFinderProtocolEncoder extends StringProtocolEncoder implements case Command.TYPE_SOS_NUMBER: return formatCommand(command, "{%s}{%s}1,{%s}", this, Command.KEY_DEVICE_PASSWORD, Command.KEY_INDEX, Command.KEY_PHONE); + case Command.TYPE_SET_INDICATOR: + return formatCommand(command, "{%s}LED{%s}", Command.KEY_DEVICE_PASSWORD, Command.KEY_DATA); default: Log.warning(new UnsupportedOperationException(command.getType())); return null; -- cgit v1.2.3