projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib, altosui: Restructured state management now does TM eeprom files
[fw/altos]
/
altosui
/
AltosGraphDataPoint.java
diff --git
a/altosui/AltosGraphDataPoint.java
b/altosui/AltosGraphDataPoint.java
index 7454f447948e897b2a468af31820f0ee42df8593..537efc4408afd2ab8b06afbc2276b2ef0b4e107d 100644
(file)
--- a/
altosui/AltosGraphDataPoint.java
+++ b/
altosui/AltosGraphDataPoint.java
@@
-42,9
+42,10
@@
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 {
@@
-63,16
+64,16
@@
public class AltosGraphDataPoint implements AltosUIDataPoint {
y = state.temperature;
break;
case data_battery_voltage:
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;
@@
-106,7
+107,7
@@
public class AltosGraphDataPoint implements AltosUIDataPoint {
public int id(int index) {
if (index == data_state) {
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 "";
}