projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib/altosuilib/altosui: More work towards using AltosFlightSeries for analysis
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index f46b12eaa7b00b3973f4b1c6f4995515093e1409..889aa9a319e4b9067492b716639d162754bd1b77 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-702,7
+702,7
@@
public class AltosState extends AltosDataListener {
public double apogee_voltage;
public double main_voltage;
public double apogee_voltage;
public double main_voltage;
- public double ignit
o
r_voltage[];
+ public double ignit
e
r_voltage[];
public AltosGPS gps;
public AltosGPS temp_gps;
public AltosGPS gps;
public AltosGPS temp_gps;
@@
-786,7
+786,7
@@
public class AltosState extends AltosDataListener {
pyro_voltage = AltosLib.MISSING;
apogee_voltage = AltosLib.MISSING;
main_voltage = AltosLib.MISSING;
pyro_voltage = AltosLib.MISSING;
apogee_voltage = AltosLib.MISSING;
main_voltage = AltosLib.MISSING;
- ignit
o
r_voltage = null;
+ ignit
e
r_voltage = null;
kalman_height = new AltosValue();
kalman_speed = new AltosValue();
kalman_height = new AltosValue();
kalman_speed = new AltosValue();
@@
-1221,8
+1221,8
@@
public class AltosState extends AltosDataListener {
}
}
}
}
- public void set_ignit
o
r_voltage(double[] voltage) {
- this.ignit
o
r_voltage = voltage;
+ public void set_ignit
e
r_voltage(double[] voltage) {
+ this.ignit
e
r_voltage = voltage;
}
public void set_pyro_fired(int fired) {
}
public void set_pyro_fired(int fired) {