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
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index 95c1a99f8384b153e652f228446bce91de967ebd..5b3ff39187d3a8452e149287361aaa7eb83d7ac4 100644
(file)
--- a/
altoslib/AltosConvert.java
+++ b/
altoslib/AltosConvert.java
@@
-191,7
+191,7
@@
public class AltosConvert {
}
public static double
}
public static double
- cc_ignit
o
r_to_voltage(double ignite)
+ cc_ignit
e
r_to_voltage(double ignite)
{
return ignite / 32767 * 15.0;
}
{
return ignite / 32767 * 15.0;
}
@@
-434,6
+434,10
@@
public class AltosConvert {
public static AltosStateName state_name = new AltosStateName();
public static AltosStateName state_name = new AltosStateName();
+ public static AltosPyroName pyro_name = new AltosPyroName();
+
+ public static AltosUnits magnetic_field = null;
+
public static String show_gs(String format, double a) {
a = meters_to_g(a);
format = format.concat(" g");
public static String show_gs(String format, double a) {
a = meters_to_g(a);
format = format.concat(" g");