Not terribly useful, but did help validate firmware handling of tick
wrapping, so we'll keep it.
Signed-off-by: Keith Packard <keithp@keithp.com>
public double time = AltosLib.MISSING;
public double frequency = AltosLib.MISSING;
public double time = AltosLib.MISSING;
public double frequency = AltosLib.MISSING;
+ public int raw_tick = AltosLib.MISSING;
+
+ public int tick() {
+ return raw_tick;
+ }
+
public void set_tick(int tick) {
public void set_tick(int tick) {
cal_data.set_tick(tick);
set_time(cal_data.time());
}
cal_data.set_tick(tick);
set_time(cal_data.time());
}
public void set_received_time(long received_time) {
}
public void set_received_time(long received_time) {
}
+ public AltosTimeSeries tick_series;
+
+ public static final String tick_name = "Tick";
+
+ public void set_tick(int tick) {
+ super.set_tick(tick);
+ if (tick_series == null)
+ tick_series = add_series(tick_name, null);
+ tick_series.add(time(), tick);
+ }
+
public AltosTimeSeries rssi_series;
public static final String rssi_name = "RSSI";
public AltosTimeSeries rssi_series;
public static final String rssi_name = "RSSI";
static final private Color orient_color = new Color(31, 31, 31);
static AltosUnits dop_units = null;
static final private Color orient_color = new Color(31, 31, 31);
static AltosUnits dop_units = null;
+ static AltosUnits tick_units = null;
AltosUIFlightSeries flight_series;
AltosUIFlightSeries flight_series;
AltosUIAxis height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
AltosUIAxis distance_axis, pressure_axis, thrust_axis;
AltosUIAxis gyro_axis, orient_axis, mag_axis;
AltosUIAxis height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
AltosUIAxis distance_axis, pressure_axis, thrust_axis;
AltosUIAxis gyro_axis, orient_axis, mag_axis;
- AltosUIAxis course_axis, dop_axis;
+ AltosUIAxis course_axis, dop_axis, tick_axis;
if (stats.serial != AltosLib.MISSING && stats.product != null && stats.flight != AltosLib.MISSING)
setName(String.format("%s %d flight %d\n", stats.product, stats.serial, stats.flight));
if (stats.serial != AltosLib.MISSING && stats.product != null && stats.flight != AltosLib.MISSING)
setName(String.format("%s %d flight %d\n", stats.product, stats.serial, stats.flight));
pressure_axis = newAxis("Pressure", AltosConvert.pressure, pressure_color, 0);
speed_axis = newAxis("Speed", AltosConvert.speed, speed_color);
thrust_axis = newAxis("Thrust", AltosConvert.force, thrust_color);
pressure_axis = newAxis("Pressure", AltosConvert.pressure, pressure_color, 0);
speed_axis = newAxis("Speed", AltosConvert.speed, speed_color);
thrust_axis = newAxis("Thrust", AltosConvert.force, thrust_color);
+ tick_axis = newAxis("Tick", tick_units, accel_color, 0);
accel_axis = newAxis("Acceleration", AltosConvert.accel, accel_color);
voltage_axis = newAxis("Voltage", AltosConvert.voltage, voltage_color);
temperature_axis = newAxis("Temperature", AltosConvert.temperature, temperature_color, 0);
accel_axis = newAxis("Acceleration", AltosConvert.accel, accel_color);
voltage_axis = newAxis("Voltage", AltosConvert.voltage, voltage_color);
temperature_axis = newAxis("Temperature", AltosConvert.temperature, temperature_color, 0);
+ flight_series.register_axis(AltosUIFlightSeries.tick_name,
+ accel_color,
+ false,
+ tick_axis);
+
flight_series.register_axis(AltosUIFlightSeries.accel_name,
accel_color,
true,
flight_series.register_axis(AltosUIFlightSeries.accel_name,
accel_color,
true,
return flight_series.series(cal_data);
}
return flight_series.series(cal_data);
}
+ public void set_filter(double filter) {
+ System.out.printf("filter set to %f\n", filter);
+ flight_series.set_filter(filter, filter);
+ units_changed(false);
+ }
+
public void set_data(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
set_series(setup(stats, flight_series));
}
public void set_data(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
set_series(setup(stats, flight_series));
}
public AltosGraph(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series) {
this(enable);
public AltosGraph(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series) {
this(enable);
+ this.flight_series = flight_series;
set_series(setup(stats, flight_series));
}
}
set_series(setup(stats, flight_series));
}
}
info_add_row(0, "Device", "%s", AltosLib.product_name(cal_data.device_type));
else if (cal_data.product != null)
info_add_row(0, "Device", "%s", cal_data.product);
info_add_row(0, "Device", "%s", AltosLib.product_name(cal_data.device_type));
else if (cal_data.product != null)
info_add_row(0, "Device", "%s", cal_data.product);
+ if (state.tick() != AltosLib.MISSING)
+ info_add_row(0, "Tick", "%6d", state.tick());
if (state.altitude() != AltosLib.MISSING)
info_add_row(0, "Altitude", "%6.0f m", state.altitude());
if (cal_data.ground_altitude != AltosLib.MISSING)
if (state.altitude() != AltosLib.MISSING)
info_add_row(0, "Altitude", "%6.0f m", state.altitude());
if (cal_data.ground_altitude != AltosLib.MISSING)