altoslib: Ignore invalid accel cal values

When both are the same, something is wrong.

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

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index 54b75817bb7196b2fc8b82cd88c5ca4d5ea0bcd1..408d8d7e5f78738e7298fda27c06543f9cdef4a1 100644 (file)
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -98,6 +98,8 @@ public class AltosCalData {
 
        public void set_accel_plus_minus(double plus, double minus) {
                if (plus != AltosLib.MISSING && minus != AltosLib.MISSING) {
+                       if (plus == minus)
+                               return;
                        accel_plus_g = plus;
                        accel_minus_g = minus;
                }

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 5b3ff39187d3a8452e149287361aaa7eb83d7ac4..a252abdf754345ef278ae8f5b606b7d8f8fe7ab4 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -403,6 +403,10 @@ public class AltosConvert {
 
                double counts_per_g = (plus_g - minus_g) / 2.0;
                double counts_per_mss = counts_per_g / gravity;
+
+               if (counts_per_mss == 0)
+                       return AltosLib.MISSING;
+
                return (sensor - ground) / counts_per_mss;
        }