package altosui;
-import org.altusmetrum.altosuilib_1.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_4.*;
public class AltosGraphDataPoint implements AltosUIDataPoint {
public static final int data_temperature = 12;
public static final int data_range = 13;
public static final int data_distance = 14;
+ public static final int data_pressure = 15;
+ public static final int data_accel_x = 16;
+ public static final int data_accel_y = 17;
+ public static final int data_accel_z = 18;
+ public static final int data_gyro_x = 19;
+ public static final int data_gyro_y = 20;
+ public static final int data_gyro_z = 21;
+ public static final int data_mag_x = 22;
+ public static final int data_mag_y = 23;
+ public static final int data_mag_z = 24;
+ public static final int data_orient = 25;
+ public static final int data_gps_course = 26;
+ public static final int data_gps_ground_speed = 27;
+ public static final int data_gps_climb_rate = 28;
+ public static final int data_ignitor_0 = 29;
+ public static final int data_ignitor_num = 32;
+ public static final int data_ignitor_max = data_ignitor_0 + data_ignitor_num - 1;
+ public static final int data_ignitor_fired_0 = data_ignitor_0 + data_ignitor_num;
+ public static final int data_ignitor_fired_max = data_ignitor_fired_0 + data_ignitor_num - 1;
public double x() throws AltosUIDataMissing {
- if (state.data.time < -2)
+ double time = state.time_since_boost();
+ if (time < -2)
throw new AltosUIDataMissing(-1);
- return state.data.time;
+ return time;
}
public double y(int index) throws AltosUIDataMissing {
- double y = AltosRecord.MISSING;
+ double y = AltosLib.MISSING;
switch (index) {
case data_height:
- y = state.height;
+ y = state.height();
break;
case data_speed:
y = state.speed();
break;
case data_accel:
- y = state.acceleration;
+ y = state.acceleration();
break;
case data_temp:
y = state.temperature;
break;
case data_battery_voltage:
- y = state.battery;
+ y = state.battery_voltage;
break;
case data_drogue_voltage:
- y = state.drogue_sense;
+ y = state.apogee_voltage;
break;
case data_main_voltage:
- y = state.main_sense;
+ y = state.main_voltage;
break;
case data_rssi:
- y = state.data.rssi;
+ y = state.rssi;
break;
case data_gps_height:
y = state.gps_height;
- break;
+ break;
case data_gps_nsat_solution:
if (state.gps != null)
y = state.gps.nsat;
if (state.from_pad != null)
y = state.from_pad.distance;
break;
+ case data_pressure:
+ y = state.pressure();
+ break;
+
+ case data_accel_x:
+ case data_accel_y:
+ case data_accel_z:
+ case data_gyro_x:
+ case data_gyro_y:
+ case data_gyro_z:
+ AltosIMU imu = state.imu;
+ if (imu == null)
+ break;
+ switch (index) {
+ case data_accel_x:
+ y = imu.accel_x;
+ break;
+ case data_accel_y:
+ y = imu.accel_y;
+ break;
+ case data_accel_z:
+ y = imu.accel_z;
+ break;
+ case data_gyro_x:
+ y = imu.gyro_x;
+ break;
+ case data_gyro_y:
+ y = imu.gyro_y;
+ break;
+ case data_gyro_z:
+ y = imu.gyro_z;
+ break;
+ }
+ break;
+ case data_mag_x:
+ case data_mag_y:
+ case data_mag_z:
+ AltosMag mag = state.mag;
+ if (mag == null)
+ break;
+ switch (index) {
+ case data_mag_x:
+ y = mag.x;
+ break;
+ case data_mag_y:
+ y = mag.y;
+ break;
+ case data_mag_z:
+ y = mag.z;
+ break;
+ }
+ break;
+ case data_orient:
+ y = state.orient();
+ break;
+ case data_gps_course:
+ if (state.gps != null)
+ y = state.gps.course;
+ else
+ y = AltosLib.MISSING;
+ break;
+ case data_gps_ground_speed:
+ if (state.gps != null)
+ y = state.gps.ground_speed;
+ else
+ y = AltosLib.MISSING;
+ break;
+ case data_gps_climb_rate:
+ if (state.gps != null)
+ y = state.gps.climb_rate;
+ else
+ y = AltosLib.MISSING;
+ break;
+ default:
+ if (data_ignitor_0 <= index && index <= data_ignitor_max) {
+ int ignitor = index - data_ignitor_0;
+ if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length)
+ y = state.ignitor_voltage[ignitor];
+ } else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
+ int ignitor = index - data_ignitor_fired_0;
+ if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
+ if ((state.pyro_fired & (1 << ignitor)) != 0)
+ y = 1;
+ else
+ y = 0;
+ }
+ }
+ break;
}
- if (y == AltosRecord.MISSING)
+ if (y == AltosLib.MISSING)
throw new AltosUIDataMissing(index);
return y;
}
public int id(int index) {
if (index == data_state) {
- int s = state.data.state;
- if (s < Altos.ao_flight_boost || s > Altos.ao_flight_landed)
- return -1;
- return s;
+ int s = state.state;
+ if (Altos.ao_flight_boost <= s && s <= Altos.ao_flight_landed)
+ return s;
+ } else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
+ int ignitor = index - data_ignitor_fired_0;
+ if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
+ if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length) {
+ if ((state.pyro_fired & (1 << ignitor)) != 0)
+ return 1;
+ }
+ }
}
- return 0;
+ return -1;
}
public String id_name(int index) {
- if (index == data_state)
- return state.data.state();
+ if (index == data_state) {
+ return state.state_name();
+ } else if (data_ignitor_fired_0 <= index && index <= data_ignitor_fired_max) {
+ int ignitor = index - data_ignitor_fired_0;
+ if (state.ignitor_voltage != null && ignitor < state.ignitor_voltage.length)
+ return AltosIgnitor.ignitor_name(ignitor);
+ }
return "";
}
public AltosGraphDataPoint (AltosState state) {
this.state = state;
}
-}
\ No newline at end of file
+}
projects / fw / altos / blobdiff