diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-12-11 10:58:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-11 10:58:58 -0800 |
| commit | 65eb526466a30cf70be103671bc14e2b460cf689 (patch) | |
| tree | 2da6faf471f43db7e03d6e21fb051ddc3ae020eb | |
| parent | ffd8ab43e4c2d7fa69753fe73d4e546896d920b6 (diff) | |
| parent | b845750ff5be762098b8d246fbb2ca4f35b7e9c5 (diff) | |
| download | trackermap-server-65eb526466a30cf70be103671bc14e2b460cf689.tar.gz trackermap-server-65eb526466a30cf70be103671bc14e2b460cf689.tar.bz2 trackermap-server-65eb526466a30cf70be103671bc14e2b460cf689.zip | |
Merge pull request #4779 from telubato/patch-1
Add new Ruptela IOs
| -rw-r--r-- | src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java b/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java index 5c2885a8b..2812d22ff 100644 --- a/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java @@ -102,6 +102,12 @@ public class RuptelaProtocolDecoder extends BaseProtocolDecoder { case 5: position.set(Position.KEY_IGNITION, readValue(buf, length, false) == 1); break; + case 29: + position.set(Position.KEY_POWER, readValue(buf, length, false)); + break; + case 30: + position.set(Position.KEY_BATTERY, readValue(buf, length, false) * 0.001); + break; case 74: position.set(Position.PREFIX_TEMP + 3, readValue(buf, length, true) * 0.1); break; @@ -110,22 +116,19 @@ public class RuptelaProtocolDecoder extends BaseProtocolDecoder { case 80: position.set(Position.PREFIX_TEMP + (id - 78), readValue(buf, length, true) * 0.1); break; - case 198: - if (readValue(buf, length, false) > 0) { - position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED); - } - break; - case 199: - case 200: + case 134: if (readValue(buf, length, false) > 0) { position.set(Position.KEY_ALARM, Position.ALARM_BRAKING); } break; - case 201: + case 136: if (readValue(buf, length, false) > 0) { position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION); } break; + case 197: + position.set(Position.KEY_RPM, readValue(buf, length, false) * 0.125); + break; default: position.set(Position.PREFIX_IO + id, readValue(buf, length, false)); break; |