projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Report raw baro height instead of kalman filtered value
[fw/altos]
/
altoslib
/
AltosReplayReader.java
diff --git
a/altoslib/AltosReplayReader.java
b/altoslib/AltosReplayReader.java
index 3847cab7cb49849bbc382734a04baa1f77edb670..ec682bd4757ea949c9dd402f9e5601e333a0568f 100644
(file)
--- a/
altoslib/AltosReplayReader.java
+++ b/
altoslib/AltosReplayReader.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
2
;
+package org.altusmetrum.altoslib_1
3
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-31,7
+31,7
@@
class AltosReplay extends AltosDataListener implements Runnable {
AltosState state;
AltosRecordSet record_set;
double last_time = AltosLib.MISSING;
AltosState state;
AltosRecordSet record_set;
double last_time = AltosLib.MISSING;
- Semaphore semaphore = new Semaphore(1);
;
+ Semaphore semaphore = new Semaphore(1);
boolean done = false;
public void set_time(double time) {
boolean done = false;
public void set_time(double time) {
@@
-70,7
+70,10
@@
class AltosReplay extends AltosDataListener implements Runnable {
public void set_apogee_voltage(double volts) { state.set_apogee_voltage(volts); }
public void set_main_voltage(double volts) { state.set_main_voltage(volts); }
public void set_apogee_voltage(double volts) { state.set_apogee_voltage(volts); }
public void set_main_voltage(double volts) { state.set_main_voltage(volts); }
- public void set_gps(AltosGPS gps) { state.set_gps(gps); }
+ public void set_gps(AltosGPS gps, boolean set_location, boolean set_sats) {
+ super.set_gps(gps, set_location, set_sats);
+ state.set_gps(gps, set_location, set_sats);
+ }
public void set_orient(double orient) { state.set_orient(orient); }
public void set_gyro(double roll, double pitch, double yaw) { state.set_gyro(roll, pitch, yaw); }
public void set_orient(double orient) { state.set_orient(orient); }
public void set_gyro(double roll, double pitch, double yaw) { state.set_gyro(roll, pitch, yaw); }
@@
-108,7
+111,7
@@
public class AltosReplayReader extends AltosFlightReader {
int reads;
public AltosCalData cal_data() {
int reads;
public AltosCalData cal_data() {
- return replay.state.cal_data;
+ return replay.state.cal_data
()
;
}
public AltosState read() {
}
public AltosState read() {