From 069e8b7aaf140f9334eb755e8c3af4a78c4b2d27 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 15 Dec 2020 19:49:14 -0800 Subject: Fix temperature decoding --- src/main/java/org/traccar/protocol/TaipProtocolDecoder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/traccar/protocol/TaipProtocolDecoder.java b/src/main/java/org/traccar/protocol/TaipProtocolDecoder.java index ed6d2b899..7d31b332d 100644 --- a/src/main/java/org/traccar/protocol/TaipProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/TaipProtocolDecoder.java @@ -73,8 +73,8 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder { .number(",(d{4})(d{4})") // power / battery .number(",(d+)") // rpm .groupBegin() - .number(",(-?d+)") // temperature 1 - .number(",(-?d+)") // temperature 2 + .number(",([-+]?d+.?d*)") // temperature 1 + .number(",([-+]?d+.?d*)") // temperature 2 .groupEnd("?") .number(",(xx)") // alarm .or() @@ -191,8 +191,8 @@ public class TaipProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_POWER, parser.nextInt() * 0.01); position.set(Position.KEY_BATTERY, parser.nextInt() * 0.01); position.set(Position.KEY_RPM, parser.nextInt()); - position.set(Position.PREFIX_TEMP + 1, parser.nextInt()); - position.set(Position.PREFIX_TEMP + 2, parser.nextInt()); + position.set(Position.PREFIX_TEMP + 1, parser.nextDouble()); + position.set(Position.PREFIX_TEMP + 2, parser.nextDouble()); position.set(Position.KEY_ALARM, decodeAlarm(parser.nextHexInt())); } -- cgit v1.2.3