projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Use alt_t for all Pascal-based altitude data
[fw/altos]
/
src
/
core
/
ao_convert_pa.c
diff --git
a/src/core/ao_convert_pa.c
b/src/core/ao_convert_pa.c
index 0c93caea60550acd80dac0a879453774fd532050..1413681d9f9b7c591f6cc5069978bca4e033d1ed 100644
(file)
--- a/
src/core/ao_convert_pa.c
+++ b/
src/core/ao_convert_pa.c
@@
-26,7
+26,7
@@
static const int32_t altitude_table[] = {
#define ALT_SCALE (1 << ALT_SHIFT)
#define ALT_MASK (ALT_SCALE - 1)
#define ALT_SCALE (1 << ALT_SHIFT)
#define ALT_MASK (ALT_SCALE - 1)
-
int32
_t
+
alt
_t
ao_pa_to_altitude(int32_t pa)
{
int16_t o;
ao_pa_to_altitude(int32_t pa)
{
int16_t o;
@@
-40,8
+40,8
@@
ao_pa_to_altitude(int32_t pa)
o = pa >> ALT_SHIFT;
part = pa & ALT_MASK;
o = pa >> ALT_SHIFT;
part = pa & ALT_MASK;
- low = (
int32_t) altitude_table[o]
* (ALT_SCALE - part);
- high = (
int32_t) altitude_table[o+1]
* part + (ALT_SCALE >> 1);
+ low = (
alt_t) FETCH_ALT(o)
* (ALT_SCALE - part);
+ high = (
alt_t) FETCH_ALT(o+1)
* part + (ALT_SCALE >> 1);
return (low + high) >> ALT_SHIFT;
}
return (low + high) >> ALT_SHIFT;
}