X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromMegaIterable.java;h=50f9d33de4b64f0aefa06e98d5480376258ad8d6;hb=7894c27b2b2c3c46a7c107c8acd5977830f006cf;hp=1ab2fcc8b473aee35e45a4306c5f32d481e19d89;hpb=3fe932206f40f4d6f83a4ef49e064109a7a3de92;p=fw%2Faltos

diff --git a/altoslib/AltosEepromMegaIterable.java b/altoslib/AltosEepromMegaIterable.java
index 1ab2fcc8..50f9d33d 100644
--- a/altoslib/AltosEepromMegaIterable.java
+++ b/altoslib/AltosEepromMegaIterable.java
@@ -106,15 +106,6 @@ public class AltosEepromMegaIterable extends AltosRecordIterable {
 			eeprom.sensor_tick = record.tick;
 			has_accel = true;
 			break;
-		case AltosLib.AO_LOG_PRESSURE:
-			state.pres = record.b;
-			state.flight_pres = state.pres;
-			if (eeprom.n_pad_samples == 0) {
-				eeprom.n_pad_samples++;
-				state.ground_pres = state.pres;
-			}
-			eeprom.seen |= seen_sensor;
-			break;
 		case AltosLib.AO_LOG_TEMP_VOLT:
 			state.v_batt = record.v_batt();
 			state.v_pyro = record.v_pbatt();
@@ -122,14 +113,6 @@ public class AltosEepromMegaIterable extends AltosRecordIterable {
 				state.sense[i] = record.sense(i);
 			eeprom.seen |= seen_temp_volt;
 			break;
-//
-//		case AltosLib.AO_LOG_DEPLOY:
-//			state.drogue = record.a;
-//			state.main = record.b;
-//			eeprom.seen |= seen_deploy;
-//			has_ignite = true;
-//			break;
-
 		case AltosLib.AO_LOG_STATE:
 			state.state = record.state();
 			break;
@@ -347,40 +330,6 @@ public class AltosEepromMegaIterable extends AltosRecordIterable {
 		}
 	}
 
-	/*
-	 * Given an AO_LOG_GPS_TIME record with correct time, and one
-	 * missing time, rewrite the missing time values with the good
-	 * ones, assuming that the difference between them is 'diff' seconds
-	 */
-	void update_time(AltosOrderedMegaRecord good, AltosOrderedMegaRecord bad) {
-
-		int diff = (bad.tick - good.tick + 50) / 100;
-
-		int hour = (good.a & 0xff);
-		int minute = (good.a >> 8);
-		int second = (good.b & 0xff);
-		int flags = (good.b >> 8);
-		int seconds = hour * 3600 + minute * 60 + second;
-
-		/* Make sure this looks like a good GPS value */
-		if ((flags & AltosLib.AO_GPS_NUM_SAT_MASK) >> AltosLib.AO_GPS_NUM_SAT_SHIFT < 4)
-			flags = (flags & ~AltosLib.AO_GPS_NUM_SAT_MASK) | (4 << AltosLib.AO_GPS_NUM_SAT_SHIFT);
-		flags |= AltosLib.AO_GPS_RUNNING;
-		flags |= AltosLib.AO_GPS_VALID;
-
-		int new_seconds = seconds + diff;
-		if (new_seconds < 0)
-			new_seconds += 24 * 3600;
-		int new_second = (new_seconds % 60);
-		int new_minutes = (new_seconds / 60);
-		int new_minute = (new_minutes % 60);
-		int new_hours = (new_minutes / 60);
-		int new_hour = (new_hours % 24);
-
-		bad.a = new_hour + (new_minute << 8);
-		bad.b = new_second + (flags << 8);
-	}
-
 	/*
 	 * Read the whole file, dumping records into a RB tree so
 	 * we can enumerate them in time order -- the eeprom data
@@ -416,48 +365,6 @@ public class AltosEepromMegaIterable extends AltosRecordIterable {
 					continue;
 				}
 
-				/* Two firmware bugs caused the loss of some GPS data.
-				 * The flight date would never be recorded, and often
-				 * the flight time would get overwritten by another
-				 * record. Detect the loss of the GPS date and fix up the
-				 * missing time records
-				 */
-				if (record.cmd == AltosLib.AO_LOG_GPS_DATE) {
-					gps_date_record = record;
-					continue;
-				}
-
-				/* go back and fix up any missing time values */
-				if (record.cmd == AltosLib.AO_LOG_GPS_TIME) {
-					last_gps_time = record;
-					if (missing_time) {
-						Iterator<AltosOrderedMegaRecord> iterator = records.iterator();
-						while (iterator.hasNext()) {
-							AltosOrderedMegaRecord old = iterator.next();
-							if (old.cmd == AltosLib.AO_LOG_GPS_TIME &&
-							    old.a == -1 && old.b == -1)
-							{
-								update_time(record, old);
-							}
-						}
-						missing_time = false;
-					}
-				}
-
-				if (record.cmd == AltosLib.AO_LOG_GPS_LAT) {
-					if (last_gps_time == null || last_gps_time.tick != record.tick) {
-						AltosOrderedMegaRecord add_gps_time = new AltosOrderedMegaRecord(AltosLib.AO_LOG_GPS_TIME,
-													 record.tick,
-													 -1, -1, index-1);
-						if (last_gps_time != null)
-							update_time(last_gps_time, add_gps_time);
-						else
-							missing_time = true;
-
-						records.add(add_gps_time);
-						record.index = index++;
-					}
-				}
 				records.add(record);
 
 				/* Bail after reading the 'landed' record; we're all done */