From 06a746b44dae69b0c84a5302f92a1bcbe2dc827f Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Thu, 2 Jun 2016 13:47:51 +1200
Subject: Properly decode Telic info (fix #1735)

---
 src/org/traccar/protocol/TelicProtocolDecoder.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/protocol/TelicProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/TelicProtocolDecoder.java b/src/org/traccar/protocol/TelicProtocolDecoder.java
index 812aeec0a..b8929fae5 100644
--- a/src/org/traccar/protocol/TelicProtocolDecoder.java
+++ b/src/org/traccar/protocol/TelicProtocolDecoder.java
@@ -51,7 +51,8 @@ public class TelicProtocolDecoder extends BaseProtocolDecoder {
             .number("(d+),")                     // course
             .number("(d+),")                     // satellites
             .expression("(?:[^,]*,){7}")
-            .number("(d+),")
+            .number("(d+),")                     // battery
+            .number("(d+),")                     // external
             .any()
             .compile();
 
@@ -94,7 +95,8 @@ public class TelicProtocolDecoder extends BaseProtocolDecoder {
         position.setCourse(parser.nextDouble());
 
         position.set(Position.KEY_SATELLITES, parser.next());
-        position.set(Position.KEY_BATTERY, parser.nextInt());
+        position.set(Position.KEY_BATTERY, 3.4 + parser.nextInt() * 0.00345);
+        position.set(Position.KEY_POWER, 6.0 + parser.nextInt() * 0.125);
 
         return position;
     }
-- 
cgit v1.2.3