From: Bdale Garbee <bdale@gag.com>
Date: Thu, 27 Apr 2017 18:57:49 +0000 (-0600)
Subject: telefiretwo: don't try to record pre-burn sensor values in FLIGHT record
X-Git-Tag: 1.8~124
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f753ad3b9d0f3dc9794e5dd097063aab6cf9bdc4;hp=7e2b92ccb56b713fd18af5769156331ead8dc7ed

telefiretwo: don't try to record pre-burn sensor values in FLIGHT record
---

diff --git a/altoslib/AltosEepromRecordFireTwo.java b/altoslib/AltosEepromRecordFireTwo.java
index dd9e34e1..809247c7 100644
--- a/altoslib/AltosEepromRecordFireTwo.java
+++ b/altoslib/AltosEepromRecordFireTwo.java
@@ -27,8 +27,6 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
 
 	/* AO_LOG_FLIGHT elements */
 	public int flight() { return data16(0); }
-	public int idle_pres() { return data16(2); }
-	public int idle_thrust() { return data16(4); }
 
 	/* AO_LOG_STATE elements */
 	public int state() { return data16(0); }
@@ -76,7 +74,7 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord {
 		switch (cmd()) {
 		case AltosLib.AO_LOG_FLIGHT:
 			state.set_flight(flight());
-			state.set_ground_pressure(adc_to_pa(idle_pres()));
+			state.set_ground_pressure(0.0);
 			state.set_accel_g(0, -1);
 			break;
 		case AltosLib.AO_LOG_STATE:
diff --git a/src/kernel/ao_log.h b/src/kernel/ao_log.h
index a2f2c6ca..5c568c99 100644
--- a/src/kernel/ao_log.h
+++ b/src/kernel/ao_log.h
@@ -309,9 +309,7 @@ struct ao_log_firetwo {
 		/* AO_LOG_FLIGHT */
 		struct {
 			uint16_t	flight;		/* 4 */
-			uint16_t	idle_pressure;	/* 6 */
-			uint16_t	idle_thrust;	/* 8 */
-		} flight;	/* 16 */
+		} flight;	/* 6 */
 		/* AO_LOG_STATE */
 		struct {
 			uint16_t	state;		/* 4 */
diff --git a/src/kernel/ao_log_firetwo.c b/src/kernel/ao_log_firetwo.c
index 4b42abe4..1a82673d 100644
--- a/src/kernel/ao_log_firetwo.c
+++ b/src/kernel/ao_log_firetwo.c
@@ -75,8 +75,6 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_firetwo))] ;
 void
 ao_log(void)
 {
-	uint16_t ao_idle_pressure = 0;		// write code to capture pre-test values someday
-	uint16_t ao_idle_thrust = 0;
 	uint16_t ao_flight_state = ao_flight_startup;
 
 	ao_storage_setup();
@@ -89,8 +87,6 @@ ao_log(void)
 	
 		log.type = AO_LOG_FLIGHT;
 		log.tick = ao_time();
-		log.u.flight.idle_pressure = ao_idle_pressure;
-		log.u.flight.idle_thrust = ao_idle_thrust;
 		log.u.flight.flight = ao_flight_number;
 		ao_log_firetwo(&log);