X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_data.h;h=b49d6a558db2b3b2eb0e18d6c950f42f5e4e04b5;hb=d80c1317f596f73d192e6fbb33c3579d54802182;hp=1b5f9d10ff0897dea9132b760eec5c6eb813d205;hpb=7f46240dfc57164f0c1b0c4c4ed9695bca63860d;p=fw%2Faltos

diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h
index 1b5f9d10..b49d6a55 100644
--- a/src/kernel/ao_data.h
+++ b/src/kernel/ao_data.h
@@ -182,6 +182,10 @@ extern volatile uint8_t		ao_data_count;
 
 #endif /* AO_DATA_RING */
 
+#define AO_ALT_TYPE	int32_t
+
+typedef AO_ALT_TYPE	alt_t;
+
 #if !HAS_BARO && HAS_MS5607
 
 /* Either an MS5607 or an MS5611 hooked to a SPI port
@@ -191,14 +195,10 @@ extern volatile uint8_t		ao_data_count;
 
 typedef int32_t	pres_t;
 
-#define AO_ALT_TYPE	int32_t
-
-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))