aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-08 17:51:48 +1200
committerGitHub <noreply@github.com>2016-07-08 17:51:48 +1200
commit41028b36b1304ea2150537db3fdf147c6116d28b (patch)
treecfb277da4a34e4831079aebccb0bd0bc63e15df9
parentd7ac5195b14e1645b2764711b69b8d73b599917b (diff)
parent282d1f68fd81861529d47d23c02624a02d07dc8e (diff)
downloadtraccar-server-41028b36b1304ea2150537db3fdf147c6116d28b.tar.gz
traccar-server-41028b36b1304ea2150537db3fdf147c6116d28b.tar.bz2
traccar-server-41028b36b1304ea2150537db3fdf147c6116d28b.zip
Merge pull request #2090 from Abyss777/master
l10n strings for new command types
-rw-r--r--src/org/traccar/protocol/WondexProtocol.java3
-rw-r--r--src/org/traccar/protocol/WondexProtocolEncoder.java2
-rw-r--r--web/l10n/en.json3
3 files changed, 7 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/WondexProtocol.java b/src/org/traccar/protocol/WondexProtocol.java
index e7144eabe..78e090f03 100644
--- a/src/org/traccar/protocol/WondexProtocol.java
+++ b/src/org/traccar/protocol/WondexProtocol.java
@@ -31,7 +31,8 @@ public class WondexProtocol extends BaseProtocol {
super("wondex");
setSupportedCommands(
Command.TYPE_REBOOT_DEVICE,
- Command.TYPE_POSITION_SINGLE);
+ Command.TYPE_POSITION_SINGLE,
+ Command.TYPE_IDENTIFICATION);
}
@Override
diff --git a/src/org/traccar/protocol/WondexProtocolEncoder.java b/src/org/traccar/protocol/WondexProtocolEncoder.java
index c8bc58b40..9d000d9ea 100644
--- a/src/org/traccar/protocol/WondexProtocolEncoder.java
+++ b/src/org/traccar/protocol/WondexProtocolEncoder.java
@@ -16,6 +16,8 @@ public class WondexProtocolEncoder extends StringProtocolEncoder {
return formatCommand(command, "$WP+REBOOT={%s}", Command.KEY_DEVICE_PASSWORD);
case Command.TYPE_POSITION_SINGLE:
return formatCommand(command, "$WP+GETLOCATION={%s}", Command.KEY_DEVICE_PASSWORD);
+ case Command.TYPE_IDENTIFICATION:
+ return formatCommand(command, "$WP+VER={%s}", Command.KEY_DEVICE_PASSWORD);
default:
Log.warning(new UnsupportedOperationException(command.getType()));
break;
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 0e4d630cc..e97bb45b1 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -107,6 +107,9 @@
"commandSilenceTime": "Set Silence Time",
"commandSetPhonebook": "Set Phonebook",
"commandVoiceMessage": "Voice Message",
+ "commandOutputControl": "Output Control",
+ "commandAlarmSpeed": "Overspeed Alarm",
+ "commandDeviceIdentification": "Device Identification",
"eventDeviceOnline": "Device is online",
"eventDeviceOffline": "Device is offline",
"eventDeviceMoving": "Device is moving",