projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Move MS5607 info from 'v' to 'c s'
[fw/altos]
/
src
/
core
/
ao.h
diff --git
a/src/core/ao.h
b/src/core/ao.h
index 6c790f69046cf7fefb94ac37224a9c6fccca2195..71bfb6a1f880d36988788b8e4a99e36fcf8c1ed6 100644
(file)
--- a/
src/core/ao.h
+++ b/
src/core/ao.h
@@
-45,6
+45,8
@@
#if HAS_TASK
#include <ao_task.h>
#if HAS_TASK
#include <ao_task.h>
+#else
+#include <ao_notask.h>
#endif
/*
#endif
/*
@@
-94,7
+96,7
@@
extern volatile __data AO_TICK_TYPE ao_tick_count;
#define AO_SEC_TO_TICKS(s) ((s) * AO_HERTZ)
/* Returns the current time in ticks */
#define AO_SEC_TO_TICKS(s) ((s) * AO_HERTZ)
/* Returns the current time in ticks */
-uint16_t
+AO_TICK_TYPE
ao_time(void);
/* Suspend the current task until ticks time has passed */
ao_time(void);
/* Suspend the current task until ticks time has passed */
@@
-144,6
+146,9
@@
extern __pdata uint32_t ao_cmd_lex_u32;
extern __pdata char ao_cmd_lex_c;
extern __pdata enum ao_cmd_status ao_cmd_status;
extern __pdata char ao_cmd_lex_c;
extern __pdata enum ao_cmd_status ao_cmd_status;
+void
+ao_put_string(__code char *s);
+
void
ao_cmd_lex(void);
void
ao_cmd_lex(void);
@@
-374,6
+379,9
@@
ao_gps_print(__xdata struct ao_gps_orig *gps_data);
void
ao_gps_tracking_print(__xdata struct ao_gps_tracking_orig *gps_tracking_data);
void
ao_gps_tracking_print(__xdata struct ao_gps_tracking_orig *gps_tracking_data);
+void
+ao_gps_show(void) __reentrant;
+
void
ao_gps_init(void);
void
ao_gps_init(void);
@@
-508,6
+516,8
@@
ao_telemetry_tiny_init(void);
extern __xdata uint8_t ao_radio_dma;
extern __xdata uint8_t ao_radio_dma;
+extern __xdata int8_t ao_radio_rssi;
+
#ifdef PKT_APPEND_STATUS_1_CRC_OK
#define AO_RADIO_STATUS_CRC_OK PKT_APPEND_STATUS_1_CRC_OK
#else
#ifdef PKT_APPEND_STATUS_1_CRC_OK
#define AO_RADIO_STATUS_CRC_OK PKT_APPEND_STATUS_1_CRC_OK
#else
@@
-532,7
+542,7
@@
ao_radio_send(const __xdata void *d, uint8_t size) __reentrant;
#if HAS_RADIO_RECV
uint8_t
#if HAS_RADIO_RECV
uint8_t
-ao_radio_recv(__xdata void *d, uint8_t size) __reentrant;
+ao_radio_recv(__xdata void *d, uint8_t size
, uint8_t timeout
) __reentrant;
void
ao_radio_recv_abort(void);
void
ao_radio_recv_abort(void);