X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=54b75817bb7196b2fc8b82cd88c5ca4d5ea0bcd1;hp=a9955ba8b503e52364cca89538c0641d164d03ff;hb=e0f25bcb8c036330e80c1254ab67f0bf323a4a98;hpb=3516eeb77048736470de2cc2ca03985efd228d29 diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java index a9955ba8..54b75817 100644 --- a/altoslib/AltosCalData.java +++ b/altoslib/AltosCalData.java @@ -172,6 +172,7 @@ public class AltosCalData { tick += 65536; } } + prev_tick = tick; this.tick = tick; } } @@ -349,9 +350,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());