X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_data.h;h=0f96cb897bcf521081c89e6007cc56444697ac73;hb=ba0239ca6839605c7ce45d56677bb9a3b782b7f2;hp=1b5f9d10ff0897dea9132b760eec5c6eb813d205;hpb=bdf0671cb36daca741c4842a37a3fc71744a63a2;p=fw%2Faltos diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h index 1b5f9d10..0f96cb89 100644 --- a/src/kernel/ao_data.h +++ b/src/kernel/ao_data.h @@ -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))