Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

1 files changed, 25 insertions, 39 deletions

diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java
index fbb8fbd9..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;
@@ -21,53 +21,39 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 
 	public static final int two_g_default = 16294 - 15758;
 
-	public void update_state(AltosState state) {
-		super.update_state(state);
-		AltosGPS	gps;
+	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
 
-		/* Flush any pending GPS changes */
-		if (state.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:
-				state.set_temp_gps();
-				break;
-			}
-		}
+		super.provide_data(listener, cal_data);
+		AltosGPS	gps;
 
 		switch (cmd()) {
 		case AltosLib.AO_LOG_FLIGHT:
-			state.set_state(AltosLib.ao_flight_pad);
-			state.set_ground_accel(data16(0));
-			state.set_flight(data16(2));
-			if (state.accel_plus_g == AltosLib.MISSING)
-				state.set_accel_g(data16(0), data16(0) + two_g_default);
+			listener.set_state(AltosLib.ao_flight_pad);
+			cal_data.set_ground_accel(data16(0));
+			cal_data.set_flight(data16(2));
+			if (cal_data.accel_plus_g == AltosLib.MISSING)
+				cal_data.set_accel_plus_minus(data16(0), data16(0) + two_g_default);
 			break;
 		case AltosLib.AO_LOG_SENSOR:
-			state.set_accel(data16(0));
-			state.set_pressure(AltosConvert.barometer_to_pressure(data16(2)));
+			listener.set_acceleration(cal_data.acceleration(data16(0)));
+			listener.set_pressure(AltosConvert.barometer_to_pressure(data16(2)));
 			break;
 		case AltosLib.AO_LOG_PRESSURE:
-			state.set_pressure(AltosConvert.barometer_to_pressure(data16(2)));
+			listener.set_pressure(AltosConvert.barometer_to_pressure(data16(2)));
 			break;
 		case AltosLib.AO_LOG_TEMP_VOLT:
-			state.set_temperature(AltosConvert.thermometer_to_temperature(data16(0)));
-			state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(data16(2)));
+			listener.set_temperature(AltosConvert.thermometer_to_temperature(data16(0)));
+			listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(data16(2)));
 			break;
 		case AltosLib.AO_LOG_DEPLOY:
-			state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(data16(0)));
-			state.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:
-			state.set_state(data16(0));
+			listener.set_state(data16(0));
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
-			gps = state.make_temp_gps(false);
+			gps = cal_data.make_temp_gps(tick(),false);
 
 			gps.hour = data8(0);
 			gps.minute = data8(1);
@@ -81,29 +67,29 @@ public class AltosEepromRecordFull extends AltosEepromRecord {
 				AltosLib.AO_GPS_NUM_SAT_SHIFT;
 			break;
 		case AltosLib.AO_LOG_GPS_LAT:
-			gps = state.make_temp_gps(false);
+			gps = cal_data.make_temp_gps(tick(),false);
 
 			int lat32 = data32(0);
 			gps.lat = (double) lat32 / 1e7;
 			break;
 		case AltosLib.AO_LOG_GPS_LON:
-			gps = state.make_temp_gps(false);
+			gps = cal_data.make_temp_gps(tick(),false);
 
 			int lon32 = data32(0);
 			gps.lon = (double) lon32 / 1e7;
 			break;
 		case AltosLib.AO_LOG_GPS_ALT:
-			gps = state.make_temp_gps(false);
+			gps = cal_data.make_temp_gps(tick(),false);
 			gps.alt = data16(0);
 			break;
 		case AltosLib.AO_LOG_GPS_SAT:
-			gps = state.make_temp_gps(true);
+			gps = cal_data.make_temp_gps(tick(),true);
 			int svid = data16(0);
 			int c_n0 = data16(3);
 			gps.add_sat(svid, c_n0);
 			break;
 		case AltosLib.AO_LOG_GPS_DATE:
-			gps = state.make_temp_gps(false);
+			gps = cal_data.make_temp_gps(tick(),false);
 			gps.year = data8(0) + 2000;
 			gps.month = data8(1);
 			gps.day = data8(2);
@@ -118,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);
 	}
 }