Merge pull request #2121 from drecchia/master-carcell2

Carcell protocol implementation

6 files changed, 261 insertions, 0 deletions

diff --git a/debug.xml b/debug.xml
index 09a575450..a55d1a6a6 100644
--- a/debug.xml
+++ b/debug.xml
@@ -436,5 +436,6 @@
     <entry key='huasheng.port'>5111</entry>
     <entry key='l100.port'>5112</entry>
     <entry key='granit.port'>5113</entry>
+    <entry key='carcell.port'>5114</entry>
 
 </properties>
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index a8bf9c334..8a119f35a 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -388,5 +388,6 @@
     <entry key='huasheng.port'>5111</entry>
     <entry key='l100.port'>5112</entry>
     <entry key='granit.port'>5113</entry>
+    <entry key='carcell.port'>5114</entry>
 
 </properties>
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index a67d8c53c..049034b01 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -388,5 +388,6 @@
     <entry key='huasheng.port'>5111</entry>

     <entry key='l100.port'>5112</entry>

     <entry key='granit.port'>5113</entry>

+    <entry key='carcell.port'>5114</entry>

 

 </properties>

diff --git a/src/org/traccar/protocol/CarcellProtocol.java b/src/org/traccar/protocol/CarcellProtocol.java
new file mode 100644
index 000000000..5982e9cf8
--- /dev/null
+++ b/src/org/traccar/protocol/CarcellProtocol.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import java.util.List;
+
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.CharacterDelimiterFrameDecoder;
+import org.traccar.TrackerServer;
+import org.traccar.model.Command;
+
+public class CarcellProtocol extends BaseProtocol {
+
+    public CarcellProtocol() {
+        super("carcell");
+        setSupportedCommands(
+                Command.TYPE_ENGINE_STOP,
+                Command.TYPE_ENGINE_RESUME);
+    }
+
+    @Override
+    public void initTrackerServers(List<TrackerServer> serverList) {
+        serverList.add(new TrackerServer(new ServerBootstrap(), this.getName()) {
+            @Override
+            protected void addSpecificHandlers(ChannelPipeline pipeline) {
+                pipeline.addLast("frameDecoder", new CharacterDelimiterFrameDecoder(1024, '\r'));
+                pipeline.addLast("stringEncoder", new StringEncoder());
+                pipeline.addLast("stringDecoder", new StringDecoder());
+                pipeline.addLast("objectEncoder", new CarcellProtocolEncoder());
+                pipeline.addLast("objectDecoder", new CarcellProtocolDecoder(CarcellProtocol.this));
+            }
+        });
+    }
+
+}
diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/org/traccar/protocol/CarcellProtocolDecoder.java
new file mode 100644
index 000000000..50b294f45
--- /dev/null
+++ b/src/org/traccar/protocol/CarcellProtocolDecoder.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import java.net.SocketAddress;
+import java.util.regex.Pattern;
+
+import org.jboss.netty.channel.Channel;
+import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.DateBuilder;
+import org.traccar.helper.Parser;
+import org.traccar.helper.Parser.CoordinateFormat;
+import org.traccar.helper.PatternBuilder;
+import org.traccar.helper.UnitsConverter;
+import org.traccar.model.Position;
+
+public class CarcellProtocolDecoder extends BaseProtocolDecoder {
+
+    public CarcellProtocolDecoder(CarcellProtocol protocol) {
+        super(protocol);
+    }
+
+    private static final Pattern PATTERN = new PatternBuilder()
+            .expression("([$%])")                // memory flag
+            .number("(d+),")                     // imei
+            .groupBegin()
+            .number("([NS])(dd)(dd).(dddd),")    // latitude
+            .number("([EW])(ddd)(dd).(dddd),")   // longitude
+            .or()
+            .text("CEL,")
+            .number("([NS])(d+.d+),")            // latitude
+            .number("([EW])(d+.d+),")            // longitude
+            .groupEnd()
+            .number("(d+),")                     // speed
+            .number("(d+),")                     // course
+            .groupBegin()
+            .number("([-+]ddd)([-+]ddd)([-+]ddd),")       // x,y,z
+            .or()
+            .number("(d+),")                     // accel
+            .groupEnd()
+            .number("(d+),")                     // battery
+            .number("(d+),")                     // csq
+            .number("(d),")                      // jamming
+            .number("(d+),")                     // hdop
+            .expression("([CG]),?")                // clock type
+            .number("(dd)(dd)(dd),")             // date
+            .number("(dd)(dd)(dd),")             // time
+            .number("(d),")                      // block
+            .number("(d),")                      // ignition
+            .groupBegin()
+            .number("(d),")                      // cloned
+            .expression("([AF])")                // panic
+            .number("(d),")                      // painel
+            .number("(d+),")                     // battery voltage
+            .or()
+            .number("(dd),")                     // time
+            .expression("([AF])")                // panic
+            .number("(d),")                      // aux
+            .number("(d{2,4}),")                 // battery voltage
+            .number("(d{20}),")                  // ccid
+            .groupEnd()
+            .number("(xx)")                      // crc
+            .any()                               // full format
+            .compile();
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        Parser parser = new Parser(PATTERN, (String) msg);
+
+        if (!parser.matches()) {
+            return null;
+        }
+
+        Position position = new Position();
+        position.setProtocol(getProtocolName());
+        position.set(Position.KEY_ARCHIVE, parser.next().equals("%"));
+        position.setValid(true);
+
+        if (!identify(parser.next(), channel, remoteAddress)) {
+            return null;
+        }
+
+        position.setDeviceId(getDeviceId());
+
+        if (parser.hasNext(8)) {
+            position.setLatitude(parser.nextCoordinate(CoordinateFormat.HEM_DEG_MIN_MIN));
+            position.setLongitude(parser.nextCoordinate(CoordinateFormat.HEM_DEG_MIN_MIN));
+        }
+
+        if (parser.hasNext(4)) {
+            position.setLatitude(parser.nextCoordinate(CoordinateFormat.HEM_DEG));
+            position.setLongitude(parser.nextCoordinate(CoordinateFormat.HEM_DEG));
+        }
+
+        position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt()));
+        position.setCourse(parser.nextInt());
+
+        if (parser.hasNext(3)) {
+            position.set("x", parser.nextInt());
+            position.set("y", parser.nextInt());
+            position.set("z", parser.nextInt());
+        }
+
+        if (parser.hasNext(1)) {
+            position.set("accel", parser.nextInt());
+        }
+
+        Double internalBattery = (parser.nextDouble() + 100d) * 0.0294d;
+        position.set(Position.KEY_BATTERY, internalBattery);
+        position.set(Position.KEY_GSM, parser.nextInt());
+        position.set("jamming", parser.next().equals("1"));
+        position.set(Position.KEY_GPS, parser.nextInt());
+
+        parser.next(); // clock type
+
+        DateBuilder dateBuilder = new DateBuilder().
+                setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt())
+                .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+        position.setTime(dateBuilder.getDate());
+
+        position.set("blocked", parser.next().equals("1"));
+        position.set(Position.KEY_IGNITION, parser.next().equals("1"));
+
+        if (parser.hasNext(4)) {
+            position.set("cloned", parser.next().equals("1"));
+
+            parser.next(); // panic button status
+
+            String painelStatus = parser.next();
+            position.set(Position.KEY_ALARM, painelStatus.equals("1"));
+            position.set("painel", painelStatus.equals("2"));
+
+            Double mainVoltage = parser.nextDouble() / 100d;
+            position.set(Position.KEY_POWER, mainVoltage);
+        }
+
+        if (parser.hasNext(5)) {
+            position.set("timeUntilDelivery", parser.nextInt());
+            parser.next(); // panic button status
+            parser.next(); // aux
+
+            Double mainVoltage = parser.nextDouble() / 100d;
+            position.set(Position.KEY_POWER, mainVoltage);
+
+            position.set("iccid", parser.next());
+        }
+
+        return position;
+    }
+
+}
diff --git a/src/org/traccar/protocol/CarcellProtocolEncoder.java b/src/org/traccar/protocol/CarcellProtocolEncoder.java
new file mode 100644
index 000000000..d01a11e52
--- /dev/null
+++ b/src/org/traccar/protocol/CarcellProtocolEncoder.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import org.traccar.StringProtocolEncoder;
+import org.traccar.helper.Log;
+import org.traccar.model.Command;
+
+public class CarcellProtocolEncoder extends StringProtocolEncoder {
+
+    @Override
+    protected Object encodeCommand(Command command) {
+
+        switch (command.getType()) {
+            case Command.TYPE_ENGINE_STOP:
+                return formatCommand(command, "$SRVCMD,{%s},BA#\r\n", Command.KEY_UNIQUE_ID);
+            case Command.TYPE_ENGINE_RESUME:
+                return formatCommand(command, "$SRVCMD,{%s},BD#\r\n", Command.KEY_UNIQUE_ID);
+            default:
+                Log.warning(new UnsupportedOperationException(command.getType()));
+                break;
+        }
+
+        return null;
+    }
+
+}