altoslib/altosui/telegps: Change log size configuration
[fw/altos] / altoslib / AltosConfigData.java
index 12659d88100322bffdca273180047356951551fa..9462ae6f4d62f8b9eae3b01a442436d711e53ee3 100644 (file)
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_4;
 
 import java.util.*;
 import java.text.*;
@@ -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 */
@@ -70,6 +71,9 @@ public class AltosConfigData implements Iterable<String> {
        /* HAS_APRS */
        public int              aprs_interval;
 
+       /* HAS_BEEP */
+       public int              beep;
+
        /* Storage info replies */
        public int      storage_size;
        public int      storage_erase_unit;
@@ -77,6 +81,9 @@ public class AltosConfigData implements Iterable<String> {
        /* Log listing replies */
        public int      stored_flight;
 
+       /* HAS_TRACKER */
+       public int[]    tracker_distances;
+
        public static String get_string(String line, String label) throws  ParseException {
                if (line.startsWith(label)) {
                        String  quoted = line.substring(label.length()).trim();
@@ -100,10 +107,40 @@ public class AltosConfigData implements Iterable<String> {
                throw new ParseException("mismatch", 0);
        }
 
+       public static int[] get_distances(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;
+                       }
+               }
+               throw new ParseException("mismatch", 0);
+       }
+
        public Iterator<String> iterator() {
                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:
@@ -117,7 +154,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)
@@ -135,6 +172,12 @@ public class AltosConfigData implements Iterable<String> {
                }
        }
 
+       public boolean has_monitor_battery() {
+               if (product.startsWith("TeleBT"))
+                       return true;
+               return false;
+       }
+
        int[] parse_version(String v) {
                String[] parts = v.split("\\.");
                int r[] = new int[parts.length];
@@ -176,6 +219,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;
@@ -204,6 +248,10 @@ public class AltosConfigData implements Iterable<String> {
 
                aprs_interval = -1;
 
+               beep = -1;
+
+               tracker_distances = null;
+
                storage_size = -1;
                storage_erase_unit = -1;
                stored_flight = 0;
@@ -217,6 +265,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 */
@@ -280,6 +329,12 @@ public class AltosConfigData implements Iterable<String> {
                /* HAS_APRS */
                try { aprs_interval = get_int(line, "APRS interval:"); } catch (Exception e) {}
 
+               /* HAS_BEEP */
+               try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
+
+               /* HAS_TRACKER */
+               try { tracker_distances = get_distances(line, "Tracker setting:"); } 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) {}
@@ -330,6 +385,10 @@ public class AltosConfigData implements Iterable<String> {
        public double frequency() {
                int     channel = radio_channel;
                int     setting = radio_setting;
+
+               if (radio_frequency < 0 && channel < 0 && setting < 0)
+                       return -1;
+
                if (channel < 0)
                        channel = 0;
                if (setting < 0)
@@ -341,16 +400,16 @@ public class AltosConfigData implements Iterable<String> {
                                                       channel);
        }
 
-       public int log_limit() {
-               if (storage_size > 0 && storage_erase_unit > 0) {
-                       int     log_limit = storage_size - storage_erase_unit;
-                       if (log_limit > 0)
-                               return log_limit / 1024;
-               }
-               return 1024;
+       boolean use_flash_for_config() {
+               if (product.startsWith("TeleMega"))
+                       return false;
+               if (product.startsWith("TeleMetrum-v2"))
+                       return false;
+               return true;
        }
 
-       public void get_values(AltosConfigValues source) {
+
+       public void get_values(AltosConfigValues source) throws AltosConfigDataException {
 
                /* HAS_FLIGHT */
                if (main_deploy >= 0)
@@ -386,8 +445,16 @@ public class AltosConfigData implements Iterable<String> {
                if (npyro > 0)
                        pyros = source.pyros();
 
+               /* HAS_APRS */
                if (aprs_interval >= 0)
                        aprs_interval = source.aprs_interval();
+
+               /* HAS_BEEP */
+               if (beep >= 0)
+                       beep = source.beep();
+               /* HAS_TRACKER */
+               if (tracker_distances != null)
+                       tracker_distances = source.tracker_distances();
        }
 
        public void set_values(AltosConfigValues dest) {
@@ -400,18 +467,23 @@ public class AltosConfigData implements Iterable<String> {
                dest.set_radio_calibration(radio_calibration);
                dest.set_radio_frequency(frequency());
                boolean max_enabled = true;
+
+               if (log_space() == 0)
+                       max_enabled = false;
+
                switch (log_format) {
                case AltosLib.AO_LOG_FORMAT_TINY:
                        max_enabled = false;
                        break;
                default:
-                       if (stored_flight >= 0)
+                       if (stored_flight > 0)
                                max_enabled = false;
                        break;
                }
+
                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);
@@ -421,6 +493,8 @@ public class AltosConfigData implements Iterable<String> {
                else
                        dest.set_pyros(null);
                dest.set_aprs_interval(aprs_interval);
+               dest.set_beep(beep);
+               dest.set_tracker_distances(tracker_distances);
        }
 
        public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
@@ -476,7 +550,7 @@ public class AltosConfigData implements Iterable<String> {
                /* UI doesn't support AES key config */
 
                /* AO_PYRO_NUM */
-               if (pyros.length > 0) {
+               if (npyro > 0) {
                        for (int p = 0; p < pyros.length; p++) {
                                link.printf("c P %s\n",
                                                   pyros[p].toString());
@@ -487,6 +561,14 @@ public class AltosConfigData implements Iterable<String> {
                if (aprs_interval >= 0)
                        link.printf("c A %d\n", aprs_interval);
 
+               /* HAS_BEEP */
+               if (beep >= 0)
+                       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]);
+
                link.printf("c w\n");
                link.flush_output();
        }
@@ -496,12 +578,12 @@ public class AltosConfigData implements Iterable<String> {
                link.printf("c s\nf\nv\n");
                read_link(link, "software-version");
                switch (log_format) {
-               case AltosLib.AO_LOG_FORMAT_FULL:
-               case AltosLib.AO_LOG_FORMAT_TINY:
-               case AltosLib.AO_LOG_FORMAT_MEGAMETRUM:
+               case AltosLib.AO_LOG_FORMAT_UNKNOWN:
+               case AltosLib.AO_LOG_FORMAT_NONE:
+                       break;
+               default:
                        link.printf("l\n");
                        read_link(link, "done");
-               default:
                        break;
                }
        }