diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-05-20 11:18:17 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-20 11:18:17 +1200 |
commit | 6879624fd6290eea9a7f45047ba089ee1435d3ce (patch) | |
tree | 5e7de0a5669fb22af0bd3d2b70a5847113d37f80 /src/org/traccar/model | |
parent | f523e3b995f5f1895cf3dea700be34f4b74dccf9 (diff) | |
parent | ab46ebf23066f91369b0d037f273bed1ea814d82 (diff) | |
download | traccar-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.tar.gz traccar-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.tar.bz2 traccar-server-6879624fd6290eea9a7f45047ba089ee1435d3ce.zip |
Merge pull request #3174 from Abyss777/battery_level
Adjust battery and batteryLevel type
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r-- | src/org/traccar/model/Position.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 1345a9cb2..bfd142b7d 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -41,7 +41,8 @@ public class Position extends Message { // The units for the below four KEYs currently vary. // The preferred units of measure are specified in the comment for each. public static final String KEY_POWER = "power"; // volts - public static final String KEY_BATTERY = "battery"; // volts (or percentage appending %) + public static final String KEY_BATTERY = "battery"; // volts + public static final String KEY_BATTERY_LEVEL = "batteryLevel"; // percentage public static final String KEY_FUEL_LEVEL = "fuel"; // liters public static final String KEY_FUEL_CONSUMPTION = "fuelConsumption"; // liters/hour |