projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Compute orientation from eeprom data files
[fw/altos]
/
altoslib
/
AltosEepromRecordMega.java
diff --git
a/altoslib/AltosEepromRecordMega.java
b/altoslib/AltosEepromRecordMega.java
index 0abc3fe73865c64bae21ec23d5f39c0f0fee47e7..18d435afd7f582c73658c1f7cb2619dcc239188a 100644
(file)
--- a/
altoslib/AltosEepromRecordMega.java
+++ b/
altoslib/AltosEepromRecordMega.java
@@
-161,11
+161,13
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
cal_data.mag_through(mag_through));
cal_data.mag_through(mag_through));
+ final double lsb_per_g = 1920.0/105.5;
+
double acceleration = AltosConvert.acceleration_from_sensor(
accel(),
double acceleration = AltosConvert.acceleration_from_sensor(
accel(),
- c
onfig_data.accel_cal_plus
,
- c
onfig_data.accel_cal_minus
,
-
AltosLib.MISSING
);
+ c
al_data.ground_accel
,
+ c
al_data.ground_accel + 2 * lsb_per_g
,
+
cal_data.ground_accel
);
listener.set_acceleration(acceleration);
break;
listener.set_acceleration(acceleration);
break;