projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: lpc exti setup was incorrectly testing mode
[fw/altos]
/
altoslib
/
AltosEepromMega.java
diff --git
a/altoslib/AltosEepromMega.java
b/altoslib/AltosEepromMega.java
index bccfc62103b947044365b364412ce236aada0ae5..1ac72b1c4f5d65e491de6fc548d2d8238ff330ae 100644
(file)
--- a/
altoslib/AltosEepromMega.java
+++ b/
altoslib/AltosEepromMega.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_
1
;
+package org.altusmetrum.altoslib_
3
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-115,19
+115,19
@@
public class AltosEepromMega extends AltosEeprom {
state.set_ms5607(pres(), temp());
AltosIMU imu = new AltosIMU();
state.set_ms5607(pres(), temp());
AltosIMU imu = new AltosIMU();
- imu.accel_x =
accel_x(
);
- imu.accel_y =
accel_y(
);
- imu.accel_z =
accel_z(
);
+ imu.accel_x =
AltosIMU.convert_accel(accel_x()
);
+ imu.accel_y =
AltosIMU.convert_accel(accel_y()
);
+ imu.accel_z =
AltosIMU.convert_accel(accel_z()
);
- imu.gyro_x =
gyro_x(
);
- imu.gyro_y =
gyro_y(
);
- imu.gyro_z =
gyro_z(
);
+ imu.gyro_x =
AltosIMU.convert_gyro(gyro_x()
);
+ imu.gyro_y =
AltosIMU.convert_gyro(gyro_y()
);
+ imu.gyro_z =
AltosIMU.convert_gyro(gyro_z()
);
state.imu = imu;
AltosMag mag = new AltosMag();
state.imu = imu;
AltosMag mag = new AltosMag();
- mag.x =
mag_x(
);
- mag.y =
mag_y(
);
- mag.z =
mag_z(
);
+ mag.x =
AltosMag.convert_gauss(mag_x()
);
+ mag.y =
AltosMag.convert_gauss(mag_y()
);
+ mag.z =
AltosMag.convert_gauss(mag_z()
);
state.mag = mag;
state.mag = mag;
@@
-167,7
+167,7
@@
public class AltosEepromMega extends AltosEeprom {
gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
AltosLib.AO_GPS_NUM_SAT_SHIFT;
gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
AltosLib.AO_GPS_NUM_SAT_SHIFT;
- gps.year = year();
+ gps.year =
2000 +
year();
gps.month = month();
gps.day = day();
break;
gps.month = month();
gps.day = day();
break;