X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_log_big.c;h=74d94c4baae9802855e2bb6acb233d2a38a16cb5;hp=ab6b02f582e88a4b96fbf174d6793d3a949f63d0;hb=5203ddaac692bfd82a01368da9fb66c25e9e14c1;hpb=7ce8c9081e703d1405c2595ab9bda0cfa218c6c4

diff --git a/src/ao_log_big.c b/src/ao_log_big.c
index ab6b02f5..74d94c4b 100644
--- a/src/ao_log_big.c
+++ b/src/ao_log_big.c
@@ -60,7 +60,7 @@ ao_log_dump_check_data(void)
 	return 1;
 }
 
-static __xdata uint8_t	ao_log_adc_pos;
+static __data uint8_t	ao_log_adc_pos;
 
 /* a hack to make sure that ao_log_records fill the eeprom block in even units */
 typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_record))] ;
@@ -72,7 +72,7 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_record))] ;
 void
 ao_log(void)
 {
-	uint16_t	next_sensor, next_other;
+	__pdata uint16_t	next_sensor, next_other;
 
 	ao_storage_setup();
 
@@ -82,7 +82,7 @@ ao_log(void)
 		ao_sleep(&ao_log_running);
 
 	log.type = AO_LOG_FLIGHT;
-	log.tick = ao_flight_tick;
+	log.tick = ao_sample_tick;
 #if HAS_ACCEL
 	log.u.flight.ground_accel = ao_ground_accel;
 #endif
@@ -92,12 +92,12 @@ 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_flight_adc);
+	ao_log_adc_pos = ao_adc_ring_next(ao_sample_adc);
 	next_other = next_sensor = ao_adc_ring[ao_log_adc_pos].tick;
 	ao_log_state = ao_flight_startup;
 	for (;;) {
 		/* Write samples to EEPROM */
-		while (ao_log_adc_pos != ao_flight_adc) {
+		while (ao_log_adc_pos != ao_sample_adc) {
 			log.tick = ao_adc_ring[ao_log_adc_pos].tick;
 			if ((int16_t) (log.tick - next_sensor) >= 0) {
 				log.type = AO_LOG_SENSOR;
@@ -126,7 +126,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_tick;
+			log.tick = ao_sample_tick;
 			log.u.state.state = ao_log_state;
 			log.u.state.reason = 0;
 			ao_log_data(&log);