summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-05-19 20:40:42 -0700
committerKeith Packard <keithp@keithp.com>2013-05-19 20:40:42 -0700
commit27e9b93f3d35890a49575b2ead1983ce3c2fc213 (patch)
tree199d688e26d12a64ccc6606a58ecc7aed2dde3b7
parenta4df2575b4e782e83cc4e9b1d2e5cd2397a97dd8 (diff)
parentd9cbef8cd364aae54855cc5bc64fb8c2b22057b0 (diff)
Merge branch 'master' into lpc
-rw-r--r--altoslib/AltosRecordMM.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java
index bf64192c..d697111c 100644
--- a/altoslib/AltosRecordMM.java
+++ b/altoslib/AltosRecordMM.java
@@ -71,11 +71,11 @@ public class AltosRecordMM extends AltosRecord {
}
public double main_voltage() {
- return pyro(sense[1]);
+ return pyro(sense[5]);
}
public double drogue_voltage() {
- return pyro(sense[0]);
+ return pyro(sense[4]);
}
public double temperature() {