projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: BMX160 driver now returns µT values for mag sensor
[fw/altos]
/
altoslib
/
AltosTelemetryMegaData.java
diff --git
a/altoslib/AltosTelemetryMegaData.java
b/altoslib/AltosTelemetryMegaData.java
index 7ef9c63759fd0e00ff70823903837c9e162973f0..1a0bff315f3474109d508bf85995be71574f1dff 100644
(file)
--- a/
altoslib/AltosTelemetryMegaData.java
+++ b/
altoslib/AltosTelemetryMegaData.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
;
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
@@
-24,7
+24,9
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
int v_batt() { return int16(6); }
int v_pyro() { return int16(8); }
int v_batt() { return int16(6); }
int v_pyro() { return int16(8); }
- int sense(int i) { int v = uint8(10+i); return v << 4 | v >> 8; }
+
+ /* pyro sense values are sent in 8 bits, expand to 12 bits */
+ int sense(int i) { int v = uint8(10+i); return (v << 4) | (v >> 4); }
int ground_pres() { return int32(16); }
int ground_accel() { return int16(20); }
int ground_pres() { return int32(16); }
int ground_accel() { return int16(20); }