diff options
| author | Keith Packard <keithp@keithp.com> | 2017-05-28 13:58:05 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-05-28 13:58:05 -0700 |
| commit | 9e1295ff74d03f940fc68e6795bf30687162a440 (patch) | |
| tree | 4fe999263ae48bbab7ba932fe8f87f4b7498226d /altoslib/AltosCalData.java | |
| parent | e4407afb514437ccd8db79ae29c6fa203140fa07 (diff) | |
altoslib: Extract a few more values from config to cal_data
Make it possible to display model/version data in the flight stats table.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosCalData.java')
| -rw-r--r-- | altoslib/AltosCalData.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java index a9955ba8..960de30a 100644 --- a/altoslib/AltosCalData.java +++ b/altoslib/AltosCalData.java @@ -349,9 +349,16 @@ public class AltosCalData { public AltosCalData(AltosConfigData config_data) { set_serial(config_data.serial); + set_ticks_per_sec(100.0); set_flight(config_data.flight); set_callsign(config_data.callsign); + set_config(config_data.config_major, config_data.config_minor, config_data.flight_log_max); + set_firmware_version(config_data.version); + set_flight_params(config_data.apogee_delay / ticks_per_sec, config_data.apogee_lockout / ticks_per_sec); + set_pad_orientation(config_data.pad_orientation); + set_product(config_data.product); set_accel_plus_minus(config_data.accel_cal_plus, config_data.accel_cal_minus); + set_accel_zero(config_data.accel_zero_along, config_data.accel_zero_across, config_data.accel_zero_through); set_ms5607(config_data.ms5607); try { set_mma655x_inverted(config_data.mma655x_inverted()); |