projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: struct ao_log_mega doesn't have a ground temp value
[fw/altos]
/
src
/
core
/
ao.h
diff --git
a/src/core/ao.h
b/src/core/ao.h
index 711b3533069ef7127ee49cd0601bb602a94d9945..e559e876b0209c62eece17b66785ca6e153606de 100644
(file)
--- a/
src/core/ao.h
+++ b/
src/core/ao.h
@@
-85,7
+85,9
@@
ao_panic(uint8_t reason);
extern volatile __data AO_TICK_TYPE ao_tick_count;
/* Our timer runs at 100Hz */
extern volatile __data AO_TICK_TYPE ao_tick_count;
/* Our timer runs at 100Hz */
+#ifndef AO_HERTZ
#define AO_HERTZ 100
#define AO_HERTZ 100
+#endif
#define AO_MS_TO_TICKS(ms) ((ms) / (1000 / AO_HERTZ))
#define AO_SEC_TO_TICKS(s) ((s) * AO_HERTZ)
#define AO_MS_TO_TICKS(ms) ((ms) / (1000 / AO_HERTZ))
#define AO_SEC_TO_TICKS(s) ((s) * AO_HERTZ)
@@
-117,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
@@
-268,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>