GoSafe G1A additional data

2 files changed, 9 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index 00093c978..b891bc388 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -123,7 +123,7 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
                 || BitUtil.check(value, 10) || BitUtil.check(value, 11)) {
             return Position.ALARM_FAULT;
         }
-        if (BitUtil.check(value, 7)) {
+        if (BitUtil.check(value, 7) || BitUtil.check(value, 18)) {
             return Position.ALARM_LOW_BATTERY;
         }
         if (BitUtil.check(value, 8)) {
@@ -376,6 +376,7 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
 
         position.set(Position.KEY_IGNITION, BitUtil.check(status, 0));
         position.set(Position.KEY_BLOCKED, BitUtil.check(status, 10));
+        position.set(Position.KEY_CHARGE, BitUtil.check(status, 26));
 
         position.setValid(BitUtil.check(status, 1));
 
@@ -540,6 +541,9 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
                                 case 0x00CE:
                                     position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
                                     break;
+                                case 0xE1:
+                                    position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+                                    break;
                                 default:
                                     buf.skipBytes(extendedLength - 2);
                                     break;
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 0b36b8f4d..49622745f 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -11,6 +11,10 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
 
         var decoder = inject(new HuabaoProtocolDecoder(null));
 
+        verifyAttribute(decoder, binary(
+                "7e020000340551231425560568000000000400000201618a9706c320e100410000002722060816261501040000015d300115310105eb0a000300e164000300e301957e"),
+                Position.KEY_BATTERY_LEVEL, 100);
+
         verifyNull(decoder, buffer(
                 "(794104004140,1,001,BASE,2,TIME)"));