projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/fox: Enable M25 driver for MRAM.
[fw/altos]
/
altoslib
/
AltosLib.java
diff --git
a/altoslib/AltosLib.java
b/altoslib/AltosLib.java
index d1063509b2d4e1efda7ebfce2a1eca76032d6200..7d2b68e0bfe94d56788f06ca9a4e2d7f51168aef 100644
(file)
--- a/
altoslib/AltosLib.java
+++ b/
altoslib/AltosLib.java
@@
-348,6
+348,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
+366,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_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) {
public static final int AO_LOG_FORMAT_NONE = 127;
public static boolean isspace(int c) {
@@
-587,7
+591,11
@@
public class AltosLib {
}
public static String igniter_name(int i) {
}
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 {
}
public static AltosRecordSet record_set(File file) throws FileNotFoundException, IOException {