X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=acd6c5f481f331bcdd28fa4304668996e3db04c1;hb=fcb801b145e1ae6f1c0b3418a99245d34dbf5aa4;hp=3527b575178a2291ceb62b5729c3987af756f618;hpb=69e6df07976a56b49e07c242cd6e5b2cbd2a578d;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 3527b575..acd6c5f4 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -242,6 +242,14 @@ public class AltosConvert {
 		return meters * (100 / (2.54 * 12));
 	}
 
+	public static double meters_to_miles(double meters) {
+		return meters_to_feet(meters) / 5280;
+	}
+
+	public static double meters_to_mph(double mps) {
+		return meters_to_miles(mps) * 3600;
+ 	}
+
 	public static double meters_to_mach(double meters) {
 		return meters / 343;		/* something close to mach at usual rocket sites */
 	}
@@ -250,6 +258,26 @@ public class AltosConvert {
 		return meters / 9.80665;
 	}
 
+	public static boolean imperial_units = false;
+
+	public static AltosDistance distance = new AltosDistance();
+
+	public static AltosHeight height = new AltosHeight();
+
+	public static AltosSpeed speed = new AltosSpeed();
+
+	public static AltosAccel accel = new AltosAccel();
+
+	public static String show_gs(String format, double a) {
+		a = meters_to_g(a);
+		format = format.concat(" g");
+		return String.format(format, a);
+	}
+
+	public static String say_gs(double a) {
+		return String.format("%6.0 gees", meters_to_g(a));
+	}
+
 	public static int checksum(int[] data, int start, int length) {
 		int	csum = 0x5a;
 		for (int i = 0; i < length; i++)