Merge branch 'master' into suntech-fixes

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
index 2e1ddf5f2..891046213 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
@@ -262,6 +262,13 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
                 case 0x0011:
                     position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 0.05);
                     break;
+                case 0x0014:
+                    position.set(Position.KEY_ENGINE_LOAD, buf.readUnsignedByte() / 255.0);
+                    position.set("timingAdvance", buf.readUnsignedByte() * 0.5);
+                    position.set("airTemp", buf.readUnsignedByte() - 40);
+                    position.set("airFlow", buf.readUnsignedShort() * 0.01);
+                    position.set(Position.KEY_THROTTLE, buf.readUnsignedByte() / 255.0);
+                    break;
                 case 0x0020:
                     String[] cells = buf.readCharSequence(
                             length, StandardCharsets.US_ASCII).toString().split("\\+");