Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosConfigData.java

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 0ffdcf60d90a01a94047c997ad93cfcc48b7fb60..6b55cc6fdc9c8dc7c7177b0e5e7bf4030ec2e49b 100644 (file)
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_6;
+package org.altusmetrum.altoslib_11;
 
 import java.util.*;
 import java.text.*;
@@ -204,7 +205,7 @@ public class AltosConfigData implements Iterable<String> {
 
                for (int i = 0; i < parts.length; i++) {
                        try {
-                               r[i] = AltosLib.fromdec(parts[i]);
+                               r[i] = (int) AltosLib.fromdec(parts[i]);
                        } catch (NumberFormatException n) {
                                r[i] = 0;
                        }
@@ -476,6 +477,18 @@ public class AltosConfigData implements Iterable<String> {
        }
 
 
+       public boolean mma655x_inverted() throws AltosUnknownProduct {
+               if (product.startsWith("EasyMega-v1"))
+                       return false;
+               if (product.startsWith("TeleMetrum-v2"))
+                       return true;
+               if (product.startsWith("TeleMega-v2"))
+                       return false;
+               if (product.startsWith("TeleMega-v1"))
+                       return false;
+               throw new AltosUnknownProduct(product);
+       }
+
        public void get_values(AltosConfigValues source) throws AltosConfigDataException {
 
                /* HAS_FLIGHT */
@@ -493,8 +506,6 @@ public class AltosConfigData implements Iterable<String> {
                        radio_enable = source.radio_enable();
                if (callsign != null)
                        callsign = source.callsign();
-               if (radio_calibration >= 0)
-                       radio_calibration = source.radio_calibration();
                if (telemetry_rate >= 0)
                        telemetry_rate = source.telemetry_rate();
 
@@ -601,10 +612,6 @@ public class AltosConfigData implements Iterable<String> {
                if (apogee_lockout >= 0)
                        link.printf("c L %d\n", apogee_lockout);
 
-               /* Don't mess with radio calibration when remote */
-               if (radio_calibration > 0 && !remote)
-                       link.printf("c f %d\n", radio_calibration);
-
                /* HAS_RADIO */
                if (has_frequency()) {
                        boolean has_frequency = radio_frequency >= 0;