X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromTM.java;h=6d36cf47a9e1ed87169c71641e9d19c1106bb6d0;hp=08f9af5ac4f93caf4b37fcb6b4bc7cb7f0e85b06;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=528e2e41112cad8a81bccbb89c3bd202b818a506

diff --git a/altoslib/AltosEepromTM.java b/altoslib/AltosEepromTM.java
index 08f9af5a..6d36cf47 100644
--- a/altoslib/AltosEepromTM.java
+++ b/altoslib/AltosEepromTM.java
@@ -15,18 +15,15 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_5;
 
 import java.io.*;
 import java.util.*;
 import java.text.*;
 
 public class AltosEepromTM extends AltosEeprom {
-	public int	cmd;
-	public int	tick;
 	public int	a;
 	public int	b;
-	public boolean	tick_valid;
 
 	public static final int	record_length = 8;
 
@@ -41,6 +38,8 @@ public class AltosEepromTM extends AltosEeprom {
 	}
 
 	public void update_state(AltosState state) {
+		super.update_state(state);
+
 		AltosGPS	gps;
 
 		/* Flush any pending GPS changes */
@@ -66,27 +65,21 @@ public class AltosEepromTM extends AltosEeprom {
 			state.set_boost_tick(tick);
 			break;
 		case AltosLib.AO_LOG_SENSOR:
-			state.set_tick(tick);
 			state.set_accel(a);
-			double pressure = AltosConvert.barometer_to_pressure(b);
-			state.set_pressure(pressure);
+			state.set_pressure(AltosConvert.barometer_to_pressure(b));
 			break;
 		case AltosLib.AO_LOG_PRESSURE:
-			state.set_tick(tick);
 			state.set_pressure(AltosConvert.barometer_to_pressure(b));
 			break;
 		case AltosLib.AO_LOG_TEMP_VOLT:
-			state.set_tick(tick);
 			state.set_temperature(AltosConvert.thermometer_to_temperature(a));
 			state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(b));
 			break;
 		case AltosLib.AO_LOG_DEPLOY:
-			state.set_tick(tick);
 			state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(a));
 			state.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(b));
 			break;
 		case AltosLib.AO_LOG_STATE:
-			state.set_tick(tick);
 			state.set_state(a);
 			break;
 		case AltosLib.AO_LOG_GPS_TIME:
@@ -137,10 +130,10 @@ public class AltosEepromTM extends AltosEeprom {
 	public AltosEepromTM (AltosEepromChunk chunk, int start) throws ParseException {
 
 		cmd = chunk.data(start);
-		tick_valid = true;
+		valid = true;
 
-		tick_valid = !chunk.erased(start, record_length);
-		if (tick_valid) {
+		valid = !chunk.erased(start, record_length);
+		if (valid) {
 			if (AltosConvert.checksum(chunk.data, start, record_length) != 0)
 				throw new ParseException(String.format("invalid checksum at 0x%x",
 								       chunk.address + start), 0);
@@ -154,7 +147,7 @@ public class AltosEepromTM extends AltosEeprom {
 	}
 
 	public AltosEepromTM (String line) {
-		tick_valid = false;
+		valid = false;
 		tick = 0;
 		a = 0;
 		b = 0;
@@ -170,7 +163,7 @@ public class AltosEepromTM extends AltosEeprom {
 					} else {
 						cmd = tokens[0].codePointAt(0);
 						tick = Integer.parseInt(tokens[1],16);
-						tick_valid = true;
+						valid = true;
 						a = Integer.parseInt(tokens[2],16);
 						b = Integer.parseInt(tokens[3],16);
 					}
@@ -184,7 +177,7 @@ public class AltosEepromTM extends AltosEeprom {
 	}
 
 	public AltosEepromTM(int in_cmd, int in_tick, int in_a, int in_b) {
-		tick_valid = true;
+		valid = true;
 		cmd = in_cmd;
 		tick = in_tick;
 		a = in_a;