Resolved conflict with master;

1 files changed, 9 insertions, 0 deletions

diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
index e647a33a0..9c1e0a2ff 100644
--- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -73,6 +73,12 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
 
     private void decodeParameter(Position position, int id, ChannelBuffer buf, int length) {
         switch (id) {
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+                position.set("di" + id, buf.readUnsignedByte());
+                break;
             case 9:
                 position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort());
                 break;
@@ -82,6 +88,9 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
             case 67:
                 position.set(Position.KEY_BATTERY, buf.readUnsignedShort() + "mV");
                 break;
+            case 70:
+                position.set("pcbTemp", (length == 4 ? buf.readInt() : buf.readShort()) * 0.1);
+                break;
             case 72:
                 position.set(Position.PREFIX_TEMP + 1, buf.readInt() * 0.1);
                 break;