X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordFull.java;h=c29da0256b7b9d46bafc64523c9b7ae23643ccbe;hb=1b91ba98395a431385c9af5de77b2892fd6ccc43;hp=ea81eb3da5a9f35d27b018e21987d8a2ee7f5e64;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859;p=fw%2Faltos

diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java
index ea81eb3d..c29da025 100644
--- a/altoslib/AltosEepromRecordFull.java
+++ b/altoslib/AltosEepromRecordFull.java
@@ -26,22 +26,6 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 		super.provide_data(listener, cal_data);
 		AltosGPS	gps;
 
-		/* Flush any pending GPS changes */
-		if (cal_data.gps_pending()) {
-			switch (cmd()) {
-			case AltosLib.AO_LOG_GPS_LAT:
-			case AltosLib.AO_LOG_GPS_LON:
-			case AltosLib.AO_LOG_GPS_ALT:
-			case AltosLib.AO_LOG_GPS_SAT:
-			case AltosLib.AO_LOG_GPS_DATE:
-				break;
-			default:
-				listener.set_gps(cal_data.temp_gps());
-				cal_data.reset_temp_gps();
-				break;
-			}
-		}
-
 		switch (cmd()) {
 		case AltosLib.AO_LOG_FLIGHT:
 			listener.set_state(AltosLib.ao_flight_pad);
@@ -62,8 +46,8 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 			listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(data16(2)));
 			break;
 		case AltosLib.AO_LOG_DEPLOY:
-			listener.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(data16(0)));
-			listener.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(data16(2)));
+			listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(data16(0)));
+			listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(data16(2)));
 			break;
 		case AltosLib.AO_LOG_STATE:
 			listener.set_state(data16(0));