projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: When flashing to TeleDongle or TeleBT, match any .ihx file
[fw/altos]
/
altosui
/
AltosGraphDataPoint.java
diff --git
a/altosui/AltosGraphDataPoint.java
b/altosui/AltosGraphDataPoint.java
index 537efc4408afd2ab8b06afbc2276b2ef0b4e107d..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 {
@@
-49,16
+49,16
@@
public class AltosGraphDataPoint implements AltosUIDataPoint {
}
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_temp:
y = state.temperature;
@@
-97,10
+97,10
@@
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;
}
throw new AltosUIDataMissing(index);
return y;
}