X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIMU.java;h=f6cadf1d13a0f4276a15156e9f99dc9535c7cfa4;hb=6804ead7f7e54ff34b257e10e381dc52d5a61b06;hp=26d115919da55be14aa460aec56904f23b220a35;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01;p=fw%2Faltos diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java index 26d11591..f6cadf1d 100644 --- 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 @@ -20,7 +21,7 @@ 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;