projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Record time_change in AltosState correctly
[fw/altos]
/
altoslib
/
AltosLib.java
diff --git
a/altoslib/AltosLib.java
b/altoslib/AltosLib.java
index 2402331e59351cde28a76ff9be2693a6ddd739cb..f8a3974a0b56f8dea046f4e46786149f0b524b95 100644
(file)
--- a/
altoslib/AltosLib.java
+++ b/
altoslib/AltosLib.java
@@
-15,11
+15,9
@@
* 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_2
;
-import java.awt.*;
import java.util.*;
import java.util.*;
-import java.text.*;
import java.io.*;
import java.nio.charset.Charset;
import java.io.*;
import java.nio.charset.Charset;
@@
-30,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';
@@
-52,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;
@@
-64,6
+63,8
@@
public class AltosLib {
public static final int AO_LOG_SOFTWARE_VERSION = 9999;
public static final int AO_LOG_SOFTWARE_VERSION = 9999;
+ public final static int MISSING = 0x7fffffff;
+
/* Added to flag invalid records */
public static final int AO_LOG_INVALID = -1;
/* Added to flag invalid records */
public static final int AO_LOG_INVALID = -1;
@@
-91,10
+92,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;
@@
-111,7
+115,7
@@
public class AltosLib {
public static final int ao_telemetry_0_8 = 3;
public static final int ao_telemetry_max = 3;
public static final int ao_telemetry_0_8 = 3;
public static final int ao_telemetry_max = 3;
- p
ublic
static final String[] ao_telemetry_name = {
+ p
rivate
static final String[] ao_telemetry_name = {
"Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
};
"Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
};
@@
-121,13
+125,13
@@
public class AltosLib {
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_0_9_len = 95;
public static final int ao_telemetry_0_8_len = 94;
- p
ublic
static final int[] ao_telemetry_len = {
+ p
rivate
static final int[] ao_telemetry_len = {
0, 32, 95, 94
};
0, 32, 95, 94
};
- p
ublic static HashMap<String,Integer>
string_to_state = new HashMap<String,Integer>();
+ p
rivate static HashMap<String,Integer>
string_to_state = new HashMap<String,Integer>();
- p
ublic
static boolean map_initialized = false;
+ p
rivate
static boolean map_initialized = false;
public static void initialize_map()
{
public static void initialize_map()
{
@@
-159,7
+163,7
@@
public class AltosLib {
telemetry));
}
telemetry));
}
- p
ublic
static String[] state_to_string = {
+ p
rivate
static String[] state_to_string = {
"startup",
"idle",
"pad",
"startup",
"idle",
"pad",
@@
-172,7
+176,7
@@
public class AltosLib {
"invalid",
};
"invalid",
};
- p
ublic
static String[] state_to_string_capital = {
+ p
rivate
static String[] state_to_string_capital = {
"Startup",
"Idle",
"Pad",
"Startup",
"Idle",
"Pad",
@@
-199,6
+203,12
@@
public class AltosLib {
return state_to_string[state];
}
return state_to_string[state];
}
+ public static String state_name_capital(int state) {
+ if (state < 0 || state_to_string.length <= state)
+ return "Invalid";
+ return state_to_string_capital[state];
+ }
+
public static final int AO_GPS_VALID = (1 << 4);
public static final int AO_GPS_RUNNING = (1 << 5);
public static final int AO_GPS_DATE_VALID = (1 << 6);
public static final int AO_GPS_VALID = (1 << 4);
public static final int AO_GPS_RUNNING = (1 << 5);
public static final int AO_GPS_DATE_VALID = (1 << 6);
@@
-210,7
+220,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) {
@@
-401,4
+414,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));
+ }
}
}