Merge branch 'master' into branch-1.6

1 files changed, 9 insertions, 1 deletions

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 59092a6f..265b5f0f 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_9;
+package org.altusmetrum.altoslib_10;
 
 public class AltosConvert {
 	/*
@@ -325,6 +325,14 @@ public class AltosConvert {
 		return miles_to_meters(mps) / 3600;
  	}
 
+	public static double mps_to_fps(double mps) {
+		return meters_to_miles(mps) * 5280;
+ 	}
+
+	public static double fps_to_mps(double mps) {
+		return miles_to_meters(mps) / 5280;
+ 	}
+
 	public static double meters_to_mach(double meters) {
 		return meters / 343;		/* something close to mach at usual rocket sites */
 	}