Merge branch 'master' into lpc
authorKeith Packard <keithp@keithp.com>
Mon, 20 May 2013 03:40:42 +0000 (20:40 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 20 May 2013 03:40:42 +0000 (20:40 -0700)
altoslib/AltosRecordMM.java

index bf64192c5888abe1a75e8050e72d2329db4fb154..d697111ccb186d287ae4ac780fc2c5164369c7c2 100644 (file)
@@ -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() {