Bump Java library versions

[fw/altos] / altoslib / AltosConfigData.java

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index a9e863c7759edac882571fa00ab7904d190b7602..8e0529344d50cafaf5077e9e6bb3a62dd953b80d 100644 (file)
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_8;
 
 import java.util.*;
 import java.text.*;
@@ -75,6 +75,7 @@ public class AltosConfigData implements Iterable<String> {
        /* HAS_APRS */
        public int              aprs_interval;
        public int              aprs_ssid;
+       public int              aprs_format;
 
        /* HAS_BEEP */
        public int              beep;
@@ -93,6 +94,16 @@ public class AltosConfigData implements Iterable<String> {
        /* HAS_GYRO */
        public int      accel_zero_along, accel_zero_across, accel_zero_through;
 
+       /* ms5607 data */
+       public int      ms5607_reserved;
+       public int      ms5607_sens;
+       public int      ms5607_off;
+       public int      ms5607_tcs;
+       public int      ms5607_tco;
+       public int      ms5607_tref;
+       public int      ms5607_tempsens;
+       public int      ms5607_crc;
+
        public static String get_string(String line, String label) throws  ParseException {
                if (line.startsWith(label)) {
                        String  quoted = line.substring(label.length()).trim();
@@ -260,6 +271,7 @@ public class AltosConfigData implements Iterable<String> {
 
                aprs_interval = -1;
                aprs_ssid = -1;
+               aprs_format = -1;
 
                beep = -1;
 
@@ -289,6 +301,15 @@ public class AltosConfigData implements Iterable<String> {
 
                /* Version also contains MS5607 info, which we ignore here */
 
+               try { ms5607_reserved = get_int(line, "ms5607 reserved:"); } catch (Exception e) {}
+               try { ms5607_sens = get_int(line, "ms5607 sens:"); } catch (Exception e) {}
+               try { ms5607_off = get_int(line, "ms5607 off:"); } catch (Exception e) {}
+               try { ms5607_tcs = get_int(line, "ms5607 tcs:"); } catch (Exception e) {}
+               try { ms5607_tco = get_int(line, "ms5607 tco:"); } catch (Exception e) {}
+               try { ms5607_tref = get_int(line, "ms5607 tref:"); } catch (Exception e) {}
+               try { ms5607_tempsens = get_int(line, "ms5607 tempsens:"); } catch (Exception e) {}
+               try { ms5607_crc = get_int(line, "ms5607 crc:"); } catch (Exception e) {}
+
                /* Config show replies */
 
                /* HAS_FLIGHT */
@@ -351,6 +372,7 @@ public class AltosConfigData implements Iterable<String> {
                /* HAS_APRS */
                try { aprs_interval = get_int(line, "APRS interval:"); } catch (Exception e) {}
                try { aprs_ssid = get_int(line, "APRS SSID:"); } catch (Exception e) {}
+               try { aprs_format = get_int(line, "APRS format:"); } catch (Exception e) {}
 
                /* HAS_BEEP */
                try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
@@ -499,6 +521,8 @@ public class AltosConfigData implements Iterable<String> {
                        aprs_interval = source.aprs_interval();
                if (aprs_ssid >= 0)
                        aprs_ssid = source.aprs_ssid();
+               if (aprs_format >= 0)
+                       aprs_format = source.aprs_format();
 
                /* HAS_BEEP */
                if (beep >= 0)
@@ -553,11 +577,20 @@ public class AltosConfigData implements Iterable<String> {
                dest.set_pyro_firing_time(pyro_firing_time);
                dest.set_aprs_interval(aprs_interval);
                dest.set_aprs_ssid(aprs_ssid);
+               dest.set_aprs_format(aprs_format);
                dest.set_beep(beep);
                dest.set_tracker_motion(tracker_motion);
                dest.set_tracker_interval(tracker_interval);
        }
 
+       public boolean log_has_state() {
+               switch (log_format) {
+               case AltosLib.AO_LOG_FORMAT_TELEGPS:
+                       return false;
+               }
+               return true;
+       }
+
        public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
 
                /* HAS_FLIGHT */
@@ -647,6 +680,8 @@ public class AltosConfigData implements Iterable<String> {
                        link.printf("c A %d\n", aprs_interval);
                if (aprs_ssid >= 0)
                        link.printf("c S %d\n", aprs_ssid);
+               if (aprs_format >= 0)
+                       link.printf("c C %d\n", aprs_format);
 
                /* HAS_BEEP */
                if (beep >= 0)