move a file back

[fw/altos] / altosui / altoslib / src / org / altusmetrum / AltosLib / AltosTelemetryRecordLegacy.java

diff --git a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
index f2f633581922944a89a84fa8405f993ab6822d35..2dac5ca45e2616171bc79cfba6fa041bc6093d5c 100644 (file)
--- a/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
+++ b/altosui/altoslib/src/org/altusmetrum/AltosLib/AltosTelemetryRecordLegacy.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package org.altusmetrum.AltosLib;
 
 import java.lang.*;
 import java.text.*;
@@ -239,7 +239,7 @@ public class AltosTelemetryRecordLegacy extends AltosRecord implements AltosTele
                serial = map.get_int(AO_TELEM_SERIAL, MISSING);
                flight = map.get_int(AO_TELEM_FLIGHT, MISSING);
                rssi = map.get_int(AO_TELEM_RSSI, MISSING);
-               state = Altos.state(map.get_string(AO_TELEM_STATE, "invalid"));
+               state = AltosLib.state(map.get_string(AO_TELEM_STATE, "invalid"));
                tick = map.get_int(AO_TELEM_TICK, 0);
 
                /* raw sensor values */
@@ -298,7 +298,7 @@ public class AltosTelemetryRecordLegacy extends AltosRecord implements AltosTele
                status = AltosParse.parse_hex(words[i++]);
 
                AltosParse.word(words[i++], "STATE");
-               state = Altos.state(words[i++]);
+               state = AltosLib.state(words[i++]);
 
                tick = AltosParse.parse_int(words[i++]);
 
@@ -391,22 +391,22 @@ public class AltosTelemetryRecordLegacy extends AltosRecord implements AltosTele
        int     adjust;
 
        private int int8(int i) {
-               return Altos.int8(bytes, i + 1 + adjust);
+               return AltosLib.int8(bytes, i + 1 + adjust);
        }
        private int uint8(int i) {
-               return Altos.uint8(bytes, i + 1 + adjust);
+               return AltosLib.uint8(bytes, i + 1 + adjust);
        }
        private int int16(int i) {
-               return Altos.int16(bytes, i + 1 + adjust);
+               return AltosLib.int16(bytes, i + 1 + adjust);
        }
        private int uint16(int i) {
-               return Altos.uint16(bytes, i + 1 + adjust);
+               return AltosLib.uint16(bytes, i + 1 + adjust);
        }
        private int uint32(int i) {
-               return Altos.uint32(bytes, i + 1 + adjust);
+               return AltosLib.uint32(bytes, i + 1 + adjust);
        }
        private String string(int i, int l) {
-               return Altos.string(bytes, i + 1 + adjust, l);
+               return AltosLib.string(bytes, i + 1 + adjust, l);
        }
 
        static final int AO_GPS_NUM_SAT_MASK    = (0xf << 0);
@@ -422,7 +422,7 @@ public class AltosTelemetryRecordLegacy extends AltosRecord implements AltosTele
                version = 4;
                adjust = 0;
 
-               if (bytes.length == Altos.ao_telemetry_0_8_len + 4) {
+               if (bytes.length == AltosLib.ao_telemetry_0_8_len + 4) {
                        serial = uint8(0);
                        adjust = -1;
                } else