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

diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java
index ea81eb3d..85709f73 100644
--- a/altoslib/AltosEepromRecordFull.java
+++ b/altoslib/AltosEepromRecordFull.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public class AltosEepromRecordFull extends AltosEepromRecord {
 	public static final int	record_length = 8;
@@ -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));
@@ -120,11 +104,11 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 		return new AltosEepromRecordFull(eeprom, s);
 	}
 
-	public AltosEepromRecordFull(AltosEepromNew eeprom, int start) {
+	public AltosEepromRecordFull(AltosEeprom eeprom, int start) {
 		super(eeprom, start, record_length);
 	}
 
-	public AltosEepromRecordFull(AltosEepromNew eeprom) {
+	public AltosEepromRecordFull(AltosEeprom eeprom) {
 		this(eeprom, 0);
 	}
 }