aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-12-27 22:54:54 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2020-12-27 22:54:54 -0800
commit04249ece0deaaadd3250da2f5618aa13aedf5ae9 (patch)
tree61f1d7204a655bf7e56f7d0b94d1b3b4ed09329f /src/main/java/org
parent2a0bba3f7f864e79211f773ff2da8cfa9d033d93 (diff)
downloadtraccar-server-04249ece0deaaadd3250da2f5618aa13aedf5ae9.tar.gz
traccar-server-04249ece0deaaadd3250da2f5618aa13aedf5ae9.tar.bz2
traccar-server-04249ece0deaaadd3250da2f5618aa13aedf5ae9.zip
Remove unnecessary config
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/traccar/protocol/GranitProtocolDecoder.java20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/main/java/org/traccar/protocol/GranitProtocolDecoder.java b/src/main/java/org/traccar/protocol/GranitProtocolDecoder.java
index 8900e5b39..292e43a0e 100644
--- a/src/main/java/org/traccar/protocol/GranitProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/GranitProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2020 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.
@@ -19,7 +19,6 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
-import org.traccar.Context;
import org.traccar.DeviceSession;
import org.traccar.NetworkMessage;
import org.traccar.Protocol;
@@ -37,17 +36,8 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder {
private static final int HEADER_LENGTH = 6;
- private double adc1Ratio;
- private double adc2Ratio;
- private double adc3Ratio;
- private double adc4Ratio;
-
public GranitProtocolDecoder(Protocol protocol) {
super(protocol);
- adc1Ratio = Context.getConfig().getDouble("granit.adc1Ratio", 1);
- adc2Ratio = Context.getConfig().getDouble("granit.adc2Ratio", 1);
- adc3Ratio = Context.getConfig().getDouble("granit.adc3Ratio", 1);
- adc4Ratio = Context.getConfig().getDouble("granit.adc4Ratio", 1);
}
public static void appendChecksum(ByteBuf buffer, int length) {
@@ -133,10 +123,10 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder {
analogIn3 = analogInHi << 4 & 0x300 | analogIn3;
analogIn4 = analogInHi << 2 & 0x300 | analogIn4;
- position.set(Position.PREFIX_ADC + 1, analogIn1 * adc1Ratio);
- position.set(Position.PREFIX_ADC + 2, analogIn2 * adc2Ratio);
- position.set(Position.PREFIX_ADC + 3, analogIn3 * adc3Ratio);
- position.set(Position.PREFIX_ADC + 4, analogIn4 * adc4Ratio);
+ position.set(Position.PREFIX_ADC + 1, analogIn1);
+ position.set(Position.PREFIX_ADC + 2, analogIn2);
+ position.set(Position.PREFIX_ADC + 3, analogIn3);
+ position.set(Position.PREFIX_ADC + 4, analogIn4);
position.setAltitude(buf.readUnsignedByte() * 10);