X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromRecordMetrum.java;fp=altoslib%2FAltosEepromRecordMetrum.java;h=3da50544b2a56db660c619faf16cde1156e1c728;hp=c11b6aacf7e49a5084e0ff5f53f365111efee3e8;hb=c8dbcaf69cd538a31ab6e2b568237ae7c8656a9a;hpb=0cbfa444a9f9159cb509bb47ca5590fc1d709f64

diff --git a/altoslib/AltosEepromRecordMetrum.java b/altoslib/AltosEepromRecordMetrum.java
index c11b6aac..3da50544 100644
--- a/altoslib/AltosEepromRecordMetrum.java
+++ b/altoslib/AltosEepromRecordMetrum.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public class AltosEepromRecordMetrum extends AltosEepromRecord {
 	public static final int	record_length = 16;
@@ -65,59 +65,42 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
 	public int svid(int n) { return data8(2 + n * 2); }
 	public int c_n(int n) { return data8(2 + n * 2 + 1); }
 
-	public void update_state(AltosState state) {
-		super.update_state(state);
+	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+		super.provide_data(listener, cal_data);
 
 		AltosGPS	gps;
 
-		/* Flush any pending GPS changes */
-		if (state.gps_pending) {
-			switch (cmd()) {
-			case AltosLib.AO_LOG_GPS_POS:
-			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;
-			}
-		}
-
 		switch (cmd()) {
 		case AltosLib.AO_LOG_FLIGHT:
-			state.set_flight(flight());
-			state.set_ground_accel(ground_accel());
-			state.set_ground_pressure(ground_pres());
+			cal_data.set_flight(flight());
+			cal_data.set_ground_accel(ground_accel());
+			cal_data.set_ground_pressure(ground_pres());
 			break;
 		case AltosLib.AO_LOG_STATE:
-			state.set_state(state());
+			listener.set_state(state());
 			break;
 		case AltosLib.AO_LOG_SENSOR:
-			state.set_ms5607(pres(), temp());
-			state.set_accel(accel());
-
+			AltosPresTemp pt = eeprom.config_data().ms5607().pres_temp(pres(), temp());
+			listener.set_pressure(pt.pres);
+			listener.set_temperature(pt.temp);
+			listener.set_acceleration(cal_data.acceleration(accel()));
 			break;
 		case AltosLib.AO_LOG_TEMP_VOLT:
-			state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
-
-			state.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense_a()));
-			state.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
-
+			listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
+			listener.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense_a()));
+			listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
 			break;
 		case AltosLib.AO_LOG_GPS_POS:
-			gps = state.make_temp_gps(false);
+			gps = cal_data.make_temp_gps(tick(), false);
 			gps.lat = latitude() / 1e7;
 			gps.lon = longitude() / 1e7;
-			if (state.altitude_32())
+			if (config_data().altitude_32())
 				gps.alt = (altitude_low() & 0xffff) | (altitude_high() << 16);
 			else
 				gps.alt = altitude_low();
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
-			gps = state.make_temp_gps(false);
+			gps = cal_data.make_temp_gps(tick(), false);
 
 			gps.hour = hour();
 			gps.minute = minute();
@@ -136,7 +119,7 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
 			gps.pdop = pdop() / 10.0;
 			break;
 		case AltosLib.AO_LOG_GPS_SAT:
-			gps = state.make_temp_gps(true);
+			gps = cal_data.make_temp_gps(tick(), true);
 
 			int n = nsat();
 			for (int i = 0; i < n; i++)
@@ -152,11 +135,11 @@ public class AltosEepromRecordMetrum extends AltosEepromRecord {
 		return new AltosEepromRecordMetrum(eeprom, s);
 	}
 
-	public AltosEepromRecordMetrum(AltosEepromNew eeprom, int start) {
+	public AltosEepromRecordMetrum(AltosEeprom eeprom, int start) {
 		super(eeprom, start, record_length);
 	}
 
-	public AltosEepromRecordMetrum(AltosEepromNew eeprom) {
+	public AltosEepromRecordMetrum(AltosEeprom eeprom) {
 		this(eeprom, 0);
 	}
 }