X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosDataListener.java;h=b19cbedbbdb513b914a6edf1bbe55cf58af2608f;hb=c1708f3fa4ff412da8817ba0fa58d05fe7ef44f5;hp=52aeb5d5d8a692c55142c23a94f3b7e385504ffc;hpb=f2e45e4b1351ce505b9294d5dc25429ab9721e62;p=fw%2Faltos diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java index 52aeb5d5..b19cbedb 100644 --- a/altoslib/AltosDataListener.java +++ b/altoslib/AltosDataListener.java @@ -12,7 +12,7 @@ * General Public License for more details. */ -package org.altusmetrum.altoslib_13; +package org.altusmetrum.altoslib_14; public abstract class AltosDataListener { @@ -59,6 +59,8 @@ public abstract class AltosDataListener { public void set_log_format(int log_format) { cal_data().set_log_format(log_format); + if (cal_data().device_type == AltosLib.MISSING) + cal_data().set_device_type(AltosLib.product_id_from_log_format(log_format)); switch (log_format) { case AltosLib.AO_LOG_FORMAT_TELEGPS: set_state(AltosLib.ao_flight_stateless); @@ -118,7 +120,7 @@ public abstract class AltosDataListener { public abstract void set_apogee_voltage(double volts); public abstract void set_main_voltage(double volts); - public void set_gps(AltosGPS gps) { + public void set_gps(AltosGPS gps, boolean set_location, boolean set_sats) { AltosCalData cal_data = cal_data(); cal_data.set_cal_gps(gps); } @@ -140,6 +142,7 @@ public abstract class AltosDataListener { public abstract void set_igniter_voltage(double[] voltage); public abstract void set_pyro_fired(int pyro_mask); public abstract void set_companion(AltosCompanion companion); + public abstract void set_motor_pressure(double motor_pressure); public AltosDataListener() { }