Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosIMU.java

diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 02b458b8fbb3f3660866d12da7d0199961a669ab..f6cadf1d13a0f4276a15156e9f99dc9535c7cfa4 100644 (file)
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.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,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.*;
 import java.io.*;
 
-public class AltosIMU implements Cloneable, Serializable {
+public class AltosIMU implements Cloneable {
        public int              accel_along;
        public int              accel_across;
        public int              accel_through;
@@ -29,13 +30,13 @@ public class AltosIMU implements Cloneable, Serializable {
        public int              gyro_pitch;
        public int              gyro_yaw;
 
-       public static double    counts_per_g = 2048.0;
+       public static final double      counts_per_g = 2048.0;
 
        public static double convert_accel(double counts) {
                return counts / counts_per_g * (-AltosConvert.GRAVITATIONAL_ACCELERATION);
        }
 
-       public static double    counts_per_degsec = 16.4;
+       public static final double      counts_per_degsec = 16.4;
 
        public static double convert_gyro(double counts) {
                return counts / counts_per_degsec;