diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-12-11 10:16:24 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-12-11 10:16:24 -0700 |
| commit | d1d98e408311c5ba18138a18f4c88448e4254626 (patch) | |
| tree | ccf9c77fdf355f51911cc77b0dcf5a241d39f77e /altoslib/AltosTelemetryMegaData.java | |
| parent | 2f8fce1cf6ce4bd12a836cc8ee15f4edbc95c95e (diff) | |
| parent | abb856cd66e00d739e4efb1930b5c168eaf48029 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altoslib/AltosTelemetryMegaData.java')
| -rw-r--r-- | altoslib/AltosTelemetryMegaData.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java index 7ef9c637..f5961c8c 100644 --- a/altoslib/AltosTelemetryMegaData.java +++ b/altoslib/AltosTelemetryMegaData.java @@ -24,7 +24,9 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard { 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); } |