projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Wait for Windows to get ready with new device
[fw/altos]
/
altoslib
/
AltosLib.java
diff --git
a/altoslib/AltosLib.java
b/altoslib/AltosLib.java
index 77b3fcc48df52778ca4c76631c4cfb4c04d96467..cfc326245049e5eb04758433c97f26c1465a7a70 100644
(file)
--- a/
altoslib/AltosLib.java
+++ b/
altoslib/AltosLib.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
2
;
+package org.altusmetrum.altoslib_1
3
;
import java.util.*;
import java.io.*;
import java.util.*;
import java.io.*;
@@
-180,6
+180,10
@@
public class AltosLib {
return device_type == product_telemega || device_type == product_easymega;
}
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 ||
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"
};
"Compressed", "Uncompressed"
};
- public static final String launch_sites_url = "http
://www.altusmetrum.org/AltOS
/launch-sites.txt";
+ public static final String launch_sites_url = "http
s://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 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;
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_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;
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,10
@@
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_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_EASYMEGA_2 = 16;
+ public static final int AO_LOG_FORMAT_TELESTATIC = 17;
+ public static final int AO_LOG_FORMAT_MICROPEAK2 = 18;
public static final int AO_LOG_FORMAT_NONE = 127;
public static boolean isspace(int c) {
public static final int AO_LOG_FORMAT_NONE = 127;
public static boolean isspace(int c) {