*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
import java.text.*;
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);
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;
double compare_height;
int height = height_16;
- System.out.printf("state kalman height %g altitude %g ground_altitude %g gps_height %g\n",
- state.kalman_height.value(), state.altitude(), state.ground_altitude(), state.gps_height());
if (state.gps != null && state.gps.alt != AltosLib.MISSING) {
compare_height = state.gps_height();
} else {
height += 65536;
else if (Math.abs(height - 65536 - compare_height) < Math.abs(height - compare_height))
height -= 65536;
- if (height != height_16) {
- System.out.printf("Height adjusted from %d to %d with %g\n",
- height_16, height, compare_height);
- }
}
return height;
}