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 <keithp@keithp.com>

diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java
index 055cf85fb6e84a4a0d846a5763b91fe3fc0da882..5f952f7a96a1b8aa02543076de90638f3e8cb860 100644 (file)
--- 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;
        }