X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordFireTwo.java;h=48d480c523f8e366a6f99eceb79fd07ff0f67be0;hb=e4f1fa544f1cb21070c9d79c81ebae0fb71d77db;hp=8c03cd5657e9eec3fd0da949c20f163c0640a216;hpb=9d05af2147c0eb6dc63c4d4dc1d9a3c31f480aef;p=fw%2Faltos

diff --git a/altoslib/AltosEepromRecordFireTwo.java b/altoslib/AltosEepromRecordFireTwo.java
index 8c03cd56..48d480c5 100644
--- a/altoslib/AltosEepromRecordFireTwo.java
+++ b/altoslib/AltosEepromRecordFireTwo.java
@@ -68,21 +68,19 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
 		return AltosConvert.lb_to_n(v * 298 * 9.807);
 	}
 
-	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);
 
 		switch (cmd()) {
 		case AltosLib.AO_LOG_FLIGHT:
-			state.set_flight(flight());
-			state.set_ground_pressure(0.0);
-			state.set_accel_g(0, -1);
+			cal_data.set_flight(flight());
 			break;
 		case AltosLib.AO_LOG_STATE:
-			state.set_state(state());
+			listener.set_state(state());
 			break;
 		case AltosLib.AO_LOG_SENSOR:
-			state.set_pressure(adc_to_pa(pres()));
-			state.set_accel(adc_to_n(thrust()));
+			listener.set_pressure(adc_to_pa(pres()));
+			listener.set_thrust(adc_to_n(thrust()));
 			break;
 		}
 	}
@@ -94,11 +92,11 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
 		return new AltosEepromRecordFireTwo(eeprom, s);
 	}
 
-	public AltosEepromRecordFireTwo(AltosEepromNew eeprom, int start) {
+	public AltosEepromRecordFireTwo(AltosEeprom eeprom, int start) {
 		super(eeprom, start, record_length);
 	}
 
-	public AltosEepromRecordFireTwo(AltosEepromNew eeprom) {
+	public AltosEepromRecordFireTwo(AltosEeprom eeprom) {
 		this(eeprom, 0);
 	}
 }