Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosState.java

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index 8eacf97515d74f3f280dd12ed5d37609067c56d6..cf4fb9b030d66ca147be6af432e6304401d2d8a0 100644 (file)
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -19,7 +19,7 @@
  * Track flight state from telemetry or eeprom data stream
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_8;
 
 import java.io.*;
 
@@ -66,7 +66,7 @@ public class AltosState implements Cloneable, Serializable {
 
                void set_filtered(double new_value, double time) {
                        if (prev_value != AltosLib.MISSING) {
-                               double f = 1/Math.exp((time - prev_set_time) / filter_le);
+                               double f = 1/Math.exp((time - prev_set_time) / filter_len);
                                new_value = f * new_value + (1-f) * prev_value;
                        }
                        set(new_value, time);
@@ -1358,11 +1358,6 @@ public class AltosState implements Cloneable, Serializable {
                }
        }
 
-       public void make_companion (int nchannels) {
-               if (companion == null)
-                       companion = new AltosCompanion(nchannels);
-       }
-
        public void set_companion(AltosCompanion companion) {
                this.companion = companion;
        }