X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_log_firetwo.c;h=4b42abe4bcb1792bf252106ead12002dffbb4aad;hp=71e84dfeb755da2c65fd87d55a4cc8705a23b2a5;hb=cd291d38b92b31c3612e6de6cdf4e5988fc01c12;hpb=359e2d6eca5258f4fabc59772f1320e195a7397c

diff --git a/src/kernel/ao_log_firetwo.c b/src/kernel/ao_log_firetwo.c
index 71e84dfe..4b42abe4 100644
--- a/src/kernel/ao_log_firetwo.c
+++ b/src/kernel/ao_log_firetwo.c
@@ -75,71 +75,65 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_firetwo))] ;
 void
 ao_log(void)
 {
-	__pdata uint16_t	next_sensor, next_other;
+	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();
 
-	ao_log_scan();
-
-	while (!ao_log_running)
-		ao_sleep(&ao_log_running);
-
-#if HAS_FLIGHT
-	log.type = AO_LOG_FLIGHT;
-	log.tick = ao_sample_tick;
-	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);
-#endif
-
-	/* Write the whole contents of the ring to the log
-	 * when starting up.
-	 */
-	ao_log_data_pos = ao_data_ring_next(ao_data_head);
-	next_other = next_sensor = ao_data_ring[ao_log_data_pos].tick;
-	ao_log_state = ao_flight_startup;
-	for (;;) {
-		/* Write samples to EEPROM */
-		while (ao_log_data_pos != ao_data_head) {
-			log.tick = ao_data_ring[ao_log_data_pos].tick;
-			if ((int16_t) (log.tick - next_sensor) >= 0) {
+	do {
+		ao_log_scan();
+	
+		while (!ao_log_running)
+			ao_sleep(&ao_log_running);
+	
+		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);
+
+		/* Write the whole contents of the ring to the log
+	 	* when starting up.
+	 	*/
+		ao_log_data_pos = ao_data_ring_next(ao_data_head);
+		ao_log_state = ao_flight_startup;
+		for (;;) {
+			/* Write samples to EEPROM */
+			while (ao_log_data_pos != ao_data_head) {
+				log.tick = ao_data_ring[ao_log_data_pos].tick;
 				log.type = AO_LOG_SENSOR;
-				log.u.sensor.pressure = ao_data_ring[ao_log_data_pos].sensor.pressure;
-				log.u.sensor.thrust = ao_data_ring[ao_log_data_pos].sensor.thrust;
-				for (i = 0; i < 4; i++) {
-					log.u.sensor.thermistor[i] = ao_data_ring[ao_log_data_pos].sensor.thermistor[i];
-				}
+				log.u.sensor.pressure = ao_data_ring[ao_log_data_pos].adc.pressure;
+				log.u.sensor.thrust = ao_data_ring[ao_log_data_pos].adc.thrust;
+	//			for (i = 0; i < 4; i++) {
+	//				log.u.sensor.thermistor[i] = ao_data_ring[ao_log_data_pos].sensor.thermistor[i];
+	//			}
 				ao_log_firetwo(&log);
+				ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
 			}
-			ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
-		}
-#if HAS_FLIGHT
-		/* Write state change to EEPROM */
-		if (ao_flight_state != ao_log_state) {
-			ao_log_state = ao_flight_state;
-			log.type = AO_LOG_STATE;
-			log.tick = ao_time();
-			log.u.state.state = ao_log_state;
-			log.u.state.reason = 0;
-			ao_log_firetwo(&log);
-
-			if (ao_log_state == ao_flight_landed)
-				ao_log_stop();
-		}
-#endif
-
-		ao_log_flush();
+			/* Write state change to EEPROM */
+			if (ao_flight_state != ao_log_state) {
+				ao_log_state = ao_flight_state;
+				log.type = AO_LOG_STATE;
+				log.tick = ao_time();
+				log.u.state.state = ao_log_state;
+				log.u.state.reason = 0;
+				ao_log_firetwo(&log);
+	
+				if (ao_log_state == ao_flight_landed)
+					ao_log_stop();
+			}
+	
+			ao_log_flush();
 
-		/* Wait for a while */
-		ao_delay(AO_MS_TO_TICKS(100));
+			if (!ao_log_running) break;
 
-		/* Stop logging when told to */
-		while (!ao_log_running)
-			ao_sleep(&ao_log_running);
-	}
+			/* Wait for a while */
+			ao_delay(AO_MS_TO_TICKS(100));
+		}
+	} while (ao_log_running);
 }
-#endif
 
 uint16_t
 ao_log_flight(uint8_t slot)