altoslib/altosui/telegps: Switch TeleGPS config to motion/interval

[fw/altos] / altoslib / AltosConfigData.java

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 9292a5a2d5b26903e735d9280741fbdb9c91bd60..563bef4b71ceaecc4804f35ae14a4b0f2cafd698 100644 (file)
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -29,6 +29,7 @@ public class AltosConfigData implements Iterable<String> {
        public int      serial;
        public int      flight;
        public int      log_format;
+       public int      log_space;
        public String   version;
 
        /* Strings returned */
@@ -81,7 +82,8 @@ public class AltosConfigData implements Iterable<String> {
        public int      stored_flight;
 
        /* HAS_TRACKER */
-       public int[]    tracker_distances;
+       public int      tracker_motion;
+       public int      tracker_interval;
 
        public static String get_string(String line, String label) throws  ParseException {
                if (line.startsWith(label)) {
@@ -106,15 +108,15 @@ public class AltosConfigData implements Iterable<String> {
                throw new ParseException("mismatch", 0);
        }
 
-       public static int[] get_distances(String line, String label) throws NumberFormatException, ParseException {
+       public static int[] get_values(String line, String label) throws NumberFormatException, ParseException {
                if (line.startsWith(label)) {
                        String tail = line.substring(label.length()).trim();
                        String[] tokens = tail.split("\\s+");
                        if (tokens.length > 1) {
-                               int[]   distances = new int[2];
-                               distances[0] = Integer.parseInt(tokens[0]);
-                               distances[1] = Integer.parseInt(tokens[1]);
-                               return distances;
+                               int[]   values = new int[2];
+                               values[0] = Integer.parseInt(tokens[0]);
+                               values[1] = Integer.parseInt(tokens[1]);
+                               return values;
                        }
                }
                throw new ParseException("mismatch", 0);
@@ -124,6 +126,22 @@ public class AltosConfigData implements Iterable<String> {
                return lines.iterator();
        }
 
+       public int log_space() {
+               if (log_space > 0)
+                       return log_space;
+
+               if (storage_size > 0) {
+                       int     space = storage_size;
+
+                       if (storage_erase_unit > 0 && use_flash_for_config())
+                               space -= storage_erase_unit;
+
+                       if (space > 0)
+                               return space;
+               }
+               return 0;
+       }
+
        public int log_available() {
                switch (log_format) {
                case AltosLib.AO_LOG_FORMAT_TINY:
@@ -137,7 +155,7 @@ public class AltosConfigData implements Iterable<String> {
                        if (flight_log_max <= 0)
                                return 1;
                        int     log_max = flight_log_max * 1024;
-                       int     log_space = storage_size - storage_erase_unit;
+                       int     log_space = log_space();
                        int     log_used;
 
                        if (stored_flight <= 0)
@@ -202,6 +220,7 @@ public class AltosConfigData implements Iterable<String> {
                serial = 0;
                flight = 0;
                log_format = AltosLib.AO_LOG_FORMAT_UNKNOWN;
+               log_space = -1;
                version = "unknown";
 
                main_deploy = -1;
@@ -232,7 +251,8 @@ public class AltosConfigData implements Iterable<String> {
 
                beep = -1;
 
-               tracker_distances = null;
+               tracker_motion = -1;
+               tracker_interval = -1;
 
                storage_size = -1;
                storage_erase_unit = -1;
@@ -247,6 +267,7 @@ public class AltosConfigData implements Iterable<String> {
                try { serial = get_int(line, "serial-number"); } catch (Exception e) {}
                try { flight = get_int(line, "current-flight"); } catch (Exception e) {}
                try { log_format = get_int(line, "log-format"); } catch (Exception e) {}
+               try { log_space = get_int(line, "log-space"); } catch (Exception e) {}
                try { version = get_string(line, "software-version"); } catch (Exception e) {}
 
                /* Version also contains MS5607 info, which we ignore here */
@@ -314,7 +335,11 @@ public class AltosConfigData implements Iterable<String> {
                try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
 
                /* HAS_TRACKER */
-               try { tracker_distances = get_distances(line, "Tracker setting:"); } catch (Exception e) {}
+               try {
+                       int[] values = get_values(line, "Tracker setting:");
+                       tracker_motion = values[0];
+                       tracker_interval = values[1];
+               } catch (Exception e) {}
 
                /* Storage info replies */
                try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}
@@ -390,19 +415,6 @@ public class AltosConfigData implements Iterable<String> {
        }
 
 
-       public int log_limit() {
-               if (storage_size > 0) {
-                       int     log_limit = storage_size;
-
-                       if (storage_erase_unit > 0 && use_flash_for_config())
-                               log_limit -= storage_erase_unit;
-
-                       if (log_limit > 0)
-                               return log_limit / 1024;
-               }
-               return 1024;
-       }
-
        public void get_values(AltosConfigValues source) throws AltosConfigDataException {
 
                /* HAS_FLIGHT */
@@ -447,8 +459,10 @@ public class AltosConfigData implements Iterable<String> {
                if (beep >= 0)
                        beep = source.beep();
                /* HAS_TRACKER */
-               if (tracker_distances != null)
-                       tracker_distances = source.tracker_distances();
+               if (tracker_motion >= 0)
+                       tracker_motion = source.tracker_motion();
+               if (tracker_interval >= 0)
+                       tracker_interval = source.tracker_interval();
        }
 
        public void set_values(AltosConfigValues dest) {
@@ -462,7 +476,7 @@ public class AltosConfigData implements Iterable<String> {
                dest.set_radio_frequency(frequency());
                boolean max_enabled = true;
 
-               if (log_limit() == 0)
+               if (log_space() == 0)
                        max_enabled = false;
 
                switch (log_format) {
@@ -477,7 +491,7 @@ public class AltosConfigData implements Iterable<String> {
 
                dest.set_flight_log_max_enabled(max_enabled);
                dest.set_radio_enable(radio_enable);
-               dest.set_flight_log_max_limit(log_limit());
+               dest.set_flight_log_max_limit(log_space() / 1024);
                dest.set_flight_log_max(flight_log_max);
                dest.set_ignite_mode(ignite_mode);
                dest.set_pad_orientation(pad_orientation);
@@ -488,7 +502,8 @@ public class AltosConfigData implements Iterable<String> {
                        dest.set_pyros(null);
                dest.set_aprs_interval(aprs_interval);
                dest.set_beep(beep);
-               dest.set_tracker_distances(tracker_distances);
+               dest.set_tracker_motion(tracker_motion);
+               dest.set_tracker_interval(tracker_interval);
        }
 
        public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
@@ -560,8 +575,8 @@ public class AltosConfigData implements Iterable<String> {
                        link.printf("c b %d\n", beep);
 
                /* HAS_TRACKER */
-               if (tracker_distances != null)
-                       link.printf("c t %d %d\n", tracker_distances[0], tracker_distances[1]);
+               if (tracker_motion >= 0 && tracker_interval >= 0)
+                       link.printf("c t %d %d\n", tracker_motion, tracker_interval);
 
                link.printf("c w\n");
                link.flush_output();