altoslib: Add Ms5607 constructor that just takes config_data

[fw/altos] / altoslib / AltosTelemetry.java

diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 4c973cd95466519482d88a0d503bc7643589b9f5..f830bf3582a0a452f24facbda8671e45019d642b 100644 (file)
--- a/altoslib/AltosTelemetry.java
+++ b/altoslib/AltosTelemetry.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_8;
+package org.altusmetrum.altoslib_11;
 
 import java.text.*;
 
@@ -44,7 +45,7 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
 
        public void update_state(AltosState state) {
                state.set_serial(serial);
-               if (state.state == AltosLib.ao_flight_invalid)
+               if (state.state() == AltosLib.ao_flight_invalid)
                        state.set_state(AltosLib.ao_flight_startup);
                state.set_tick(tick);
                state.set_rssi(rssi, status);
@@ -66,7 +67,8 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
        final static int packet_type_mega_data = 0x09;
        final static int packet_type_metrum_sensor = 0x0a;
        final static int packet_type_metrum_data = 0x0b;
-       final static int packet_type_mini = 0x10;
+       final static int packet_type_mini2 = 0x10;
+       final static int packet_type_mini3 = 0x11;
 
        static AltosTelemetry parse_hex(String hex)  throws ParseException, AltosCRCException {
                AltosTelemetry  telem = null;