From: Keith Packard <keithp@keithp.com>
Date: Sun, 10 Dec 2017 00:57:35 +0000 (-0800)
Subject: altoslib: Fix 8 to 12 bit conversion for Mega pyro voltage data
X-Git-Tag: 1.8.3~1^2~21^2~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=111622dbcd56c225a9d5ace9f0ef745e62f8a94c

altoslib: Fix 8 to 12 bit conversion for Mega pyro voltage data

The conversion was losing the replicated top four bits by shifting by
the wrong amount.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

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); }