From: Keith Packard <keithp@keithp.com>
Date: Mon, 20 May 2013 03:40:42 +0000 (-0700)
Subject: Merge branch 'master' into lpc
X-Git-Tag: 1.2.9.4~189^2~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=27e9b93f3d35890a49575b2ead1983ce3c2fc213;hp=a4df2575b4e782e83cc4e9b1d2e5cd2397a97dd8

Merge branch 'master' into lpc
---

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() {