summaryrefslogtreecommitdiff
path: root/altoslib/AltosConvert.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-05-25 22:36:05 -0700
committerKeith Packard <keithp@keithp.com>2017-05-25 22:37:22 -0700
commit222158581887b5f9e8b9843d14321c313fa023fa (patch)
tree4baab1916948932f9c5eff5960d685b58d62f470 /altoslib/AltosConvert.java
parent4d497c1be534e2b206edec3c096198c8ea64cebe (diff)
altoslib/altosuilib/altosui: More work towards using AltosFlightSeries for analysis
Graphing and CSV seem complete now; stats still missing lots of stuff. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosConvert.java')
-rw-r--r--altoslib/AltosConvert.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 95c1a99f..5b3ff391 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -191,7 +191,7 @@ public class AltosConvert {
}
public static double
- cc_ignitor_to_voltage(double ignite)
+ cc_igniter_to_voltage(double ignite)
{
return ignite / 32767 * 15.0;
}
@@ -434,6 +434,10 @@ public class AltosConvert {
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");