X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fao_log.c;h=817d3e6fc6ca0615d05e648267d96753a1ec6f55;hb=f8afc2641c779fc312a42a6358187d8716ebe61a;hp=8666482b51ab6da82b086cdf9b5c1423cc26b957;hpb=d794ef9e0fbe4d13259db1bbd69f01717c14400b;p=fw%2Faltos

diff --git a/src/ao_log.c b/src/ao_log.c
index 8666482b..817d3e6f 100644
--- a/src/ao_log.c
+++ b/src/ao_log.c
@@ -42,8 +42,8 @@ ao_log_data(__xdata struct ao_log_record *log) __reentrant
 	log->csum = 0;
 	log->csum = ao_log_csum((__xdata uint8_t *) log);
 	ao_mutex_get(&ao_log_mutex); {
-		if (ao_log_current_pos >= ao_log_end_pos)
-			ao_log_running = 0;
+		if (ao_log_current_pos >= ao_log_end_pos && ao_log_running)
+			ao_log_stop();
 		if (ao_log_running) {
 			wrote = 1;
 			ao_storage_write(ao_log_current_pos,
@@ -92,17 +92,19 @@ ao_log(void)
 
 	log.type = AO_LOG_FLIGHT;
 	log.tick = ao_flight_tick;
+#if HAS_ACCEL
 	log.u.flight.ground_accel = ao_ground_accel;
+#endif
 	log.u.flight.flight = ao_flight_number;
 	ao_log_data(&log);
 
 	/* Write the whole contents of the ring to the log
 	 * when starting up.
 	 */
-	ao_log_adc_pos = ao_adc_ring_next(ao_adc_head);
+	ao_log_adc_pos = ao_adc_ring_next(ao_flight_adc);
 	for (;;) {
 		/* Write samples to EEPROM */
-		while (ao_log_adc_pos != ao_adc_head) {
+		while (ao_log_adc_pos != ao_flight_adc) {
 			log.type = AO_LOG_SENSOR;
 			log.tick = ao_adc_ring[ao_log_adc_pos].tick;
 			log.u.sensor.accel = ao_adc_ring[ao_log_adc_pos].accel;
@@ -390,9 +392,9 @@ ao_log_delete(void) __reentrant
 
 
 __code struct ao_cmds ao_log_cmds[] = {
-	{ 'l',	ao_log_list,	"l                                  List stored flight logs" },
-	{ 'd',	ao_log_delete,	"d <flight-number>                  Delete stored flight" },
-	{ 0,	ao_log_delete,	NULL },
+	{ ao_log_list,	"l\0List stored flight logs" },
+	{ ao_log_delete,	"d <flight-number>\0Delete stored flight" },
+	{ 0,	NULL },
 };
 
 void