X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_log_metrum.c;h=18fb9ffbd1e569c3f41bb15095d60aedbf424923;hb=HEAD;hp=afb8f637d292316a393aa4db5e70d056166c435a;hpb=83929cd290279963b01b2ccd52c70d61bdeff6b0;p=fw%2Faltos

diff --git a/src/kernel/ao_log_metrum.c b/src/kernel/ao_log_metrum.c
index afb8f637..915b48ac 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;
+	AO_TICK_TYPE	next_sensor, next_other;
 
 	ao_storage_setup();
 
@@ -46,14 +46,14 @@ ao_log(void)
 		ao_sleep(&ao_log_running);
 
 #if HAS_FLIGHT
-	log.type = AO_LOG_FLIGHT;
-	log.tick = ao_sample_tick;
+	ao_log_data.type = AO_LOG_FLIGHT;
+	ao_log_data.tick = (uint16_t) ao_sample_tick;
 #if HAS_ACCEL
-	log.u.flight.ground_accel = ao_ground_accel;
+	ao_log_data.u.flight.ground_accel = ao_ground_accel;
 #endif
-	log.u.flight.ground_pres = ao_ground_pres;
-	log.u.flight.flight = ao_flight_number;
-	ao_log_write(&log);
+	ao_log_data.u.flight.ground_pres = ao_ground_pres;
+	ao_log_data.u.flight.flight = ao_flight_number;
+	ao_log_write(&ao_log_data);
 #endif
 
 	/* Write the whole contents of the ring to the log
@@ -65,29 +65,30 @@ ao_log(void)
 	for (;;) {
 		/* Write samples to EEPROM */
 		while (ao_log_data_pos != ao_data_head) {
-			log.tick = ao_data_ring[ao_log_data_pos].tick;
-			if ((int16_t) (log.tick - next_sensor) >= 0) {
-				log.type = AO_LOG_SENSOR;
+			AO_TICK_TYPE tick = ao_data_ring[ao_log_data_pos].tick;
+			ao_log_data.tick = (uint16_t) tick;
+			if ((AO_TICK_SIGNED) (tick - next_sensor) >= 0) {
+				ao_log_data.type = AO_LOG_SENSOR;
 #if HAS_MS5607
-				log.u.sensor.pres = ao_data_ring[ao_log_data_pos].ms5607_raw.pres;
-				log.u.sensor.temp = ao_data_ring[ao_log_data_pos].ms5607_raw.temp;
+				ao_log_data.u.sensor.pres = ao_data_ring[ao_log_data_pos].ms5607_raw.pres;
+				ao_log_data.u.sensor.temp = ao_data_ring[ao_log_data_pos].ms5607_raw.temp;
 #endif
 #if HAS_ACCEL
-				log.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]);
+				ao_log_data.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]);
 #endif
-				ao_log_write(&log);
+				ao_log_write(&ao_log_data);
 				if (ao_log_state <= ao_flight_coast)
-					next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;
+					next_sensor = tick + AO_SENSOR_INTERVAL_ASCENT;
 				else
-					next_sensor = log.tick + AO_SENSOR_INTERVAL_DESCENT;
+					next_sensor = tick + AO_SENSOR_INTERVAL_DESCENT;
 			}
-			if ((int16_t) (log.tick - next_other) >= 0) {
-				log.type = AO_LOG_TEMP_VOLT;
-				log.u.volt.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
-				log.u.volt.sense_a = ao_data_ring[ao_log_data_pos].adc.sense_a;
-				log.u.volt.sense_m = ao_data_ring[ao_log_data_pos].adc.sense_m;
-				ao_log_write(&log);
-				next_other = log.tick + AO_OTHER_INTERVAL;
+			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 = tick + AO_OTHER_INTERVAL;
 			}
 			ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
 		}
@@ -95,11 +96,11 @@ ao_log(void)
 		/* Write state change to EEPROM */
 		if (ao_flight_state != ao_log_state) {
 			ao_log_state = ao_flight_state;
-			log.type = AO_LOG_STATE;
-			log.tick = ao_time();
-			log.u.state.state = ao_log_state;
-			log.u.state.reason = 0;
-			ao_log_write(&log);
+			ao_log_data.type = AO_LOG_STATE;
+			ao_log_data.tick = (uint16_t) ao_time();
+			ao_log_data.u.state.state = ao_log_state;
+			ao_log_data.u.state.reason = 0;
+			ao_log_write(&ao_log_data);
 
 			if (ao_log_state == ao_flight_landed)
 				ao_log_stop();