diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-08-14 17:08:36 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-08-14 17:08:36 -0600 |
| commit | 4828be0ca5252ac9cd6061209385dcd6c4c57965 (patch) | |
| tree | dde4f86d893d280fbeef284120d6f967cdbfeaa5 /src/kernel/ao.h | |
| parent | 17e894d1b65231d07df009bc4e8ca92864ccf790 (diff) | |
| parent | 165b7dcf6fba90b15ff32b891cba4b9111c1965b (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/kernel/ao.h')
| -rw-r--r-- | src/kernel/ao.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/kernel/ao.h b/src/kernel/ao.h index a225bc4a..ad5bbf8e 100644 --- a/src/kernel/ao.h +++ b/src/kernel/ao.h @@ -278,15 +278,17 @@ ao_report_init(void); * Given raw data, convert to SI units */ +#if HAS_BARO /* pressure from the sensor to altitude in meters */ -int16_t -ao_pres_to_altitude(int16_t pres) __reentrant; +alt_t +ao_pres_to_altitude(pres_t pres) __reentrant; -int16_t -ao_altitude_to_pres(int16_t alt) __reentrant; +pres_t +ao_altitude_to_pres(alt_t alt) __reentrant; int16_t ao_temp_to_dC(int16_t temp) __reentrant; +#endif /* * ao_convert_pa.c @@ -296,11 +298,13 @@ ao_temp_to_dC(int16_t temp) __reentrant; #include <ao_data.h> +#if HAS_BARO alt_t -ao_pa_to_altitude(int32_t pa); +ao_pa_to_altitude(pres_t pa); int32_t ao_altitude_to_pa(alt_t alt); +#endif #if HAS_DBG #include <ao_dbg.h> |