projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
core
/
ao.h
diff --git
a/src/core/ao.h
b/src/core/ao.h
index 9d80148937d5d7e8e2ae6f5a372feae759d1bad6..e559e876b0209c62eece17b66785ca6e153606de 100644
(file)
--- a/
src/core/ao.h
+++ b/
src/core/ao.h
@@
-119,11
+119,13
@@
ao_clock_init(void);
* ao_mutex.c
*/
* 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;
void
ao_mutex_get(__xdata uint8_t *ao_mutex) __reentrant;
void
ao_mutex_put(__xdata uint8_t *ao_mutex) __reentrant;
+#endif
/*
* ao_cmd.c
/*
* ao_cmd.c
@@
-270,11
+272,13
@@
ao_temp_to_dC(int16_t temp) __reentrant;
* Convert between pressure in Pa and altitude in meters
*/
* Convert between pressure in Pa and altitude in meters
*/
-int32_t
+#include <ao_data.h>
+
+alt_t
ao_pa_to_altitude(int32_t pa);
int32_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 <ao_dbg.h>
#if HAS_DBG
#include <ao_dbg.h>