X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_log.c;h=099c5f6ff9683aebf4a7048f2ed212e71578f60e;hp=47f24f0195151b95289e3729af64f589d13e40d0;hb=da42f406e88ccc821cd45d5a94d5afec65ec50e9;hpb=2722703bd848b07a02d3ce0c83a502eca52a9f1d

diff --git a/src/ao_log.c b/src/ao_log.c
index 47f24f01..099c5f6f 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,
@@ -99,10 +99,10 @@ ao_log(void)
 	/* 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;
@@ -170,6 +170,7 @@ ao_log_write_erase(uint8_t pos)
 	erase.unused = 0x00;
 	erase.flight = ao_flight_number;
 	ao_storage_write(ao_log_erase_pos(pos),  &erase, sizeof (erase));
+	ao_storage_flush();
 }
 
 static void
@@ -314,6 +315,12 @@ ao_log_present(void)
 	return ao_log_max_flight() != 0;
 }
 
+uint8_t
+ao_log_full(void)
+{
+	return ao_log_current_pos == ao_log_end_pos;
+}
+
 static __xdata struct ao_task ao_log_task;
 
 void
@@ -328,8 +335,10 @@ ao_log_list(void) __reentrant
 	{
 		flight = ao_log_flight(slot);
 		if (flight)
-			printf ("flight %d start %ld end %ld\n",
-				flight, ao_log_pos(slot), ao_log_pos(slot+1));
+			printf ("flight %d start %x end %x\n",
+				flight,
+				(uint16_t) (ao_log_pos(slot) >> 8),
+				(uint16_t) (ao_log_pos(slot+1) >> 8));
 	}
 	printf ("done\n");
 }
@@ -346,33 +355,35 @@ ao_log_delete(void) __reentrant
 
 	slots = ao_log_slots();
 	/* Look for the flight log matching the requested flight */
-	for (slot = 0; slot < slots; slot++) {
-		if (ao_log_flight(slot) == ao_cmd_lex_i) {
-			ao_log_current_pos = ao_log_pos(slot);
-			ao_log_end_pos = ao_log_current_pos + ao_config.flight_log_max;
-			while (ao_log_current_pos < ao_log_end_pos) {
-				/*
-				 * Check to see if we've reached the end of
-				 * the used memory to avoid re-erasing the same
-				 * memory over and over again
-				 */
-				if (ao_storage_read(ao_log_current_pos,
-						    &log,
-						    sizeof (struct ao_log_record))) {
-					for (slot = 0; slot < sizeof (struct ao_log_record); slot++)
-						if (((uint8_t *) &log)[slot] != 0xff)
+	if (ao_cmd_lex_i) {
+		for (slot = 0; slot < slots; slot++) {
+			if (ao_log_flight(slot) == ao_cmd_lex_i) {
+				ao_log_erase_mark();
+				ao_log_current_pos = ao_log_pos(slot);
+				ao_log_end_pos = ao_log_current_pos + ao_config.flight_log_max;
+				while (ao_log_current_pos < ao_log_end_pos) {
+					/*
+					 * Check to see if we've reached the end of
+					 * the used memory to avoid re-erasing the same
+					 * memory over and over again
+					 */
+					if (ao_storage_read(ao_log_current_pos,
+							    &log,
+							    sizeof (struct ao_log_record))) {
+						for (slot = 0; slot < sizeof (struct ao_log_record); slot++)
+							if (((uint8_t *) &log)[slot] != 0xff)
+								break;
+						if (slot == sizeof (struct ao_log_record))
 							break;
-					if (slot == sizeof (struct ao_log_record))
-						break;
+					}
+					ao_storage_erase(ao_log_current_pos);
+					ao_log_current_pos += ao_storage_block;
 				}
-				ao_storage_erase(ao_log_current_pos);
-				ao_log_current_pos += ao_storage_block;
+				puts("Erased");
+				return;
 			}
-			puts("Erased");
-			return;
 		}
 	}
-	ao_log_erase_mark();
 	printf("No such flight: %d\n", ao_cmd_lex_i);
 }