X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromIterable.java;h=11cb97e40997c2171999e4144405e9865f829828;hb=3c2f601139d36761de6a8a2210545d082ef16133;hp=812e5fc616ff03a2ac863b9dd01114fc1a12602f;hpb=7fd9b8f720add559b262e81d61ededc9df16ca94;p=fw%2Faltos

diff --git a/altosui/AltosEepromIterable.java b/altosui/AltosEepromIterable.java
index 812e5fc6..11cb97e4 100644
--- a/altosui/AltosEepromIterable.java
+++ b/altosui/AltosEepromIterable.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.AltosLib.*;
 
 /*
  * AltosRecords with an index field so they can be sorted by tick while preserving
@@ -99,6 +100,7 @@ public class AltosEepromIterable extends AltosRecordIterable {
 		double	ground_pres;
 		int	gps_tick;
 		int	boost_tick;
+		int	sensor_tick;
 
 		EepromState() {
 			seen = 0;
@@ -128,10 +130,13 @@ public class AltosEepromIterable extends AltosRecordIterable {
 				state.flight_pres = state.ground_pres;
 			} else {
 				state.flight_pres = (state.flight_pres * 15 + state.pres) / 16;
-				state.flight_accel = (state.flight_accel * 15 + state.accel) / 16;
-				state.flight_vel += (state.accel_plus_g - state.accel);
 			}
+			state.flight_accel = (state.flight_accel * 15 + state.accel) / 16;
+			if ((eeprom.seen & seen_sensor) == 0)
+				eeprom.sensor_tick = record.tick - 1;
+			state.flight_vel += (state.accel_plus_g - state.accel) * (record.tick - eeprom.sensor_tick);
 			eeprom.seen |= seen_sensor;
+			eeprom.sensor_tick = record.tick;
 			has_accel = true;
 			break;
 		case Altos.AO_LOG_PRESSURE:
@@ -177,6 +182,7 @@ public class AltosEepromIterable extends AltosRecordIterable {
 			state.gps.locked = (flags & Altos.AO_GPS_VALID) != 0;
 			state.gps.nsat = (flags & Altos.AO_GPS_NUM_SAT_MASK) >>
 				Altos.AO_GPS_NUM_SAT_SHIFT;
+			state.new_gps = true;
 			has_gps = true;
 			break;
 		case Altos.AO_LOG_GPS_LAT:
@@ -263,7 +269,7 @@ public class AltosEepromIterable extends AltosRecordIterable {
 		AltosRecord r = new AltosRecord(state);
 		r.time = (r.tick - eeprom.boost_tick) / 100.0;
 		list.add(r);
-		return list;
+	return list;
 	}
 
 	public Iterator<AltosRecord> iterator() {
@@ -318,6 +324,30 @@ public class AltosEepromIterable extends AltosRecordIterable {
 			case Altos.AO_LOG_SOFTWARE_VERSION:
 				out.printf ("# Software version: %s\n", record.data);
 				break;
+			case Altos.AO_LOG_BARO_RESERVED:
+				out.printf ("# Baro reserved: %d\n", record.a);
+				break;
+			case Altos.AO_LOG_BARO_SENS:
+				out.printf ("# Baro sens: %d\n", record.a);
+				break;
+			case Altos.AO_LOG_BARO_OFF:
+				out.printf ("# Baro off: %d\n", record.a);
+				break;
+			case Altos.AO_LOG_BARO_TCS:
+				out.printf ("# Baro tcs: %d\n", record.a);
+				break;
+			case Altos.AO_LOG_BARO_TCO:
+				out.printf ("# Baro tco: %d\n", record.a);
+				break;
+			case Altos.AO_LOG_BARO_TREF:
+				out.printf ("# Baro tref: %d\n", record.a);
+				break;
+			case Altos.AO_LOG_BARO_TEMPSENS:
+				out.printf ("# Baro tempsens: %d\n", record.a);
+				break;
+			case Altos.AO_LOG_BARO_CRC:
+				out.printf ("# Baro crc: %d\n", record.a);
+				break;
 			}
 		}
 	}