projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/cc1111: Use SW to drive UART RTS pin
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index a120e0c7e1965b1caa14a8b289997d3aa69ddb48..7b41e98dcbe50daea61776a6cc8265ea1545edab 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-19,7
+19,7
@@
* Track flight state from telemetry or eeprom data stream
*/
* Track flight state from telemetry or eeprom data stream
*/
-package org.altusmetrum.altoslib_
7
;
+package org.altusmetrum.altoslib_
10
;
import java.io.*;
import java.io.*;
@@
-31,8
+31,9
@@
public class AltosState implements Cloneable, Serializable {
public int set;
public int set;
+ static final double filter_len = 2.0;
static final double ascent_filter_len = 0.5;
static final double ascent_filter_len = 0.5;
- static final double descent_filter_len =
0.5
;
+ static final double descent_filter_len =
5.0
;
/* derived data */
/* derived data */
@@
-64,8
+65,10
@@
public class AltosState implements Cloneable, Serializable {
}
void set_filtered(double new_value, double time) {
}
void set_filtered(double new_value, double time) {
- if (prev_value != AltosLib.MISSING)
- new_value = (prev_value * 15.0 + new_value) / 16.0;
+ if (prev_value != AltosLib.MISSING) {
+ double f = 1/Math.exp((time - prev_set_time) / filter_len);
+ new_value = f * new_value + (1-f) * prev_value;
+ }
set(new_value, time);
}
set(new_value, time);
}
@@
-281,7
+284,7
@@
public class AltosState implements Cloneable, Serializable {
}
}
}
}
- p
ublic int
state;
+ p
rivate int
state;
public int flight;
public int serial;
public int altitude_32;
public int flight;
public int serial;
public int altitude_32;
@@
-1053,6
+1056,10
@@
public class AltosState implements Cloneable, Serializable {
}
}
}
}
+ public int state() {
+ return state;
+ }
+
public void set_device_type(int device_type) {
this.device_type = device_type;
switch (device_type) {
public void set_device_type(int device_type) {
this.device_type = device_type;
switch (device_type) {
@@
-1355,11
+1362,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;
}
public void set_companion(AltosCompanion companion) {
this.companion = companion;
}