projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/test: Make aprs test code compile again
[fw/altos]
/
src
/
kernel
/
ao_convert.c
diff --git
a/src/kernel/ao_convert.c
b/src/kernel/ao_convert.c
index aa9b5f484b438e0871aa395a1cd37d7979237a11..db1f2301d2c9ecaffc18b0f67f661b08b74d683a 100644
(file)
--- a/
src/kernel/ao_convert.c
+++ b/
src/kernel/ao_convert.c
@@
-19,14
+19,16
@@
#include "ao.h"
#endif
#include "ao.h"
#endif
-static const int16_t altitude_table[] = {
+#include <ao_sample.h>
+
+static const ao_v_t altitude_table[] = {
#include "altitude.h"
};
#define ALT_FRAC_SCALE (1 << ALT_FRAC_BITS)
#define ALT_FRAC_MASK (ALT_FRAC_SCALE - 1)
#include "altitude.h"
};
#define ALT_FRAC_SCALE (1 << ALT_FRAC_BITS)
#define ALT_FRAC_MASK (ALT_FRAC_SCALE - 1)
-
int16
_t
+
ao_v
_t
ao_pres_to_altitude(int16_t pres) __reentrant
{
uint8_t o;
ao_pres_to_altitude(int16_t pres) __reentrant
{
uint8_t o;
@@
-43,9
+45,9
@@
ao_pres_to_altitude(int16_t pres) __reentrant
#if AO_NEED_ALTITUDE_TO_PRES
int16_t
#if AO_NEED_ALTITUDE_TO_PRES
int16_t
-ao_altitude_to_pres(
int16
_t alt) __reentrant
+ao_altitude_to_pres(
ao_v
_t alt) __reentrant
{
{
-
int16
_t span, sub_span;
+
ao_v
_t span, sub_span;
uint8_t l, h, m;
int32_t pres;
uint8_t l, h, m;
int32_t pres;