Support Amber IoT asset tracker

2 files changed, 30 insertions, 6 deletions

diff --git a/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java b/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
index 6f739a1a4..9380d2327 100644
--- a/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2024 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.traccar.BaseHttpProtocolDecoder;
 import org.traccar.helper.BufferUtil;
+import org.traccar.model.Device;
 import org.traccar.session.DeviceSession;
 import org.traccar.Protocol;
 import org.traccar.helper.BitUtil;
@@ -154,20 +155,34 @@ public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder {
 
         } else if (jsonContains(json, "data")) {
 
+            String model = getCacheManager().getObject(Device.class, deviceSession.getDeviceId()).getModel();
+
             ByteBuf buf = Unpooled.wrappedBuffer(DataConverter.parseHex(json.getString("data")));
             try {
-                int event = buf.readUnsignedByte();
-                if (event == 0x0f || event == 0x1f) {
+                int header = buf.readUnsignedByte();
+                if ("Amber".equals(model)) {
+
+                    int flags = buf.readUnsignedByte();
+                    position.set(Position.KEY_MOTION, BitUtil.check(flags, 1));
+
+                    position.set(Position.KEY_BATTERY, buf.readUnsignedByte() * 0.02);
+                    position.set(Position.PREFIX_TEMP + 1, (int) buf.readByte());
+
+                    position.setValid(true);
+                    position.setLatitude(buf.readInt() / 60000.0);
+                    position.setLongitude(buf.readInt() / 60000.0);
+
+                } else if (header == 0x0f || header == 0x1f) {
 
-                    position.setValid(event >> 4 > 0);
+                    position.setValid(header >> 4 > 0);
                     position.setLatitude(BufferUtil.readSignedMagnitudeInt(buf) * 0.000001);
                     position.setLongitude(BufferUtil.readSignedMagnitudeInt(buf) * 0.000001);
 
                     position.set(Position.KEY_BATTERY, (int) buf.readUnsignedByte());
 
-                } else if (event >> 4 <= 3 && buf.writerIndex() == 12) {
+                } else if (header >> 4 <= 3 && buf.writerIndex() == 12) {
 
-                    if (BitUtil.to(event, 4) == 0) {
+                    if (BitUtil.to(header, 4) == 0) {
                         position.setValid(true);
                         position.setLatitude(buf.readIntLE() * 0.0000001);
                         position.setLongitude(buf.readIntLE() * 0.0000001);
diff --git a/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java
index cc6c17014..8a275ce9a 100644
--- a/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java
@@ -3,8 +3,11 @@ package org.traccar.protocol;
 import io.netty.handler.codec.http.HttpMethod;
 import org.junit.jupiter.api.Test;
 import org.traccar.ProtocolTest;
+import org.traccar.model.Device;
 import org.traccar.model.Position;
 
+import static org.mockito.Mockito.when;
+
 public class SigfoxProtocolDecoderTest extends ProtocolTest {
 
     @Test
@@ -43,6 +46,12 @@ public class SigfoxProtocolDecoderTest extends ProtocolTest {
         verifyPosition(decoder, request(HttpMethod.POST, "/",
                 buffer("%7B++%22device%22%3A%222BF839%22%2C++%22time%22%3A1510605882%2C++%22duplicate%22%3Afalse%2C++%22snr%22%3A45.61%2C++%22station%22%3A%2235A9%22%2C++%22data%22%3A%2200bd6475e907398e562d01b9%22%2C++%22avgSnr%22%3A45.16%2C++%22lat%22%3A-38.0%2C++%22lng%22%3A145.0%2C++%22rssi%22%3A-98.00%2C++%22seqNumber%22%3A228+%7D=")));
 
+        var device = decoder.getCacheManager().getObject(Device.class, 1);
+        when(device.getModel()).thenReturn("Amber");
+
+        verifyPosition(decoder, request(HttpMethod.POST, "/",
+                buffer("{ \"deviceId\":\"284019F\", \"timestamp\":\"1707375610\", \"seqNo\":\"42\", \"data\":\"0100b019ffe8645d0019e513\", \"linkQuality\":\"Excellent\", \"operator\":\"SIGFOX_South_Africa_Sqwidnet\", \"country\":\"710\" }")));
+
     }
 
 }