diff options
| author | Keith Packard <keithp@keithp.com> | 2014-07-10 17:27:43 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-07-10 17:35:44 -0700 |
| commit | 59702e5ff8d0522b0aa9dcca863309eaafbcda09 (patch) | |
| tree | c55a101785c8529f81cdb8463b738883a5b0e470 /altoslib/AltosConfigData.java | |
| parent | 6dc58c63d202e918f16d5fbe9b188d422edcdd9c (diff) | |
altoslib: Extend telemetry heights from 16 to 32 bits
Uses the GPS data and/or previous kalman data to compute the upper 16
bits of the truncated telemetry altitude value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosConfigData.java')
| -rw-r--r-- | altoslib/AltosConfigData.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java index 847436cd..134a0ed2 100644 --- a/altoslib/AltosConfigData.java +++ b/altoslib/AltosConfigData.java @@ -31,6 +31,7 @@ public class AltosConfigData implements Iterable<String> { public int log_format; public int log_space; public String version; + public int altitude_32; /* Strings returned */ public LinkedList<String> lines; @@ -274,6 +275,7 @@ public class AltosConfigData implements Iterable<String> { try { flight = get_int(line, "current-flight"); } catch (Exception e) {} try { log_format = get_int(line, "log-format"); } catch (Exception e) {} try { log_space = get_int(line, "log-space"); } catch (Exception e) {} + try { altitude_32 = get_int(line, "altitude-32"); } catch (Exception e) {} try { version = get_string(line, "software-version"); } catch (Exception e) {} /* Version also contains MS5607 info, which we ignore here */ @@ -484,6 +486,7 @@ public class AltosConfigData implements Iterable<String> { dest.set_serial(serial); dest.set_product(product); dest.set_version(version); + dest.set_altitude_32(altitude_32); dest.set_main_deploy(main_deploy); dest.set_apogee_delay(apogee_delay); dest.set_apogee_lockout(apogee_lockout); |