X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_log.c;h=fedd9850e7b0f852e5f7aed87a4c7909c2d84f0a;hp=112ea510faf3f5aa982512cd345b2bacc90b7e3f;hb=3d5a5fc4db5f681e848202c4ee4099d2879677d6;hpb=acc4fc635edb70ec1ba2dff9f7ac0c8542c72c47

diff --git a/ao_log.c b/ao_log.c
index 112ea510..fedd9850 100644
--- a/ao_log.c
+++ b/ao_log.c
@@ -3,8 +3,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -61,8 +60,8 @@ ao_log_flush(void)
 }
 
 __xdata struct ao_log_record ao_log_dump;
-static __data uint16_t ao_log_dump_flight;
-static __data uint32_t ao_log_dump_pos;
+static __xdata uint16_t ao_log_dump_flight;
+static __xdata uint32_t ao_log_dump_pos;
 
 static uint8_t
 ao_log_dump_check_data(void)
@@ -107,8 +106,8 @@ ao_log_dump_next(void)
 	return ao_log_dump_check_data();
 }
 
-uint8_t	ao_log_adc_pos;
-enum flight_state ao_log_state;
+__xdata uint8_t	ao_log_adc_pos;
+__xdata enum flight_state ao_log_state;
 
 void
 ao_log(void)
@@ -121,7 +120,7 @@ ao_log(void)
 		ao_sleep(&ao_log_running);
 	
 	log.type = AO_LOG_FLIGHT;
-	log.tick = ao_flight_state_tick;
+	log.tick = ao_flight_tick;
 	log.u.flight.serial = 0;
 	log.u.flight.flight = ao_log_dump_flight + 1;
 	ao_log_data(&log);
@@ -130,7 +129,7 @@ ao_log(void)
 		if (ao_flight_state != ao_log_state) {
 			ao_log_state = ao_flight_state;
 			log.type = AO_LOG_STATE;
-			log.tick = ao_flight_state_tick;
+			log.tick = ao_flight_tick;
 			log.u.state.state = ao_log_state;
 			log.u.state.reason = 0;
 			ao_log_data(&log);
@@ -172,6 +171,13 @@ ao_log_start(void)
 	ao_wakeup(&ao_log_running);
 }
 
+void
+ao_log_stop(void)
+{
+	ao_log_running = 0;
+	ao_log_flush();
+}
+
 static __xdata struct ao_task ao_log_task;
 
 void