From 99b7eaf8d1b312443b842d078fb8464032b3a39b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 17 Jul 2012 20:42:42 -0700 Subject: [PATCH] altoslib: Fix MM conversion functions Pressure is already reported in Pa, no need to convert that. Voltage divider computations were backwards. Signed-off-by: Keith Packard --- altoslib/AltosRecordMM.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java index 055cf85f..5f952f7a 100644 --- a/altoslib/AltosRecordMM.java +++ b/altoslib/AltosRecordMM.java @@ -47,7 +47,7 @@ public class AltosRecordMM extends AltosRecord { public double raw_pressure() { if (pres != MISSING) - return pres / 100.0; + return pres; return MISSING; } @@ -57,19 +57,19 @@ public class AltosRecordMM extends AltosRecord { public double ground_pressure() { if (ground_pres != MISSING) - return ground_pres / 100.0; + return ground_pres; return MISSING; } public double battery_voltage() { if (v_batt != MISSING) - return 3.3 * adc(v_batt) * 27.0 / (15.0 + 27.0); + return 3.3 * adc(v_batt) * (15.0 + 27.0) / 27.0; return MISSING; } static double pyro(int raw) { if (raw != MISSING) - return 3.3 * adc(raw) * 27.0 / (100.0 + 27.0); + return 3.3 * adc(raw) * (100.0 + 27.0) / 27.0; return MISSING; } -- 2.30.2