projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add stack-guard code. Uses STM MPU to trap stack overflow.
[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..55fe6e7da0e3a0ad5c4110b41f2722fc756bbc87 100644
(file)
--- a/
src/core/ao_convert_pa.c
+++ b/
src/core/ao_convert_pa.c
@@
-19,14
+19,22
@@
#include "ao.h"
#endif
#include "ao.h"
#endif
-static const int32_t altitude_table[] = {
+#ifndef AO_CONST_ATTRIB
+#define AO_CONST_ATTRIB
+#endif
+
+static const alt_t altitude_table[] AO_CONST_ATTRIB = {
#include "altitude-pa.h"
};
#include "altitude-pa.h"
};
+#ifndef FETCH_ALT
+#define FETCH_ALT(o) altitude_table[o]
+#endif
+
#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,11
+48,12
@@
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;
}
+#ifdef AO_CONVERT_TEST
int32_t
ao_altitude_to_pa(int32_t alt)
{
int32_t
ao_altitude_to_pa(int32_t alt)
{
@@
-70,3
+79,4
@@
ao_altitude_to_pa(int32_t alt)
pa = 0;
return pa;
}
pa = 0;
return pa;
}
+#endif