This way we can create it as needed.
Signed-off-by: Keith Packard <keithp@keithp.com>
void write_general() {
double time = time();
out.printf("%s, %d, %d, %s, %8.2f, %8.2f, %4d, %3d",
- ALTOS_CSV_VERSION, series.cal_data.serial,
- series.cal_data.flight, series.cal_data.callsign,
+ ALTOS_CSV_VERSION, series.cal_data().serial,
+ series.cal_data().flight, series.cal_data().callsign,
time, time,
rssi(), status() & 0x7f);
}
AltosGreatCircle from_pad;
- if (series.cal_data.gps_pad != null && gps != null)
- from_pad = new AltosGreatCircle(series.cal_data.gps_pad, gps);
+ if (series.cal_data().gps_pad != null && gps != null)
+ from_pad = new AltosGreatCircle(series.cal_data().gps_pad, gps);
else
from_pad = new AltosGreatCircle();
public abstract class AltosDataListener {
- public AltosCalData cal_data = null;
+ private AltosCalData cal_data = null;
+
public double time = AltosLib.MISSING;
public int state = AltosLib.MISSING;
+ public void set_tick(int tick) {
+ cal_data.set_tick(tick);
+ set_time(cal_data.time());
+ }
+
+ public AltosCalData cal_data() {
+ if (cal_data == null)
+ cal_data = new AltosCalData();
+ return cal_data;
+ }
+
public void set_time(double time) {
if (time != AltosLib.MISSING)
this.time = time;
}
+ public void set_serial(int serial) {
+ cal_data().set_serial(serial);
+ }
+
public double time() {
return time;
}
public void set_state(int state) {
+ cal_data().set_state(state);
if (state != AltosLib.MISSING)
this.state = state;
}
+ public void set_flight(int flight) {
+ cal_data().set_flight(flight);
+ }
+
/* Called after all records are captured */
public void finish() {
}
package org.altusmetrum.altoslib_12;
public interface AltosDataProvider {
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) throws InterruptedException, AltosUnknownProduct;
+ public void provide_data(AltosDataListener listener) throws InterruptedException, AltosUnknownProduct;
}
return tick;
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+ public void provide_data(AltosDataListener listener) {
int value = data16(-header_length);
- cal_data.set_tick(tick());
- listener.set_time(cal_data.time());
+ listener.set_tick(tick());
switch (cmd()) {
case AltosLib.AO_LOG_FLIGHT:
listener.set_state(AltosLib.ao_flight_pad);
- cal_data.set_flight(value);
- cal_data.set_boost_tick();
+ listener.cal_data().set_flight(value);
+ listener.cal_data().set_boost_tick();
break;
case AltosLib.AO_LOG_STATE:
listener.set_state(value & 0x7fff);
if (altitude_series == null)
altitude_series = add_series(altitude_name, AltosConvert.height);
- if (cal_data.ground_pressure == AltosLib.MISSING)
- cal_data.set_ground_pressure(pa);
+ if (cal_data().ground_pressure == AltosLib.MISSING)
+ cal_data().set_ground_pressure(pa);
double altitude = AltosConvert.pressure_to_altitude(pa);
altitude_series.add(time(), altitude);
}
private void compute_height() {
- double ground_altitude = cal_data.ground_altitude;
+ double ground_altitude = cal_data().ground_altitude;
if (height_series == null && ground_altitude != AltosLib.MISSING && altitude_series != null) {
height_series = add_series(height_name, AltosConvert.height);
for (AltosTimeValue alt : altitude_series)
height_series.add(alt.time, alt.value - ground_altitude);
}
- if (gps_height == null && cal_data.gps_pad != null && cal_data.gps_pad.alt != AltosLib.MISSING && gps_altitude != null) {
- double gps_ground_altitude = cal_data.gps_pad.alt;
+ if (gps_height == null && cal_data().gps_pad != null && cal_data().gps_pad.alt != AltosLib.MISSING && gps_altitude != null) {
+ double gps_ground_altitude = cal_data().gps_pad.alt;
gps_height = add_series(gps_height_name, AltosConvert.height);
for (AltosTimeValue gps_alt : gps_altitude)
gps_height.add(gps_alt.time, gps_alt.value - gps_ground_altitude);
if (accel_ground_across == AltosLib.MISSING)
return;
- if (cal_data.pad_orientation == AltosLib.MISSING)
+ if (cal_data().pad_orientation == AltosLib.MISSING)
return;
- if (cal_data.accel_zero_across == AltosLib.MISSING)
+ if (cal_data().accel_zero_across == AltosLib.MISSING)
return;
- AltosRotation rotation = new AltosRotation(AltosIMU.convert_accel(accel_ground_across - cal_data.accel_zero_across),
- AltosIMU.convert_accel(accel_ground_through - cal_data.accel_zero_through),
- AltosIMU.convert_accel(accel_ground_along - cal_data.accel_zero_along),
- cal_data.pad_orientation);
+ AltosRotation rotation = new AltosRotation(AltosIMU.convert_accel(accel_ground_across - cal_data().accel_zero_across),
+ AltosIMU.convert_accel(accel_ground_through - cal_data().accel_zero_through),
+ AltosIMU.convert_accel(accel_ground_along - cal_data().accel_zero_along),
+ cal_data().pad_orientation);
double prev_time = ground_time;
orient_series = add_series(orient_name, AltosConvert.orient);
public AltosFlightStats(AltosFlightSeries series) {
- AltosCalData cal_data = series.cal_data;
+ AltosCalData cal_data = series.cal_data();
series.finish();
has_rssi = series.rssi_series != null;
has_flight_data = series.pressure_series != null;
- AltosGPS gps = series.cal_data.gps_pad;
+ AltosGPS gps = series.cal_data().gps_pad;
if (gps != null) {
year = gps.year;
}
}
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosGPS gps = new AltosGPS(link, link.config_data());
if (gps != null)
return n;
}
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosIMU imu = new AltosIMU(link);
+ AltosCalData cal_data = listener.cal_data();
if (imu != null) {
listener.set_gyro(cal_data.gyro_roll(imu.gyro_y),
static final int idle_sensor_tgps = 16;
static final int idle_sensor_tmini3 = 17;
- public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException, TimeoutException, AltosUnknownProduct {
+ public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
for (int idler : idlers) {
switch (idler) {
case idle_gps:
- AltosGPS.provide_data(listener, link, cal_data);
+ AltosGPS.provide_data(listener, link);
break;
case idle_imu:
- AltosIMU.provide_data(listener, link, cal_data);
+ AltosIMU.provide_data(listener, link);
break;
case idle_mag:
- AltosMag.provide_data(listener, link, cal_data);
+ AltosMag.provide_data(listener, link);
break;
case idle_mma655x:
- AltosMma655x.provide_data(listener, link, cal_data);
+ AltosMma655x.provide_data(listener, link);
break;
case idle_ms5607:
- AltosMs5607.provide_data(listener, link, cal_data);
+ AltosMs5607.provide_data(listener, link);
break;
case idle_sensor_tm:
- AltosSensorTM.provide_data(listener, link, cal_data);
+ AltosSensorTM.provide_data(listener, link);
break;
case idle_sensor_metrum:
- AltosSensorMetrum.provide_data(listener, link, cal_data);
+ AltosSensorMetrum.provide_data(listener, link);
break;
case idle_sensor_mega:
- AltosSensorMega.provide_data(listener, link, cal_data);
+ AltosSensorMega.provide_data(listener, link);
break;
case idle_sensor_emini1:
- AltosSensorEMini.provide_data(listener, link, cal_data, 1);
+ AltosSensorEMini.provide_data(listener, link, 1);
break;
case idle_sensor_emini2:
- AltosSensorEMini.provide_data(listener, link, cal_data, 2);
+ AltosSensorEMini.provide_data(listener, link, 2);
break;
case idle_sensor_tmini2:
- AltosSensorTMini2.provide_data(listener, link, cal_data);
+ AltosSensorTMini2.provide_data(listener, link);
break;
case idle_sensor_tgps:
- AltosSensorTGPS.provide_data(listener, link, cal_data);
+ AltosSensorTGPS.provide_data(listener, link);
break;
case idle_sensor_tmini3:
- AltosSensorTMini3.provide_data(listener, link, cal_data);
+ AltosSensorTMini3.provide_data(listener, link);
break;
}
}
AltosLink link;
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) throws InterruptedException, AltosUnknownProduct {
+ public void provide_data(AltosDataListener listener) throws InterruptedException, AltosUnknownProduct {
try {
boolean matched = false;
/* Fetch config data from remote */
listener.set_state(AltosLib.ao_flight_stateless);
for (AltosIdler idler : idlers) {
if (idler.matches(config_data)) {
- idler.provide_data(listener, link, cal_data);
+ idler.provide_data(listener, link);
matched = true;
break;
}
boolean provide_data(AltosDataListener listener) throws InterruptedException, TimeoutException, AltosUnknownProduct {
boolean worked = false;
boolean aborted = false;
- AltosCalData cal_data = new AltosCalData(link.config_data());
try {
start_link();
- fetch.provide_data(listener, cal_data);
+ fetch.provide_data(listener);
if (!link.has_error && !link.reply_abort)
worked = true;
} finally {
start_link();
if (state == null)
state = new AltosState(cal_data());
- fetch.provide_data(state, state.cal_data);
+ fetch.provide_data(state);
if (!link.has_error && !link.reply_abort)
worked = true;
} catch (TimeoutException te) {
public void write(AltosFlightSeries series) {
stats = new AltosFlightStats(series);
- start(series.cal_data);
+ start(series.cal_data());
for (AltosGPSTimeValue gtv : series.gps_series)
- write(gtv, series.cal_data, state(series, gtv.time), height(series, gtv.time));
+ write(gtv, series.cal_data(), state(series, gtv.time), height(series, gtv.time));
}
public AltosKML(File in_name) throws FileNotFoundException {
AltosTelemetry telem = AltosTelemetry.parse(line.line);
if (state == null)
state = new AltosState(cal_data);
- telem.provide_data(state, cal_data);
+ telem.provide_data(state);
if (cal_data.serial != serial ||
cal_data.flight != flight ||
y = AltosLib.MISSING;
}
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosMag mag = new AltosMag(link);
+ AltosCalData cal_data = listener.cal_data();
if (mag != null)
listener.set_mag(cal_data.mag_along(mag.y),
return n;
}
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException, AltosUnknownProduct {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, AltosUnknownProduct {
try {
AltosMma655x mma655x = new AltosMma655x(link);
+ AltosCalData cal_data = listener.cal_data();
if (mma655x != null) {
int accel = mma655x.accel;
crc = old.crc;
}
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
+ AltosCalData cal_data = listener.cal_data();
AltosMs5607 ms5607 = cal_data.ms5607;
if (ms5607 != null) {
int reads;
public AltosCalData cal_data() {
- return replay.state.cal_data;
+ return replay.state.cal_data();
}
public AltosState read() {
public int main;
public int batt;
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data, int version) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link, int version) throws InterruptedException {
try {
AltosSensorEMini sensor_emini = new AltosSensorEMini(link);
+ AltosCalData cal_data = listener.cal_data();
if (sensor_emini == null)
return;
}
}
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosSensorMega sensor_mega = new AltosSensorMega(link);
}
}
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosSensorMetrum sensor_metrum = new AltosSensorMetrum(link);
listener.set_battery_voltage(AltosConvert.mega_battery_voltage(sensor_metrum.v_batt));
public int tick;
public int batt;
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosSensorTGPS sensor_tgps = new AltosSensorTGPS(link);
public int drogue;
public int main;
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosSensorTM sensor_tm = new AltosSensorTM(link);
+ AltosCalData cal_data = listener.cal_data();
if (sensor_tm == null)
return;
public int main;
public int batt;
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosSensorTMini2 sensor_tmini = new AltosSensorTMini2(link);
public int main;
public int batt;
- static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+ static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
try {
AltosSensorTMini3 sensor_tmini = new AltosSensorTMini3(link);
public double accel_ground_along, accel_ground_across, accel_ground_through;
void update_pad_rotation() {
- if (cal_data.pad_orientation != AltosLib.MISSING && accel_ground_along != AltosLib.MISSING) {
- rotation = new AltosRotation(AltosIMU.convert_accel(accel_ground_across - cal_data.accel_zero_across),
- AltosIMU.convert_accel(accel_ground_through - cal_data.accel_zero_through),
- AltosIMU.convert_accel(accel_ground_along - cal_data.accel_zero_along),
- cal_data.pad_orientation);
+ if (cal_data().pad_orientation != AltosLib.MISSING && accel_ground_along != AltosLib.MISSING) {
+ rotation = new AltosRotation(AltosIMU.convert_accel(accel_ground_across - cal_data().accel_zero_across),
+ AltosIMU.convert_accel(accel_ground_through - cal_data().accel_zero_through),
+ AltosIMU.convert_accel(accel_ground_along - cal_data().accel_zero_along),
+ cal_data().pad_orientation);
orient.set_computed(rotation.tilt(), time);
}
}
public AltosState (AltosCalData cal_data) {
super(cal_data);
- if (cal_data == null)
- Thread.dumpStack();
init();
}
}
return sum == bytes[bytes.length - 1];
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- cal_data.set_serial(serial());
+ public void provide_data(AltosDataListener listener) {
+ listener.set_serial(serial());
if (listener.state == AltosLib.ao_flight_invalid)
listener.set_state(AltosLib.ao_flight_startup);
- cal_data.set_tick(tick());
- listener.set_time(cal_data.time());
+ listener.set_tick(tick());
listener.set_rssi(rssi(), status());
listener.set_received_time(received_time);
}
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_companion(companion());
}
}
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
+
+ AltosCalData cal_data = listener.cal_data();
+
cal_data.set_device_type(device_type());
cal_data.set_flight(flight());
cal_data.set_config(config_major(), config_minor(), flight_log_max());
public boolean cal_data_complete() {
/* All telemetry packets */
+ AltosCalData cal_data = cal_data();
+
if (cal_data.serial == AltosLib.MISSING)
return false;
AltosTelemetryNullListener l = new AltosTelemetryNullListener(cal_data);
for (AltosTelemetry telem : telems) {
- telem.provide_data(l, cal_data);
+ telem.provide_data(l);
if (l.cal_data_complete())
break;
}
/* Try to pick up at least one pre-boost value */
if (cal_data.time() >= -2)
- telem.provide_data(listener, cal_data);
+ telem.provide_data(listener);
if (listener.state == AltosLib.ao_flight_landed)
break;
}
}
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- cal_data.set_tick(tick);
- listener.set_time(cal_data.time());
+ public void provide_data(AltosDataListener listener) {
+ listener.set_serial(serial);
+ listener.set_tick(tick);
listener.set_state(this.state);
- cal_data.set_state(this.state);
- cal_data.set_flight(flight);
- cal_data.set_serial(serial);
+ listener.set_flight(flight);
listener.set_rssi(rssi, status);
listener.set_pressure(AltosConvert.barometer_to_pressure(pres));
+
+ AltosCalData cal_data = listener.cal_data();
+
cal_data.set_accel_plus_minus(accel_plus_g, accel_minus_g);
listener.set_acceleration(cal_data.acceleration(accel));
if (kalman_height != AltosLib.MISSING)
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
+
+ AltosCalData cal_data = listener.cal_data();
AltosGPS gps = cal_data.make_temp_gps(tick(), false);
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_state(state());
- cal_data.set_state(state());
listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
listener.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro()));
listener.set_igniter_voltage(voltages);
+ AltosCalData cal_data = listener.cal_data();
+
cal_data.set_ground_accel(ground_accel());
cal_data.set_ground_pressure(ground_pres());
cal_data.set_accel_plus_minus(accel_plus_g(), accel_minus_g());
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
+
+ AltosCalData cal_data = listener.cal_data();
listener.set_acceleration(cal_data.acceleration(accel()));
listener.set_pressure(pres());
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_state(state());
- cal_data.set_state(state());
- listener.set_acceleration(cal_data.acceleration(accel()));
+ listener.set_acceleration(listener.cal_data().acceleration(accel()));
listener.set_pressure(pres());
listener.set_temperature(temp()/100.0);
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_state(state());
- cal_data.set_state(state());
listener.set_battery_voltage(AltosConvert.tele_mini_2_voltage(v_batt()));
listener.set_apogee_voltage(AltosConvert.tele_mini_2_voltage(sense_a()));
listener.set_main_voltage(AltosConvert.tele_mini_2_voltage(sense_m()));
+ AltosCalData cal_data = listener.cal_data();
+
cal_data.set_ground_pressure(ground_pres());
listener.set_pressure(pres());
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
-
- cal_data.set_ground_pressure(ground_pres());
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_state(state());
- cal_data.set_state(state());
listener.set_battery_voltage(AltosConvert.tele_mini_3_battery_voltage(v_batt()));
listener.set_apogee_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_a()));
listener.set_main_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_m()));
+ listener.cal_data().set_ground_pressure(ground_pres());
+
listener.set_pressure(pres());
listener.set_temperature(temp()/100.0);
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
}
}
System.out.printf("Make state\n");
state = new AltosState(cal_data());
}
- telem.provide_data(state, state.cal_data);
+ telem.provide_data(state);
return state;
}
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
+
+ AltosCalData cal_data = listener.cal_data();
AltosGPS gps = cal_data.make_temp_gps(tick(), true);
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_state(state());
- cal_data.set_state(state());
+
+ AltosCalData cal_data = listener.cal_data();
if (type() == packet_type_TM_sensor) {
cal_data.set_ground_accel(ground_accel());
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
}
}
}
void show(AltosState state, AltosListenerState listener_state) {
- if (!same_call(state.cal_data.callsign)) {
+ if (!same_call(state.cal_data().callsign)) {
show();
- value.setText(state.cal_data.callsign);
- if (state.cal_data.callsign == null)
+ value.setText(state.cal_data().callsign);
+ if (state.cal_data().callsign == null)
setVisible(false);
else
setVisible(true);
- last_call = state.cal_data.callsign;
+ last_call = state.cal_data().callsign;
}
}
int last_serial = -1;
void show(AltosState state, AltosListenerState listener_state) {
- AltosCalData cal_data = state.cal_data;
+ AltosCalData cal_data = state.cal_data();
if (cal_data.serial != last_serial) {
show();
if (cal_data.serial == AltosLib.MISSING)
int last_flight = -1;
void show(AltosState state, AltosListenerState listener_state) {
- AltosCalData cal_data = state.cal_data;
+ AltosCalData cal_data = state.cal_data();
if (cal_data.flight != last_flight) {
show();
if (cal_data.flight == AltosLib.MISSING)
class LoggingReady extends AltosUIIndicator {
public void show (AltosState state, AltosListenerState listener_state) {
- if (state == null || state.cal_data.flight == AltosLib.MISSING) {
+ AltosCalData cal_data = state.cal_data();
+ if (state == null || cal_data.flight == AltosLib.MISSING) {
hide();
} else {
- if (state.cal_data.flight != 0) {
+ if (cal_data.flight != 0) {
if (state.state() <= Altos.ao_flight_pad)
show("Ready to record");
else if (state.state() < Altos.ao_flight_landed ||
show("Recorded data");
} else
show("Storage full");
- set_lights(state.cal_data.flight != 0);
+ set_lights(cal_data.flight != 0);
}
}
public LoggingReady (AltosUIFlightTab container, int y) {
if (set == null)
return;
AltosFlightSeries series = make_series(set);
- new AltosCSVUI(AltosUI.this, series, series.cal_data, chooser.file());
+ new AltosCSVUI(AltosUI.this, series, chooser.file());
}
/* Load a flight log CSV file and display a pretty graph.
set_default_file();
}
- public AltosCSVUI(JFrame frame, AltosFlightSeries series, AltosCalData cal_data, File source_file) {
+ public AltosCSVUI(JFrame frame, AltosFlightSeries series, File source_file) {
this.series = series;
- this.cal_data = cal_data;
+ this.cal_data = series.cal_data();
csv_chooser = new JFileChooser(source_file);
accessory = new JPanel();
AltosUIFlightSeries flight_series;
AltosUITimeSeries[] setup(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
- AltosCalData cal_data = flight_series.cal_data;
+ AltosCalData cal_data = flight_series.cal_data();
AltosUIAxis height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
AltosUIAxis distance_axis, pressure_axis, thrust_axis;
public void show(AltosState state, AltosListenerState listener_state) {
- AltosCalData cal_data = state.cal_data;
+ AltosCalData cal_data = state.cal_data();
if (!isShowing()) {
last_state = state;
if (state == null)
continue;
packet_count++;
- AltosCalData cal_data = state.cal_data;
+ AltosCalData cal_data = state.cal_data();
if (cal_data.flight != AltosLib.MISSING) {
final AltosScanResult result = new AltosScanResult(cal_data.callsign,
cal_data.serial,
if (set == null)
return;
AltosFlightSeries series = make_series(set);
- new AltosCSVUI(this, series, series.cal_data, chooser.file());
+ new AltosCSVUI(this, series, chooser.file());
}
void graph() {
class FirmwareVersion extends AltosUIIndicator {
public void show(AltosState state, AltosListenerState listener_state) {
- if (state.cal_data.firmware_version == null)
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data.firmware_version == null)
show("Missing");
else
- show(state.cal_data.firmware_version);
+ show(cal_data.firmware_version);
}
public FirmwareVersion(Container container, int y) {
class FlightLogMax extends AltosUIIndicator {
public void show(AltosState state, AltosListenerState listener_state) {
- int storage = state.cal_data.flight_log_max;
+ AltosCalData cal_data = state.cal_data();
+ int storage = cal_data.flight_log_max;
if (storage == AltosLib.MISSING)
show("Missing");
else
String call;
void show(AltosState state, AltosListenerState listener_state) {
- if (state.cal_data == null)
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data == null)
System.out.printf("null cal data?\n");
- if (state.cal_data.callsign != call) {
- value.setText(state.cal_data.callsign);
- call = state.cal_data.callsign;
+ if (cal_data.callsign != call) {
+ value.setText(cal_data.callsign);
+ call = cal_data.callsign;
}
- if (state.cal_data.callsign == null)
+ if (cal_data.callsign == null)
setVisible(false);
else
setVisible(true);
class Serial extends Value {
int serial = -1;
void show(AltosState state, AltosListenerState listener_state) {
- if (state.cal_data.serial != serial) {
- if (state.cal_data.serial == AltosLib.MISSING)
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data.serial != serial) {
+ if (cal_data.serial == AltosLib.MISSING)
value.setText("none");
else
- value.setText(String.format("%d", state.cal_data.serial));
- serial = state.cal_data.serial;
+ value.setText(String.format("%d", cal_data.serial));
+ serial = cal_data.serial;
}
}
int last_flight = -1;
void show(AltosState state, AltosListenerState listener_state) {
- if (state.cal_data.flight != last_flight) {
- if (state.cal_data.flight == AltosLib.MISSING)
+ AltosCalData cal_data = state.cal_data();
+ if (cal_data.flight != last_flight) {
+ if (cal_data.flight == AltosLib.MISSING)
value.setText("none");
else
- value.setText(String.format("%d", state.cal_data.flight));
- last_flight = state.cal_data.flight;
+ value.setText(String.format("%d", cal_data.flight));
+ last_flight = cal_data.flight;
}
}