Merge branch 'aprs' into 'master'

diff --combined altoslib/AltosConfigData.java
index f940b150710a8743d6e64bd9f44ab417bdb66462,758953e24d588c938d50ea4d40dee379505df608..99b8e39d2042e4279605294acafb6c223d72de5d
--- 1/altoslib/AltosConfigData.java
--- 2/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@@ -67,9 -67,6 +67,9 @@@ public class AltosConfigData implement
        public int              npyro;
        public int              pyro;
  
 +      /* HAS_APRS */
 +      public int              aprs_interval;
 +
        /* Storage info replies */
        public int      storage_size;
        public int      storage_erase_unit;
@@@ -192,8 -189,6 +192,8 @@@
                npyro = 0;
                pyros = null;
  
 +              aprs_interval = -1;
 +
                storage_size = -1;
                storage_erase_unit = -1;
                stored_flight = -1;
@@@ -267,9 -262,6 +267,9 @@@
                        } catch (Exception e) {}
                }
  
 +              /* HAS_APRS */
 +              try { aprs_interval = get_int(line, "APRS interval:"); } catch (Exception e) {}
 +
                /* Storage info replies */
                try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}
                try { storage_erase_unit = get_int(line, "Storage erase unit"); } catch (Exception e) {}
@@@ -375,9 -367,6 +375,9 @@@
                /* AO_PYRO_NUM */
                if (npyro > 0)
                        pyros = source.pyros();
 +
 +              if (aprs_interval >= 0)
 +                      aprs_interval = source.aprs_interval();
        }
  
        public void set_values(AltosConfigValues dest) {
@@@ -410,7 -399,6 +410,7 @@@
                        dest.set_pyros(pyros);
                else
                        dest.set_pyros(null);
 +              dest.set_aprs_interval(aprs_interval);
        }
  
        public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
@@@ -473,10 -461,6 +473,10 @@@
                        }
                }
  
 +              /* HAS_APRS */
 +              if (aprs_interval >= 0)
 +                      link.printf("c A %d\n", aprs_interval);
 +
                link.printf("c w\n");
                link.flush_output();
        }
@@@ -485,14 -469,16 +485,16 @@@
                reset();
                link.printf("c s\nf\nv\n");
                read_link(link, "software-version");
+               System.out.printf("Log format %d\n", log_format);
                switch (log_format) {
-               case AltosLib.AO_LOG_FORMAT_TELEMETRY:
-               case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
-                       break;
-               default:
+               case AltosLib.AO_LOG_FORMAT_FULL:
+               case AltosLib.AO_LOG_FORMAT_TINY:
+               case AltosLib.AO_LOG_FORMAT_MEGAMETRUM:
                        link.printf("l\n");
                        read_link(link, "done");
+               default:
+                       break;
                }
        }
  
 -}
 +}