altoslib: Use https for launch-sites.txt

[fw/altos] / altoslib / AltosLib.java

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index d1063509b2d4e1efda7ebfce2a1eca76032d6200..8b0170aed140c2b3e85acf718a4def736a6d84b6 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
 
 import java.util.*;
 import java.io.*;
@@ -180,6 +180,10 @@ public class AltosLib {
                return device_type == product_telemega || device_type == product_easymega;
        }
 
+       public static boolean has_radio(int device_type) {
+               return device_type != product_easymini && device_type != product_easymega;
+       }
+
        public static boolean has_gps(int device_type) {
                return device_type == product_telemetrum ||
                        device_type == product_telemega ||
@@ -222,10 +226,13 @@ public class AltosLib {
                "Compressed", "Uncompressed"
        };
 
-       public static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
+       public static final String launch_sites_url = "https://maps.altusmetrum.org/launch-sites.txt";
        public static final String launch_sites_env = "LAUNCH_SITES";
 //     public static final String launch_sites_url = "file:///home/keithp/misc/text/altusmetrum/AltOS/launch-sites.txt";
 
+       public static final String unit_info_url = "https://altusmetrum.org/cgi-bin/unitinfo.cgi?sn=%d";
+       public static final String unit_info_env = "UNIT_INFO";
+
        public static final int ao_telemetry_standard_len = 32;
        public static final int ao_telemetry_0_9_len = 95;
        public static final int ao_telemetry_0_8_len = 94;
@@ -348,6 +355,9 @@ public class AltosLib {
        public static final int AO_GPS_NUM_SAT_SHIFT = 0;
        public static final int AO_GPS_NUM_SAT_MASK = 0xf;
 
+       public static final int AO_PAD_ORIENTATION_ANTENNA_UP = 0;
+       public static final int AO_PAD_ORIENTATION_ANTENNA_DOWN = 1;
+
        public static final int AO_LOG_FORMAT_UNKNOWN = 0;
        public static final int AO_LOG_FORMAT_FULL = 1;
        public static final int AO_LOG_FORMAT_TINY = 2;
@@ -363,6 +373,7 @@ public class AltosLib {
        public static final int AO_LOG_FORMAT_TELEMINI3 = 12;
        public static final int AO_LOG_FORMAT_TELEFIRETWO = 13;
        public static final int AO_LOG_FORMAT_EASYMINI2 = 14;
+       public static final int AO_LOG_FORMAT_TELEMEGA_3 = 15;
        public static final int AO_LOG_FORMAT_NONE = 127;
 
        public static boolean isspace(int c) {
@@ -587,7 +598,11 @@ public class AltosLib {
        }
 
        public static String igniter_name(int i) {
-               return String.format("Ignitor %c", 'A' + i);
+               return String.format("Igniter %c", 'A' + i);
+       }
+
+       public static String igniter_short_name(int i) {
+               return String.format("igniter_%c", 'a' + i);
        }
 
        public static AltosRecordSet record_set(File file) throws FileNotFoundException, IOException {