X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao.h;h=e559e876b0209c62eece17b66785ca6e153606de;hb=7751c9cbc630f7251b8988f8da68be9a54ff552c;hp=9d80148937d5d7e8e2ae6f5a372feae759d1bad6;hpb=6a3ee911353291b04e161d50a181ed4211d467a2;p=fw%2Faltos diff --git a/src/core/ao.h b/src/core/ao.h index 9d801489..e559e876 100644 --- a/src/core/ao.h +++ b/src/core/ao.h @@ -119,11 +119,13 @@ ao_clock_init(void); * ao_mutex.c */ +#ifndef ao_mutex_get void ao_mutex_get(__xdata uint8_t *ao_mutex) __reentrant; void ao_mutex_put(__xdata uint8_t *ao_mutex) __reentrant; +#endif /* * ao_cmd.c @@ -270,11 +272,13 @@ ao_temp_to_dC(int16_t temp) __reentrant; * Convert between pressure in Pa and altitude in meters */ -int32_t +#include + +alt_t ao_pa_to_altitude(int32_t pa); int32_t -ao_altitude_to_pa(int32_t alt); +ao_altitude_to_pa(alt_t alt); #if HAS_DBG #include