projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib,altosuilib: Bump library version numbers
[fw/altos]
/
altoslib
/
AltosTelemetryMegaSensor.java
diff --git
a/altoslib/AltosTelemetryMegaSensor.java
b/altoslib/AltosTelemetryMegaSensor.java
index 396bdb16eddfe9aef965d3d6a12b1b23f7446b6f..efcc3ccb6c19ea312814767b657a56b6433449eb 100644
(file)
--- a/
altoslib/AltosTelemetryMegaSensor.java
+++ b/
altoslib/AltosTelemetryMegaSensor.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
1
;
+package org.altusmetrum.altoslib_1
2
;
public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
int orient() { return int8(5); }
public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
int orient() { return int8(5); }
@@
-34,8
+34,8
@@
public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
int gyro_z() { return int16(24); }
int mag_x() { return int16(26); }
int gyro_z() { return int16(24); }
int mag_x() { return int16(26); }
- int mag_
y
() { return int16(28); }
- int mag_
z
() { return int16(30); }
+ int mag_
z
() { return int16(28); }
+ int mag_
y
() { return int16(30); }
public AltosTelemetryMegaSensor(int[] bytes) throws AltosCRCException {
super(bytes);
public AltosTelemetryMegaSensor(int[] bytes) throws AltosCRCException {
super(bytes);
@@
-64,8
+64,8
@@
public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
int gyro_pitch = gyro_x();
int gyro_yaw = gyro_z();
int gyro_pitch = gyro_x();
int gyro_yaw = gyro_z();
- int mag_along = mag_
x
();
- int mag_across = mag_
y
();
+ int mag_along = mag_
y
();
+ int mag_across = mag_
x
();
int mag_through = mag_z();
listener.set_accel(cal_data.accel_along(accel_along),
int mag_through = mag_z();
listener.set_accel(cal_data.accel_along(accel_along),