projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Make ao_gps_print deal with telem containing 32-bit altitude values
[fw/altos]
/
src
/
kernel
/
ao.h
diff --git
a/src/kernel/ao.h
b/src/kernel/ao.h
index 1df2ea8bfe9ac0a843a275272cac876acdb40d2b..ad5bbf8e76ae152fefaed06eed6758963b8ec0da 100644
(file)
--- a/
src/kernel/ao.h
+++ b/
src/kernel/ao.h
@@
-132,6
+132,9
@@
ao_clock_init(void);
*/
#ifndef ao_mutex_get
*/
#ifndef ao_mutex_get
+uint8_t
+ao_mutex_try(__xdata uint8_t *ao_mutex, uint8_t task_id) __reentrant;
+
void
ao_mutex_get(__xdata uint8_t *ao_mutex) __reentrant;
void
ao_mutex_get(__xdata uint8_t *ao_mutex) __reentrant;
@@
-275,15
+278,17
@@
ao_report_init(void);
* Given raw data, convert to SI units
*/
* Given raw data, convert to SI units
*/
+#if HAS_BARO
/* pressure from the sensor to altitude in meters */
/* 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;
int16_t
ao_temp_to_dC(int16_t temp) __reentrant;
+#endif
/*
* ao_convert_pa.c
/*
* ao_convert_pa.c
@@
-293,11
+298,13
@@
ao_temp_to_dC(int16_t temp) __reentrant;
#include <ao_data.h>
#include <ao_data.h>
+#if HAS_BARO
alt_t
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);
int32_t
ao_altitude_to_pa(alt_t alt);
+#endif
#if HAS_DBG
#include <ao_dbg.h>
#if HAS_DBG
#include <ao_dbg.h>
@@
-521,6
+528,9
@@
struct ao_telemetry_raw_recv {
#define AO_TELEMETRY_INTERVAL_RECOVER AO_MS_TO_TICKS(1000)
#endif
#define AO_TELEMETRY_INTERVAL_RECOVER AO_MS_TO_TICKS(1000)
#endif
+void
+ao_telemetry_reset_interval(void);
+
void
ao_telemetry_set_interval(uint16_t interval);
void
ao_telemetry_set_interval(uint16_t interval);
@@
-558,6
+568,15
@@
extern __xdata int8_t ao_radio_rssi;
#define HAS_RADIO_XMIT HAS_RADIO
#endif
#define HAS_RADIO_XMIT HAS_RADIO
#endif
+#define AO_RADIO_RATE_38400 0
+#define AO_RADIO_RATE_9600 1
+#define AO_RADIO_RATE_2400 2
+#define AO_RADIO_RATE_MAX AO_RADIO_RATE_2400
+
+#if defined(HAS_RADIO) && !defined(HAS_RADIO_RATE)
+#define HAS_RADIO_RATE HAS_RADIO
+#endif
+
void
ao_radio_general_isr(void) ao_arch_interrupt(16);
void
ao_radio_general_isr(void) ao_arch_interrupt(16);