altos: Perform time comparisons using 16-bit arithmetic to handle wrap

[fw/altos] / altoslib / AltosSpeed.java

diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index 6fb624fb664bbab32511848765e54dccb566f77a..2a8ccedcd47a89523ad844bbfc975c5464102da1 100644 (file)
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,29 +16,35 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_12;
 
 public class AltosSpeed extends AltosUnits {
 
-       public double value(double v) {
-               if (AltosConvert.imperial_units)
-                       return AltosConvert.meters_to_mph(v);
+       public double value(double v, boolean imperial_units) {
+               if (imperial_units)
+                       return AltosConvert.mps_to_fps(v);
                return v;
        }
 
-       public String show_units() {
-               if (AltosConvert.imperial_units)
-                       return "mph";
+       public double inverse(double v, boolean imperial_units) {
+               if (imperial_units)
+                       return AltosConvert.fps_to_mps(v);
+               return v;
+       }
+
+       public String show_units(boolean imperial_units) {
+               if (imperial_units)
+                       return "fps";
                return "m/s";
        }
 
-       public String say_units() {
-               if (AltosConvert.imperial_units)
-                       return "miles per hour";
+       public String say_units(boolean imperial_units) {
+               if (imperial_units)
+                       return "feet per second";
                return "meters per second";
        }
 
-       public int show_fraction(int width) {
+       public int show_fraction(int width, boolean imperial_units) {
                return width / 9;
        }
-}
\ No newline at end of file
+}