altos/telefireone-v2.0: Remove build of ao_product.h from Makefile

[fw/altos] / altoslib / AltosAccel.java

diff --git a/altoslib/AltosAccel.java b/altoslib/AltosAccel.java
index d02b32385f348e1dfdf28eabb5afd1219dbcf07b..8bc6db6dd8c8e439f92ecab1e6961d922f23b6c1 100644 (file)
--- a/altoslib/AltosAccel.java
+++ b/altoslib/AltosAccel.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,37 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_13;
+
+import java.io.*;
 
 public class AltosAccel extends AltosUnits {
 
-       public double value(double v) {
-               if (AltosConvert.imperial_units)
+       public double value(double v, boolean imperial_units) {
+               if (imperial_units)
                        return AltosConvert.meters_to_feet(v);
                return v;
        }
 
-       public String show_units() {
-               if (AltosConvert.imperial_units)
+       public double inverse(double v, boolean imperial_units) {
+               if (imperial_units)
+                       return AltosConvert.feet_to_meters(v);
+               return v;
+       }
+
+       public String show_units(boolean imperial_units) {
+               if (imperial_units)
                        return "ft/s²";
                return "m/s²";
        }
 
-       public String say_units() {
-               if (AltosConvert.imperial_units)
+       public String say_units(boolean imperial_units) {
+               if (imperial_units)
                        return "feet per second squared";
                return "meters per second squared";
        }
 
-       public int show_fraction(int width) {
+       public int show_fraction(int width, boolean imperial_units) {
                return width / 9;
        }
-}
\ No newline at end of file
+}