summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--altoslib/AltosConfigData.java2
-rw-r--r--altoslib/AltosEepromIterable.java16
-rw-r--r--altoslib/AltosIMU.java2
-rw-r--r--altoslib/AltosLib.java11
-rw-r--r--altoslib/AltosMag.java2
-rw-r--r--altoslib/AltosMs5607.java2
-rw-r--r--altoslib/AltosRecord.java1
-rw-r--r--altoslib/AltosState.java2
-rw-r--r--altoslib/AltosTelemetryReader.java8
-rw-r--r--altoslib/AltosTelemetryRecord.java15
-rw-r--r--altoslib/AltosTelemetryRecordLegacy.java4
-rw-r--r--altosui/Altos.java67
-rw-r--r--altosui/AltosSerial.java3
-rw-r--r--altosui/Makefile.am3
14 files changed, 39 insertions, 99 deletions
diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 4ad4e58a..fa6a72b5 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -104,7 +104,7 @@ public class AltosConfigData implements Iterable<String> {
for (int i = 0; i < parts.length; i++) {
try {
- r[i] = Altos.fromdec(parts[i]);
+ r[i] = AltosLib.fromdec(parts[i]);
} catch (NumberFormatException n) {
r[i] = 0;
}
diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java
index f1397c7b..a923d63b 100644
--- a/altoslib/AltosEepromIterable.java
+++ b/altoslib/AltosEepromIterable.java
@@ -318,28 +318,28 @@ public class AltosEepromIterable extends AltosRecordIterable {
case AltosLib.AO_LOG_SOFTWARE_VERSION:
out.printf ("# Software version: %s\n", record.data);
break;
- case Altos.AO_LOG_BARO_RESERVED:
+ case AltosLib.AO_LOG_BARO_RESERVED:
out.printf ("# Baro reserved: %d\n", record.a);
break;
- case Altos.AO_LOG_BARO_SENS:
+ case AltosLib.AO_LOG_BARO_SENS:
out.printf ("# Baro sens: %d\n", record.a);
break;
- case Altos.AO_LOG_BARO_OFF:
+ case AltosLib.AO_LOG_BARO_OFF:
out.printf ("# Baro off: %d\n", record.a);
break;
- case Altos.AO_LOG_BARO_TCS:
+ case AltosLib.AO_LOG_BARO_TCS:
out.printf ("# Baro tcs: %d\n", record.a);
break;
- case Altos.AO_LOG_BARO_TCO:
+ case AltosLib.AO_LOG_BARO_TCO:
out.printf ("# Baro tco: %d\n", record.a);
break;
- case Altos.AO_LOG_BARO_TREF:
+ case AltosLib.AO_LOG_BARO_TREF:
out.printf ("# Baro tref: %d\n", record.a);
break;
- case Altos.AO_LOG_BARO_TEMPSENS:
+ case AltosLib.AO_LOG_BARO_TEMPSENS:
out.printf ("# Baro tempsens: %d\n", record.a);
break;
- case Altos.AO_LOG_BARO_CRC:
+ case AltosLib.AO_LOG_BARO_CRC:
out.printf ("# Baro crc: %d\n", record.a);
break;
}
diff --git a/altoslib/AltosIMU.java b/altoslib/AltosIMU.java
index 88e36544..c0eaf139 100644
--- a/altoslib/AltosIMU.java
+++ b/altoslib/AltosIMU.java
@@ -15,7 +15,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package altoslib;
+package org.altusmetrum.AltosLib;
public class AltosIMU {
public int accel_x;
diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 2921d040..27d72079 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -50,6 +50,17 @@ public class AltosLib {
public static final int AO_LOG_PRODUCT = 2001;
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 */
+ 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_TCS = 3004;
+ public static final int AO_LOG_BARO_TCO = 3005;
+ public static final int AO_LOG_BARO_TREF = 3006;
+ public static final int AO_LOG_BARO_TEMPSENS = 3007;
+ public static final int AO_LOG_BARO_CRC = 3008;
+
public static final int AO_LOG_SOFTWARE_VERSION = 9999;
/* Added to flag invalid records */
diff --git a/altoslib/AltosMag.java b/altoslib/AltosMag.java
index 45f1924c..0f8399ab 100644
--- a/altoslib/AltosMag.java
+++ b/altoslib/AltosMag.java
@@ -15,7 +15,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package altoslib;
+package org.altusmetrum.AltosLib;
public class AltosMag {
public int x;
diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 253e2f9b..a7b902e2 100644
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,7 +15,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package altoslib;
+package org.altusmetrum.AltosLib;
public class AltosMs5607 {
public int reserved;
diff --git a/altoslib/AltosRecord.java b/altoslib/AltosRecord.java
index e4915af0..10ef3061 100644
--- a/altoslib/AltosRecord.java
+++ b/altoslib/AltosRecord.java
@@ -82,7 +82,6 @@ public class AltosRecord implements Comparable <AltosRecord> {
public AltosRecordCompanion companion;
->>>>>>> 5a249bc... altosui: Complete split out of separate java library
/*
* Values for our MP3H6115A pressure sensor
*
diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 0645e448..68c7611f 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -70,6 +70,8 @@ public class AltosState {
public double gps_height;
+ public double pad_lat, pad_lon, pad_alt;
+
public int speak_tick;
public double speak_altitude;
diff --git a/altoslib/AltosTelemetryReader.java b/altoslib/AltosTelemetryReader.java
index 67ac1b65..112e008e 100644
--- a/altoslib/AltosTelemetryReader.java
+++ b/altoslib/AltosTelemetryReader.java
@@ -59,19 +59,19 @@ public class AltosTelemetryReader extends AltosFlightReader {
try {
/* Version 1.0 or later firmware supports all telemetry formats */
- if (serial.config_data().compare_version("1.0") >= 0)
+ if (link.config_data().compare_version("1.0") >= 0)
return true;
/* Version 0.9 firmware only supports 0.9 telemetry */
- if (serial.config_data().compare_version("0.9") >= 0) {
- if (telemetry == Altos.ao_telemetry_0_9)
+ if (link.config_data().compare_version("0.9") >= 0) {
+ if (telemetry == AltosLib.ao_telemetry_0_9)
return true;
else
return false;
}
/* Version 0.8 firmware only supports 0.8 telemetry */
- if (telemetry == Altos.ao_telemetry_0_8)
+ if (telemetry == AltosLib.ao_telemetry_0_8)
return true;
else
return false;
diff --git a/altoslib/AltosTelemetryRecord.java b/altoslib/AltosTelemetryRecord.java
index 367c148d..4292dae8 100644
--- a/altoslib/AltosTelemetryRecord.java
+++ b/altoslib/AltosTelemetryRecord.java
@@ -16,6 +16,7 @@
*/
package org.altusmetrum.AltosLib;
+import java.text.*;
public abstract class AltosTelemetryRecord {
@@ -47,7 +48,7 @@ public abstract class AltosTelemetryRecord {
int[] bytes;
try {
- bytes = Altos.hexbytes(hex);
+ bytes = AltosLib.hexbytes(hex);
} catch (NumberFormatException ne) {
throw new ParseException(ne.getMessage(), 0);
}
@@ -60,16 +61,16 @@ public abstract class AltosTelemetryRecord {
if (!cksum(bytes))
throw new ParseException(String.format("invalid line \"%s\"", hex), 0);
- int rssi = Altos.int8(bytes, bytes.length - 3) / 2 - 74;
- int status = Altos.uint8(bytes, bytes.length - 2);
+ int rssi = AltosLib.int8(bytes, bytes.length - 3) / 2 - 74;
+ int status = AltosLib.uint8(bytes, bytes.length - 2);
if ((status & PKT_APPEND_STATUS_1_CRC_OK) == 0)
throw new AltosCRCException(rssi);
/* length, data ..., rssi, status, checksum -- 4 bytes extra */
switch (bytes.length) {
- case Altos.ao_telemetry_standard_len + 4:
- int type = Altos.uint8(bytes, 4 + 1);
+ case AltosLib.ao_telemetry_standard_len + 4:
+ int type = AltosLib.uint8(bytes, 4 + 1);
switch (type) {
case packet_type_TM_sensor:
case packet_type_Tm_sensor:
@@ -93,10 +94,10 @@ public abstract class AltosTelemetryRecord {
break;
}
break;
- case Altos.ao_telemetry_0_9_len + 4:
+ case AltosLib.ao_telemetry_0_9_len + 4:
r = new AltosTelemetryRecordLegacy(bytes, rssi, status);
break;
- case Altos.ao_telemetry_0_8_len + 4:
+ case AltosLib.ao_telemetry_0_8_len + 4:
r = new AltosTelemetryRecordLegacy(bytes, rssi, status);
break;
default:
diff --git a/altoslib/AltosTelemetryRecordLegacy.java b/altoslib/AltosTelemetryRecordLegacy.java
index 8e3713cc..85071d9c 100644
--- a/altoslib/AltosTelemetryRecordLegacy.java
+++ b/altoslib/AltosTelemetryRecordLegacy.java
@@ -241,7 +241,7 @@ public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord {
record.serial = map.get_int(AO_TELEM_SERIAL, AltosRecord.MISSING);
record.flight = map.get_int(AO_TELEM_FLIGHT, AltosRecord.MISSING);
record.rssi = map.get_int(AO_TELEM_RSSI, AltosRecord.MISSING);
- record.state = Altos.state(map.get_string(AO_TELEM_STATE, "invalid"));
+ record.state = AltosLib.state(map.get_string(AO_TELEM_STATE, "invalid"));
record.tick = map.get_int(AO_TELEM_TICK, 0);
/* raw sensor values */
@@ -300,7 +300,7 @@ public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord {
record.status = AltosParse.parse_hex(words[i++]);
AltosParse.word(words[i++], "STATE");
- record.state = Altos.state(words[i++]);
+ record.state = AltosLib.state(words[i++]);
record.tick = AltosParse.parse_int(words[i++]);
diff --git a/altosui/Altos.java b/altosui/Altos.java
index 380796cc..334ddb07 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -28,73 +28,6 @@ import org.altusmetrum.AltosLib.*;
public class Altos extends AltosLib {
- /* Added for header fields in eeprom files */
- static final int AO_LOG_CONFIG_VERSION = 1000;
- static final int AO_LOG_MAIN_DEPLOY = 1001;
- static final int AO_LOG_APOGEE_DELAY = 1002;
- static final int AO_LOG_RADIO_CHANNEL = 1003;
- static final int AO_LOG_CALLSIGN = 1004;
- static final int AO_LOG_ACCEL_CAL = 1005;
- static final int AO_LOG_RADIO_CAL = 1006;
- static final int AO_LOG_MAX_FLIGHT_LOG = 1007;
- static final int AO_LOG_MANUFACTURER = 2000;
- 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 */
- static final int AO_LOG_INVALID = -1;
-
- /* Flight state numbers and names */
- static final int ao_flight_startup = 0;
- static final int ao_flight_idle = 1;
- static final int ao_flight_pad = 2;
- static final int ao_flight_boost = 3;
- static final int ao_flight_fast = 4;
- static final int ao_flight_coast = 5;
- static final int ao_flight_drogue = 6;
- static final int ao_flight_main = 7;
- static final int ao_flight_landed = 8;
- static final int ao_flight_invalid = 9;
-
- /* Telemetry modes */
- static final int ao_telemetry_off = 0;
- static final int ao_telemetry_min = 1;
- static final int ao_telemetry_standard = 1;
- static final int ao_telemetry_0_9 = 2;
- static final int ao_telemetry_0_8 = 3;
- static final int ao_telemetry_max = 3;
-
- static final String[] ao_telemetry_name = {
- "Off", "Standard Telemetry", "TeleMetrum v0.9", "TeleMetrum v0.8"
- };
-
- static final String launch_sites_url = "http://www.altusmetrum.org/AltOS/launch-sites.txt";
-
- static final int ao_telemetry_standard_len = 32;
- static final int ao_telemetry_0_9_len = 95;
- static final int ao_telemetry_0_8_len = 94;
-
- static final int[] ao_telemetry_len = {
- 0, 32, 95, 94
- };
-
- static HashMap<String,Integer> string_to_state = new HashMap<String,Integer>();
-
- static boolean map_initialized = false;
-
static final int tab_elt_pad = 5;
static Font label_font;
diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 54cdcba7..3abdb645 100644
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -264,7 +264,6 @@ public class AltosSerial extends AltosLink implements Runnable {
flush_output();
}
-<<<<<<< HEAD
private int telemetry_len() {
return Altos.telemetry_len(telemetry);
}
@@ -386,8 +385,6 @@ public class AltosSerial extends AltosLink implements Runnable {
remote = false;
}
-=======
->>>>>>> bc5e669... altosui: Pull most of AltosSerial into AltosLink
public void set_frame(Frame in_frame) {
frame = in_frame;
}
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 0a6ae59e..9fc7b5b3 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -27,8 +27,6 @@ altosui_JAVA = \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigTDUI.java \
- AltosConvert.java \
- AltosCRCException.java \
AltosCSV.java \
AltosCSVUI.java \
AltosDebug.java \
@@ -42,7 +40,6 @@ altosui_JAVA = \
AltosEepromList.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
- AltosEepromTeleScience.java \
AltosEepromMega.java \
AltosEepromMegaIterable.java \
AltosEepromSelect.java \
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-04 11:06:41 +0000