projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fix GPS test frameworks to handle shared ao_gps_new variable
[fw/altos]
/
altosui
/
AltosGraphDataPoint.java
diff --git
a/altosui/AltosGraphDataPoint.java
b/altosui/AltosGraphDataPoint.java
index 7454f447948e897b2a468af31820f0ee42df8593..d8191f5d35199ab378188c5e071885031db2d47e 100644
(file)
--- a/
altosui/AltosGraphDataPoint.java
+++ b/
altosui/AltosGraphDataPoint.java
@@
-18,7
+18,7
@@
package altosui;
import org.altusmetrum.altosuilib_1.*;
package altosui;
import org.altusmetrum.altosuilib_1.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
public class AltosGraphDataPoint implements AltosUIDataPoint {
public class AltosGraphDataPoint implements AltosUIDataPoint {
@@
-42,37
+42,38
@@
public class AltosGraphDataPoint implements AltosUIDataPoint {
public static final int data_pressure = 15;
public double x() throws AltosUIDataMissing {
public static final int data_pressure = 15;
public double x() throws AltosUIDataMissing {
- if (state.data.time < -2)
+ double time = state.time_since_boost();
+ if (time < -2)
throw new AltosUIDataMissing(-1);
throw new AltosUIDataMissing(-1);
- return
state.data.
time;
+ return time;
}
public double y(int index) throws AltosUIDataMissing {
}
public double y(int index) throws AltosUIDataMissing {
- double y = Altos
Record
.MISSING;
+ double y = Altos
Lib
.MISSING;
switch (index) {
case data_height:
switch (index) {
case data_height:
- y = state.height;
+ y = state.height
()
;
break;
case data_speed:
y = state.speed();
break;
case data_accel:
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:
break;
case data_temp:
y = state.temperature;
break;
case data_battery_voltage:
- y = state.battery;
+ y = state.battery
_voltage
;
break;
case data_drogue_voltage:
break;
case data_drogue_voltage:
- y = state.
drogue_sens
e;
+ y = state.
apogee_voltag
e;
break;
case data_main_voltage:
break;
case data_main_voltage:
- y = state.main_
sens
e;
+ y = state.main_
voltag
e;
break;
case data_rssi:
break;
case data_rssi:
- y = state.
data.
rssi;
+ y = state.rssi;
break;
case data_gps_height:
y = state.gps_height;
break;
case data_gps_height:
y = state.gps_height;
@@
-96,17
+97,17
@@
public class AltosGraphDataPoint implements AltosUIDataPoint {
y = state.from_pad.distance;
break;
case data_pressure:
y = state.from_pad.distance;
break;
case data_pressure:
- y = state.pressure;
+ y = state.pressure
()
;
break;
}
break;
}
- if (y == Altos
Record
.MISSING)
+ if (y == Altos
Lib
.MISSING)
throw new AltosUIDataMissing(index);
return y;
}
public int id(int index) {
if (index == data_state) {
throw new AltosUIDataMissing(index);
return y;
}
public int id(int index) {
if (index == data_state) {
- int s = state.
data.
state;
+ int s = state.state;
if (s < Altos.ao_flight_boost || s > Altos.ao_flight_landed)
return -1;
return s;
if (s < Altos.ao_flight_boost || s > Altos.ao_flight_landed)
return -1;
return s;
@@
-116,7
+117,7
@@
public class AltosGraphDataPoint implements AltosUIDataPoint {
public String id_name(int index) {
if (index == data_state)
public String id_name(int index) {
if (index == data_state)
- return state.
data.stat
e();
+ return state.
state_nam
e();
return "";
}
return "";
}