From 355bb4669da05d202054b8265695e9878fd612c2 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 28 May 2017 15:21:53 -0700 Subject: [PATCH] altoslib: Ignore invalid accel cal values When both are the same, something is wrong. Signed-off-by: Keith Packard --- altoslib/AltosCalData.java | 2 ++ altoslib/AltosConvert.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java index 54b75817..408d8d7e 100644 --- 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 5b3ff391..a252abdf 100644 --- 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; } -- 2.30.2