X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_log_metrum.c;h=8091e6c63ccd5b9a504f77f2ad7a4ce646d695b1;hb=4aa984bbcce1cdc4f4b82516a9f2a32cf5061dfa;hp=347290706db23d6e962b934449a9fac305901c3b;hpb=2f61ef9a5046c39f4eeaaf741031bb6a9607b8a6;p=fw%2Faltos

diff --git a/src/kernel/ao_log_metrum.c b/src/kernel/ao_log_metrum.c
index 34729070..8091e6c6 100644
--- a/src/kernel/ao_log_metrum.c
+++ b/src/kernel/ao_log_metrum.c
@@ -22,7 +22,7 @@
 #include <ao_flight.h>
 
 #if HAS_ADC
-static __data uint8_t	ao_log_data_pos;
+static uint8_t	ao_log_data_pos;
 
 /* a hack to make sure that ao_log_metrums fill the eeprom block in even units */
 typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_metrum))] ;
@@ -36,7 +36,7 @@ typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_metrum))] ;
 void
 ao_log(void)
 {
-	__pdata uint16_t	next_sensor, next_other;
+	uint16_t	next_sensor, next_other;
 
 	ao_storage_setup();
 
@@ -65,8 +65,9 @@ ao_log(void)
 	for (;;) {
 		/* Write samples to EEPROM */
 		while (ao_log_data_pos != ao_data_head) {
-			ao_log_data.tick = ao_data_ring[ao_log_data_pos].tick;
-			if ((int16_t) (ao_log_data.tick - next_sensor) >= 0) {
+			AO_TICK_TYPE tick = ao_data_ring[ao_log_data_pos].tick;
+			ao_log_data.tick = tick;
+			if ((AO_TICK_SIGNED) (tick - next_sensor) >= 0) {
 				ao_log_data.type = AO_LOG_SENSOR;
 #if HAS_MS5607
 				ao_log_data.u.sensor.pres = ao_data_ring[ao_log_data_pos].ms5607_raw.pres;
@@ -77,17 +78,17 @@ ao_log(void)
 #endif
 				ao_log_write(&ao_log_data);
 				if (ao_log_state <= ao_flight_coast)
-					next_sensor = ao_log_data.tick + AO_SENSOR_INTERVAL_ASCENT;
+					next_sensor = tick + AO_SENSOR_INTERVAL_ASCENT;
 				else
-					next_sensor = ao_log_data.tick + AO_SENSOR_INTERVAL_DESCENT;
+					next_sensor = tick + AO_SENSOR_INTERVAL_DESCENT;
 			}
-			if ((int16_t) (ao_log_data.tick - next_other) >= 0) {
+			if ((AO_TICK_SIGNED) (tick - next_other) >= 0) {
 				ao_log_data.type = AO_LOG_TEMP_VOLT;
 				ao_log_data.u.volt.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
 				ao_log_data.u.volt.sense_a = ao_data_ring[ao_log_data_pos].adc.sense_a;
 				ao_log_data.u.volt.sense_m = ao_data_ring[ao_log_data_pos].adc.sense_m;
 				ao_log_write(&ao_log_data);
-				next_other = ao_log_data.tick + AO_OTHER_INTERVAL;
+				next_other = tick + AO_OTHER_INTERVAL;
 			}
 			ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
 		}