From 39c69206f7ddc4d0093c1591a0ee6ca6d4089ad2 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 2 Jan 2012 16:09:29 -0800 Subject: [PATCH] altosui: Split out lots of the altosui code to a shared library To be shared with the Android application eventually Signed-off-by: Keith Packard --- altosui/Altos.java | 326 +----------------- altosui/altoslib/Makefile.am | 56 +++ .../AltosLib}/AltosCRCException.java | 0 .../altusmetrum/AltosLib}/AltosConvert.java | 0 .../AltosLib}/AltosFontListener.java | 0 .../altusmetrum/AltosLib}/AltosFrequency.java | 0 .../org/altusmetrum/AltosLib}/AltosGPS.java | 0 .../altusmetrum/AltosLib}/AltosGPSSat.java | 0 .../org/altusmetrum/AltosLib}/AltosLine.java | 0 .../org/altusmetrum/AltosLib}/AltosParse.java | 0 .../altusmetrum/AltosLib}/AltosRecord.java | 0 .../AltosLib}/AltosRecordCompanion.java | 0 .../AltosLib}/AltosRecordIterable.java | 0 .../altusmetrum/AltosLib}/AltosTelemetry.java | 0 .../AltosLib}/AltosTelemetryIterable.java | 0 .../AltosLib}/AltosTelemetryMap.java | 0 .../AltosLib}/AltosTelemetryReader.java | 0 .../AltosLib}/AltosTelemetryRecord.java | 0 .../AltosTelemetryRecordCompanion.java | 0 .../AltosTelemetryRecordConfiguration.java | 0 .../AltosTelemetryRecordGeneral.java | 0 .../AltosLib}/AltosTelemetryRecordLegacy.java | 0 .../AltosTelemetryRecordLocation.java | 0 .../AltosLib}/AltosTelemetryRecordRaw.java | 0 .../AltosTelemetryRecordSatellite.java | 0 .../AltosLib}/AltosTelemetryRecordSensor.java | 0 configure.ac | 1 + 27 files changed, 59 insertions(+), 324 deletions(-) create mode 100644 altosui/altoslib/Makefile.am rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosCRCException.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosConvert.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosFontListener.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosFrequency.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosGPS.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosGPSSat.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosLine.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosParse.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosRecord.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosRecordCompanion.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosRecordIterable.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetry.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryIterable.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryMap.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryReader.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecord.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecordCompanion.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecordConfiguration.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecordGeneral.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecordLegacy.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecordLocation.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecordRaw.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecordSatellite.java (100%) rename altosui/{ => altoslib/src/org/altusmetrum/AltosLib}/AltosTelemetryRecordSensor.java (100%) diff --git a/altosui/Altos.java b/altosui/Altos.java index aa2fd77a..fba2222b 100644 --- a/altosui/Altos.java +++ b/altosui/Altos.java @@ -24,78 +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.*; - /* 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; - 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_to_state = new HashMap(); - - static boolean map_initialized = false; - - static final int tab_elt_pad = 5; +public class Altos extends AltosLib { static Font label_font; static Font value_font; @@ -139,259 +70,6 @@ public class Altos { static final int text_width = 20; - static void initialize_map() - { - string_to_state.put("startup", ao_flight_startup); - string_to_state.put("idle", ao_flight_idle); - string_to_state.put("pad", ao_flight_pad); - string_to_state.put("boost", ao_flight_boost); - string_to_state.put("fast", ao_flight_fast); - string_to_state.put("coast", ao_flight_coast); - string_to_state.put("drogue", ao_flight_drogue); - string_to_state.put("apogee", ao_flight_coast); - string_to_state.put("main", ao_flight_main); - string_to_state.put("landed", ao_flight_landed); - string_to_state.put("invalid", ao_flight_invalid); - map_initialized = true; - } - - static int telemetry_len(int telemetry) { - if (telemetry <= ao_telemetry_max) - return ao_telemetry_len[telemetry]; - throw new IllegalArgumentException(String.format("Invalid telemetry %d", - telemetry)); - } - - static String telemetry_name(int telemetry) { - if (telemetry <= ao_telemetry_max) - return ao_telemetry_name[telemetry]; - throw new IllegalArgumentException(String.format("Invalid telemetry %d", - telemetry)); - } - - static String[] state_to_string = { - "startup", - "idle", - "pad", - "boost", - "fast", - "coast", - "drogue", - "main", - "landed", - "invalid", - }; - - static String[] state_to_string_capital = { - "Startup", - "Idle", - "Pad", - "Boost", - "Fast", - "Coast", - "Drogue", - "Main", - "Landed", - "Invalid", - }; - - static public int state(String state) { - if (!map_initialized) - initialize_map(); - if (string_to_state.containsKey(state)) - return string_to_state.get(state); - return ao_flight_invalid; - } - - static public String state_name(int state) { - if (state < 0 || state_to_string.length <= state) - return "invalid"; - return state_to_string[state]; - } - - static final int AO_GPS_VALID = (1 << 4); - static final int AO_GPS_RUNNING = (1 << 5); - static final int AO_GPS_DATE_VALID = (1 << 6); - static final int AO_GPS_NUM_SAT_SHIFT = 0; - static final int AO_GPS_NUM_SAT_MASK = 0xf; - - static final int AO_LOG_FORMAT_UNKNOWN = 0; - static final int AO_LOG_FORMAT_FULL = 1; - 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_NONE = 127; - - static boolean isspace(int c) { - switch (c) { - case ' ': - case '\t': - return true; - } - return false; - } - - static boolean ishex(int c) { - if ('0' <= c && c <= '9') - return true; - if ('a' <= c && c <= 'f') - return true; - if ('A' <= c && c <= 'F') - return true; - return false; - } - - static boolean ishex(String s) { - for (int i = 0; i < s.length(); i++) - if (!ishex(s.charAt(i))) - return false; - return true; - } - - static int fromhex(int c) { - if ('0' <= c && c <= '9') - return c - '0'; - if ('a' <= c && c <= 'f') - return c - 'a' + 10; - if ('A' <= c && c <= 'F') - return c - 'A' + 10; - return -1; - } - - static int fromhex(String s) throws NumberFormatException { - int c, v = 0; - for (int i = 0; i < s.length(); i++) { - c = s.charAt(i); - if (!ishex(c)) { - if (i == 0) - throw new NumberFormatException(String.format("invalid hex \"%s\"", s)); - return v; - } - v = v * 16 + fromhex(c); - } - return v; - } - - static boolean isdec(int c) { - if ('0' <= c && c <= '9') - return true; - return false; - } - - static boolean isdec(String s) { - for (int i = 0; i < s.length(); i++) - if (!isdec(s.charAt(i))) - return false; - return true; - } - - static int fromdec(int c) { - if ('0' <= c && c <= '9') - return c - '0'; - return -1; - } - - static int int8(int[] bytes, int i) { - return (int) (byte) bytes[i]; - } - - static int uint8(int[] bytes, int i) { - return bytes[i]; - } - - static int int16(int[] bytes, int i) { - return (int) (short) (bytes[i] + (bytes[i+1] << 8)); - } - - static int uint16(int[] bytes, int i) { - return bytes[i] + (bytes[i+1] << 8); - } - - static int uint32(int[] bytes, int i) { - return bytes[i] + - (bytes[i+1] << 8) + - (bytes[i+2] << 16) + - (bytes[i+3] << 24); - } - - static final Charset unicode_set = Charset.forName("UTF-8"); - - static String string(int[] bytes, int s, int l) { - if (s + l > bytes.length) { - if (s > bytes.length) { - s = bytes.length; - l = 0; - } else { - l = bytes.length - s; - } - } - - int i; - for (i = l - 1; i >= 0; i--) - if (bytes[s+i] != 0) - break; - - l = i + 1; - byte[] b = new byte[l]; - - for (i = 0; i < l; i++) - b[i] = (byte) bytes[s+i]; - String n = new String(b, unicode_set); - return n; - } - - static int hexbyte(String s, int i) { - int c0, c1; - - if (s.length() < i + 2) - throw new NumberFormatException(String.format("invalid hex \"%s\"", s)); - c0 = s.charAt(i); - if (!Altos.ishex(c0)) - throw new NumberFormatException(String.format("invalid hex \"%c\"", c0)); - c1 = s.charAt(i+1); - if (!Altos.ishex(c1)) - throw new NumberFormatException(String.format("invalid hex \"%c\"", c1)); - return Altos.fromhex(c0) * 16 + Altos.fromhex(c1); - } - - static int[] hexbytes(String s) { - int n; - int[] r; - int i; - - if ((s.length() & 1) != 0) - throw new NumberFormatException(String.format("invalid line \"%s\"", s)); - n = s.length() / 2; - r = new int[n]; - for (i = 0; i < n; i++) - r[i] = Altos.hexbyte(s, i * 2); - return r; - } - - static int fromdec(String s) throws NumberFormatException { - int c, v = 0; - int sign = 1; - for (int i = 0; i < s.length(); i++) { - c = s.charAt(i); - if (i == 0 && c == '-') { - sign = -1; - } else if (!isdec(c)) { - if (i == 0) - throw new NumberFormatException(String.format("invalid number \"%s\"", s)); - return v; - } else - v = v * 10 + fromdec(c); - } - return v * sign; - } - - static String replace_extension(String input, String extension) { - int dot = input.lastIndexOf("."); - if (dot > 0) - input = input.substring(0,dot); - return input.concat(extension); - } - static public boolean initialized = false; static public boolean loaded_library = false; diff --git a/altosui/altoslib/Makefile.am b/altosui/altoslib/Makefile.am new file mode 100644 index 00000000..9c655131 --- /dev/null +++ b/altosui/altoslib/Makefile.am @@ -0,0 +1,56 @@ +AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation + +JAVAROOT=bin + +CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:$(FREETTS)/*:/usr/share/java/*" + +SRC=src/org/altusmetrum/AltosLib +BIN=bin/org/altusmetrum/AltosLib + +AltosLibdir = $(datadir)/java + +AltosLib_JAVA = \ + $(SRC)/AltosLib.java \ + $(SRC)/AltosConvert.java \ + $(SRC)/AltosCRCException.java \ + $(SRC)/AltosFrequency.java \ + $(SRC)/AltosGPS.java \ + $(SRC)/AltosGPSSat.java \ + $(SRC)/AltosLine.java \ + $(SRC)/AltosParse.java \ + $(SRC)/AltosRecordCompanion.java \ + $(SRC)/AltosRecordIterable.java \ + $(SRC)/AltosRecord.java \ + $(SRC)/AltosTelemetryIterable.java \ + $(SRC)/AltosTelemetry.java \ + $(SRC)/AltosTelemetryMap.java \ + $(SRC)/AltosTelemetryRecordCompanion.java \ + $(SRC)/AltosTelemetryRecordConfiguration.java \ + $(SRC)/AltosTelemetryRecordGeneral.java \ + $(SRC)/AltosTelemetryRecord.java \ + $(SRC)/AltosTelemetryRecordLegacy.java \ + $(SRC)/AltosTelemetryRecordLocation.java \ + $(SRC)/AltosTelemetryRecordRaw.java \ + $(SRC)/AltosTelemetryRecordSatellite.java \ + $(SRC)/AltosTelemetryRecordSensor.java + +JAR=AltosLib.jar + +all-local: $(JAR) + +clean-local: + -rm -rf bin $(JAR) + +altosuidir=$(datadir)/java + +install-altosuiJAVA: $(JAR) + @$(NORMAL_INSTALL) + test -z "$(altosuidir)" || $(MKDIR_P) "$(DESTDIR)$(altosuidir)" + echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuidir)/$(JAR)"; \ + $(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuidir)" + +bin: + mkdir -p bin + +$(JAR): classAltosLib.stamp + jar cf $@ -C bin org diff --git a/altosui/AltosCRCException.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java similarity index 100% rename from altosui/AltosCRCException.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosCRCException.java diff --git a/altosui/AltosConvert.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java similarity index 100% rename from altosui/AltosConvert.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosConvert.java diff --git a/altosui/AltosFontListener.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFontListener.java similarity index 100% rename from altosui/AltosFontListener.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFontListener.java diff --git a/altosui/AltosFrequency.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java similarity index 100% rename from altosui/AltosFrequency.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosFrequency.java diff --git a/altosui/AltosGPS.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java similarity index 100% rename from altosui/AltosGPS.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPS.java diff --git a/altosui/AltosGPSSat.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java similarity index 100% rename from altosui/AltosGPSSat.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosGPSSat.java diff --git a/altosui/AltosLine.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java similarity index 100% rename from altosui/AltosLine.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosLine.java diff --git a/altosui/AltosParse.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java similarity index 100% rename from altosui/AltosParse.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosParse.java diff --git a/altosui/AltosRecord.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java similarity index 100% rename from altosui/AltosRecord.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecord.java diff --git a/altosui/AltosRecordCompanion.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java similarity index 100% rename from altosui/AltosRecordCompanion.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordCompanion.java diff --git a/altosui/AltosRecordIterable.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java similarity index 100% rename from altosui/AltosRecordIterable.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosRecordIterable.java diff --git a/altosui/AltosTelemetry.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java similarity index 100% rename from altosui/AltosTelemetry.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetry.java diff --git a/altosui/AltosTelemetryIterable.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java similarity index 100% rename from altosui/AltosTelemetryIterable.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryIterable.java diff --git a/altosui/AltosTelemetryMap.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java similarity index 100% rename from altosui/AltosTelemetryMap.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryMap.java diff --git a/altosui/AltosTelemetryReader.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java similarity index 100% rename from altosui/AltosTelemetryReader.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryReader.java diff --git a/altosui/AltosTelemetryRecord.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java similarity index 100% rename from altosui/AltosTelemetryRecord.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecord.java diff --git a/altosui/AltosTelemetryRecordCompanion.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java similarity index 100% rename from altosui/AltosTelemetryRecordCompanion.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordCompanion.java diff --git a/altosui/AltosTelemetryRecordConfiguration.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java similarity index 100% rename from altosui/AltosTelemetryRecordConfiguration.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordConfiguration.java diff --git a/altosui/AltosTelemetryRecordGeneral.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java similarity index 100% rename from altosui/AltosTelemetryRecordGeneral.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordGeneral.java diff --git a/altosui/AltosTelemetryRecordLegacy.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java similarity index 100% rename from altosui/AltosTelemetryRecordLegacy.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java diff --git a/altosui/AltosTelemetryRecordLocation.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java similarity index 100% rename from altosui/AltosTelemetryRecordLocation.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLocation.java diff --git a/altosui/AltosTelemetryRecordRaw.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java similarity index 100% rename from altosui/AltosTelemetryRecordRaw.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordRaw.java diff --git a/altosui/AltosTelemetryRecordSatellite.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java similarity index 100% rename from altosui/AltosTelemetryRecordSatellite.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSatellite.java diff --git a/altosui/AltosTelemetryRecordSensor.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java similarity index 100% rename from altosui/AltosTelemetryRecordSensor.java rename to altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordSensor.java diff --git a/configure.ac b/configure.ac index 19db6d27..6446f651 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,7 @@ AC_OUTPUT([ Makefile altosui/Makefile altosui/AltosVersion.java +altosui/altoslib/Makefile altosui/libaltos/Makefile ao-tools/Makefile ao-tools/lib/Makefile -- 2.47.2