projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make stm-flash capable of switching to application
[fw/altos]
/
src
/
core
/
ao_convert.c
diff --git
a/src/core/ao_convert.c
b/src/core/ao_convert.c
index 0969f107928272e18f04990a428cebc3ba2dcc63..aa9b5f484b438e0871aa395a1cd37d7979237a11 100644
(file)
--- a/
src/core/ao_convert.c
+++ b/
src/core/ao_convert.c
@@
-41,6
+41,7
@@
ao_pres_to_altitude(int16_t pres) __reentrant
(int32_t) altitude_table[o+1] * part + (ALT_FRAC_SCALE >> 1)) >> ALT_FRAC_BITS;
}
(int32_t) altitude_table[o+1] * part + (ALT_FRAC_SCALE >> 1)) >> ALT_FRAC_BITS;
}
+#if AO_NEED_ALTITUDE_TO_PRES
int16_t
ao_altitude_to_pres(int16_t alt) __reentrant
{
int16_t
ao_altitude_to_pres(int16_t alt) __reentrant
{
@@
-66,7
+67,9
@@
ao_altitude_to_pres(int16_t alt) __reentrant
pres = 0;
return (int16_t) pres;
}
pres = 0;
return (int16_t) pres;
}
+#endif
+#if 0
int16_t
ao_temp_to_dC(int16_t temp) __reentrant
{
int16_t
ao_temp_to_dC(int16_t temp) __reentrant
{
@@
-83,3
+86,4
@@
ao_temp_to_dC(int16_t temp) __reentrant
ret = ((temp - 19791) * 1012L) >> 16;
return ret;
}
ret = ((temp - 19791) * 1012L) >> 16;
return ret;
}
+#endif