projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Expose locale and non-locale floating point parsing functions
[fw/altos]
/
altoslib
/
AltosTelemetry.java
diff --git
a/altoslib/AltosTelemetry.java
b/altoslib/AltosTelemetry.java
index 2f15cd896effa8be6ec36b1c809927da97ff168c..449384d528ef5c8ed66dc7fcce3ec2b78942a28b 100644
(file)
--- a/
altoslib/AltosTelemetry.java
+++ b/
altoslib/AltosTelemetry.java
@@
-15,7
+15,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_
5
;
+package org.altusmetrum.altoslib_
6
;
import java.text.*;
import java.text.*;
@@
-118,8
+118,6
@@
public abstract class AltosTelemetry implements AltosStateUpdate {
double compare_height;
int height = height_16;
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 {
if (state.gps != null && state.gps.alt != AltosLib.MISSING) {
compare_height = state.gps_height();
} else {
@@
-135,10
+133,6
@@
public abstract class AltosTelemetry implements AltosStateUpdate {
height += 65536;
else if (Math.abs(height - 65536 - compare_height) < Math.abs(height - compare_height))
height -= 65536;
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;
}
}
return height;
}