diff options
Diffstat (limited to 'altoslib')
| -rw-r--r-- | altoslib/AltosConvert.java | 4 | ||||
| -rw-r--r-- | altoslib/AltosHeight.java | 7 | ||||
| -rw-r--r-- | altoslib/AltosLib.java | 4 | ||||
| -rw-r--r-- | altoslib/AltosState.java | 2 |
4 files changed, 16 insertions, 1 deletions
diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index a42b36c4..8cd478e2 100644 --- a/altoslib/AltosConvert.java +++ b/altoslib/AltosConvert.java @@ -242,6 +242,10 @@ public class AltosConvert { return meters * (100 / (2.54 * 12)); } + public static double feet_to_meters(double feet) { + return feet * 12 * 2.54 / 100.0; + } + public static double meters_to_miles(double meters) { return meters_to_feet(meters) / 5280; } diff --git a/altoslib/AltosHeight.java b/altoslib/AltosHeight.java index ed590812..96f5722b 100644 --- a/altoslib/AltosHeight.java +++ b/altoslib/AltosHeight.java @@ -25,6 +25,13 @@ public class AltosHeight extends AltosUnits { return v; } + public double parse(String s) throws NumberFormatException { + double v = Double.parseDouble(s); + if (AltosConvert.imperial_units) + v = AltosConvert.feet_to_meters(v); + return v; + } + public String show_units() { if (AltosConvert.imperial_units) return "ft"; diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java index a629260b..d60ef492 100644 --- a/altoslib/AltosLib.java +++ b/altoslib/AltosLib.java @@ -92,8 +92,10 @@ public class AltosLib { public final static int product_telemega = 0x0023; public final static int product_megadongle = 0x0024; public final static int product_telegps = 0x0025; + public final static int product_easymini = 0x0026; + public final static int product_telemini = 0x0027; public final static int product_altusmetrum_min = 0x000a; - public final static int product_altusmetrum_max = 0x0025; + public final static int product_altusmetrum_max = 0x002c; public final static int product_any = 0x10000; public final static int product_basestation = 0x10000 + 1; diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java index 825306be..e0d9bb1f 100644 --- a/altoslib/AltosState.java +++ b/altoslib/AltosState.java @@ -40,6 +40,7 @@ public class AltosState { public double ground_altitude; public double altitude; public double height; + public double pressure; public double acceleration; public double battery; public double temperature; @@ -125,6 +126,7 @@ public class AltosState { drogue_sense = data.drogue_voltage(); main_sense = data.main_voltage(); battery = data.battery_voltage(); + pressure = data.pressure(); tick = data.tick; state = data.state; |