diff options
author | Bdale Garbee <bdale@gag.com> | 2013-05-21 09:31:48 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2013-05-21 09:31:48 -0600 |
commit | 5a329c7f588334df7443b47c8f478ebadf312f62 (patch) | |
tree | f273c05c7659af0f8c5b7235789958583230d06e /altoslib/AltosRecordMM.java | |
parent | 9b138221283f0b8e8df5a799f75d73fd456028a0 (diff) | |
parent | 03fe10efd307da10e35c5f6a46f0c8b1a3888c57 (diff) |
Merge branch 'branch-1.2' of ssh://git.gag.com/scm/git/fw/altos into branch-1.2
Diffstat (limited to 'altoslib/AltosRecordMM.java')
-rw-r--r-- | altoslib/AltosRecordMM.java | 4 |
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() { |