X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_data.h;h=0f96cb897bcf521081c89e6007cc56444697ac73;hb=acc642801aa5f8c0c05bde134e5924fe957ce023;hp=60794cc2d110878e373aaf808ad54caa5e3339b6;hpb=eb77758b7dcdd0bcef12cd1d56cf4d447cbe5c8c;p=fw%2Faltos

diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h
index 60794cc2..0f96cb89 100644
--- a/src/kernel/ao_data.h
+++ b/src/kernel/ao_data.h
@@ -105,7 +105,7 @@ extern uint8_t			ao_sensor_errors;
 #define AO_DATA_ALL	(AO_DATA_ADC|AO_DATA_MS5607|AO_DATA_MPU6000|AO_DATA_HMC5883|AO_DATA_MMA655X|AO_DATA_MPU9250|AO_DATA_ADXL375|AO_DATA_BMX160|AO_DATA_MMC5983)
 
 struct ao_data {
-	uint16_t			tick;
+	AO_TICK_TYPE			tick;
 #if HAS_ADC
 	struct ao_adc			adc;
 #endif
@@ -198,7 +198,7 @@ typedef AO_ALT_TYPE	alt_t;
 #define ao_data_pres_cook(packet)	ao_ms5607_convert(&packet->ms5607_raw, &packet->ms5607_cooked)
 
 #define ao_data_pres(packet)	((packet)->ms5607_cooked.pres)
-#define ao_data_temp(packet)	((packet)->ms5607_cooked.temp)
+#define ao_data_temp(packet)	((int16_t) (packet)->ms5607_cooked.temp)
 
 #define pres_to_altitude(p)	ao_pa_to_altitude(p)
 
@@ -331,9 +331,9 @@ typedef int16_t accel_t;
 #endif
 
 #if AO_MMA655X_INVERT
-#define ao_data_accel_raw(packet)		(AO_ACCEL_INVERT - (packet)->mma655x)
+#define ao_data_accel_raw(packet)		((accel_t) (AO_ACCEL_INVERT - (packet)->mma655x))
 #else
-#define ao_data_accel_raw(packet)		((packet)->mma655x)
+#define ao_data_accel_raw(packet)		((accel_t) (packet)->mma655x)
 #endif
 #define ao_data_accel_invert(accel)		(AO_ACCEL_INVERT - (accel))