summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--altoslib/AltosCalData.java2
-rw-r--r--altoslib/AltosConvert.java4
2 files changed, 6 insertions, 0 deletions
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;
}