altosui: Complete split out of separate java library

[fw/altos] / altosui / Altos.java

diff --git a/altosui/Altos.java b/altosui/Altos.java
index e4f974f9bedd22dc43b6aaf74a99052cc3133aa6..380796cc2598d50fe357f7f3eb8b1eb589c99e75 100644 (file)
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -24,20 +24,9 @@ import java.nio.charset.Charset;
 
 import libaltosJNI.*;
 
-public class Altos {
-       /* EEProm command letters */
-       static final int AO_LOG_FLIGHT = 'F';
-       static final int AO_LOG_SENSOR = 'A';
-       static final int AO_LOG_TEMP_VOLT = 'T';
-       static final int AO_LOG_DEPLOY = 'D';
-       static final int AO_LOG_STATE = 'S';
-       static final int AO_LOG_GPS_TIME = 'G';
-       static final int AO_LOG_GPS_LAT = 'N';
-       static final int AO_LOG_GPS_LON = 'W';
-       static final int AO_LOG_GPS_ALT = 'H';
-       static final int AO_LOG_GPS_SAT = 'V';
-       static final int AO_LOG_GPS_DATE = 'Y';
-       static final int AO_LOG_PRESSURE = 'P';
+import org.altusmetrum.AltosLib.*;
+
+public class Altos extends AltosLib {
 
        /* Added for header fields in eeprom files */
        static final int AO_LOG_CONFIG_VERSION = 1000;
@@ -52,6 +41,17 @@ public class Altos {
        static final int AO_LOG_PRODUCT = 2001;
        static final int AO_LOG_SERIAL_NUMBER = 2002;
        static final int AO_LOG_LOG_FORMAT = 2003;
+
+       /* Added for header fields in megametrum files */
+       static final int AO_LOG_BARO_RESERVED = 3000;
+       static final int AO_LOG_BARO_SENS = 3001;
+       static final int AO_LOG_BARO_OFF = 3002;
+       static final int AO_LOG_BARO_TCS = 3004;
+       static final int AO_LOG_BARO_TCO = 3005;
+       static final int AO_LOG_BARO_TREF = 3006;
+       static final int AO_LOG_BARO_TEMPSENS = 3007;
+       static final int AO_LOG_BARO_CRC = 3008;
+
        static final int AO_LOG_SOFTWARE_VERSION = 9999;
 
        /* Added to flag invalid records */
@@ -220,6 +220,7 @@ public class Altos {
        static final int AO_LOG_FORMAT_TINY = 2;
        static final int AO_LOG_FORMAT_TELEMETRY = 3;
        static final int AO_LOG_FORMAT_TELESCIENCE = 4;
+       static final int AO_LOG_FORMAT_MEGAMETRUM = 5;
        static final int AO_LOG_FORMAT_NONE = 127;
 
        static boolean isspace(int c) {
@@ -498,5 +499,5 @@ public class Altos {
 
        public final static String bt_product_telebt = bt_product_telebt();
 
-//     public static AltosBTKnown bt_known = new AltosBTKnown();
+       public static AltosBTKnown bt_known = new AltosBTKnown();
 }