altos/lisp: Fix uninitialized values in ao_lisp_make_const

[fw/altos] / altoslib / AltosTelemetry.java

diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 2f15cd896effa8be6ec36b1c809927da97ff168c..0caefcd678a165e714b7e9cb3f53ce8f80578389 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_5;
+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);
@@ -118,8 +119,6 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
                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 {
@@ -135,10 +134,6 @@ public abstract class AltosTelemetry implements AltosStateUpdate {
                                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;
        }