projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Clear sat data when tick changes
[fw/altos]
/
altoslib
/
AltosLib.java
diff --git
a/altoslib/AltosLib.java
b/altoslib/AltosLib.java
index b3fe2968eeb466f472a3028e1edc68bac09e5e51..d6d78ca8ffc2dd68e1e80905ea5ad80605cda7d6 100644
(file)
--- a/
altoslib/AltosLib.java
+++ b/
altoslib/AltosLib.java
@@
-15,7
+15,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;
+package org.altusmetrum.altoslib
_1
;
import java.util.*;
import java.io.*;
import java.util.*;
import java.io.*;
@@
-28,6
+28,7
@@
public class AltosLib {
public static final int AO_LOG_TEMP_VOLT = 'T';
public static final int AO_LOG_DEPLOY = 'D';
public static final int AO_LOG_STATE = 'S';
public static final int AO_LOG_TEMP_VOLT = 'T';
public static final int AO_LOG_DEPLOY = 'D';
public static final int AO_LOG_STATE = 'S';
+ public static final int AO_LOG_GPS_POS = 'P';
public static final int AO_LOG_GPS_TIME = 'G';
public static final int AO_LOG_GPS_LAT = 'N';
public static final int AO_LOG_GPS_LON = 'W';
public static final int AO_LOG_GPS_TIME = 'G';
public static final int AO_LOG_GPS_LAT = 'N';
public static final int AO_LOG_GPS_LON = 'W';
@@
-50,7
+51,7
@@
public class AltosLib {
public static final int AO_LOG_SERIAL_NUMBER = 2002;
public static final int AO_LOG_LOG_FORMAT = 2003;
public static final int AO_LOG_SERIAL_NUMBER = 2002;
public static final int AO_LOG_LOG_FORMAT = 2003;
- /* Added for header fields in
megametrum
files */
+ /* Added for header fields in
telemega
files */
public static final int AO_LOG_BARO_RESERVED = 3000;
public static final int AO_LOG_BARO_SENS = 3001;
public static final int AO_LOG_BARO_OFF = 3002;
public static final int AO_LOG_BARO_RESERVED = 3000;
public static final int AO_LOG_BARO_SENS = 3001;
public static final int AO_LOG_BARO_OFF = 3002;
@@
-89,10
+90,13
@@
public class AltosLib {
public final static int product_telelco = 0x0010;
public final static int product_telescience = 0x0011;
public final static int product_telepyro =0x0012;
public final static int product_telelco = 0x0010;
public final static int product_telescience = 0x0011;
public final static int product_telepyro =0x0012;
- public final static int product_
megametrum
= 0x0023;
+ public final static int product_
telemega
= 0x0023;
public final static int product_megadongle = 0x0024;
public final static int product_megadongle = 0x0024;
+ public final static int product_telegps = 0x0025;
+ public final static int product_easymini = 0x0026;
+ public final static int product_telemini = 0x0027;
public final static int product_altusmetrum_min = 0x000a;
public final static int product_altusmetrum_min = 0x000a;
- public final static int product_altusmetrum_max = 0x002
4
;
+ public final static int product_altusmetrum_max = 0x002
c
;
public final static int product_any = 0x10000;
public final static int product_basestation = 0x10000 + 1;
public final static int product_any = 0x10000;
public final static int product_basestation = 0x10000 + 1;
@@
-214,7
+218,10
@@
public class AltosLib {
public static final int AO_LOG_FORMAT_TINY = 2;
public static final int AO_LOG_FORMAT_TELEMETRY = 3;
public static final int AO_LOG_FORMAT_TELESCIENCE = 4;
public static final int AO_LOG_FORMAT_TINY = 2;
public static final int AO_LOG_FORMAT_TELEMETRY = 3;
public static final int AO_LOG_FORMAT_TELESCIENCE = 4;
- public static final int AO_LOG_FORMAT_MEGAMETRUM = 5;
+ public static final int AO_LOG_FORMAT_TELEMEGA = 5;
+ public static final int AO_LOG_FORMAT_EASYMINI = 6;
+ public static final int AO_LOG_FORMAT_TELEMETRUM = 7;
+ public static final int AO_LOG_FORMAT_TELEMINI = 8;
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) {
@@
-405,4
+412,8
@@
public class AltosLib {
input = input.substring(0,dot);
return input.concat(extension);
}
input = input.substring(0,dot);
return input.concat(extension);
}
+
+ public static File replace_extension(File input, String extension) {
+ return new File(replace_extension(input.getPath(), extension));
+ }
}
}