Windy/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-01-08 11:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add SEEWORLD D11L external power

Browse Source
This commit is contained in:
Anton Tananaev 2024-09-25 12:02:25 -07:00
parent bb801da997
commit d12403926b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
View File

@ -846,9 +846,11 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
if (modelLW && type == MSG_STATUS) {
position.set(Position.KEY_POWER, BitUtil.to(buf.readUnsignedShort(), 12) / 10.0);
} else {
short alarmExtension = buf.readUnsignedByte();
if (variant != Variant.VXT01) {
position.addAlarm(decodeAlarm(alarmExtension, modelLW));
short extension = buf.readUnsignedByte();
if (type == MSG_STATUS) {
position.set(Position.KEY_POWER, (double) extension);
} else if (variant != Variant.VXT01) {
position.addAlarm(decodeAlarm(extension, modelLW));
}
}
}

6
src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
View File

@ -17,6 +17,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"78780D01086471700328358100093F040D0A"));
verifyAttribute(decoder, binary(
"78780a134506560b0102242b850d0a"),
Position.KEY_POWER, 11.0);
verifyAttribute(decoder, binary(
"787817360005040002003201010018020192006a015f0324aeaf0d0a"),
Position.KEY_BATTERY, 4.02);
@ -76,7 +80,7 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyAttribute(decoder, binary(
"78780a130604ea04000006bc8a0d0a"),
Position.KEY_POWER, null);
Position.KEY_POWER, 4.0);
verifyAttributes(decoder, binary(
"797900849404414c4d313d43353b414c4d323d43433b414c4d333d35433b535441313d43303b4459443d30313b534f533d303133323838333730302c2c3b43454e5445523d303133323838333730303b46454e43453d46656e63652c4f46462c302c302e3030303030302c302e3030303030302c3330302c494e206f72204f55542c313b00b79d120d0a"));