projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Rename telemetry to telemetry_orig
[fw/altos]
/
src
/
ao.h
diff --git
a/src/ao.h
b/src/ao.h
index 226f9a2248dd0425ebed6bf27593d245ce796384..b6a987e302f1bc1b2b13a70214dd1a35a284cfe1 100644
(file)
--- a/
src/ao.h
+++ b/
src/ao.h
@@
-1079,10
+1079,11
@@
struct ao_telemetry_tiny {
/*
* ao_radio_recv tacks on rssi and status bytes
*/
/*
* ao_radio_recv tacks on rssi and status bytes
*/
-struct ao_telemetry_recv {
- struct ao_telemetry telemetry;
- int8_t rssi;
- uint8_t status;
+
+struct ao_telemetry_orig_recv {
+ struct ao_telemetry_orig telemetry_orig;
+ int8_t rssi;
+ uint8_t status;
};
struct ao_telemetry_tiny_recv {
};
struct ao_telemetry_tiny_recv {
@@
-1104,7
+1105,7
@@
void
ao_rdf_set(uint8_t rdf);
void
ao_rdf_set(uint8_t rdf);
void
-ao_telemetry_init(void);
+ao_telemetry_
orig_
init(void);
void
ao_telemetry_tiny_init(void);
void
ao_telemetry_tiny_init(void);
@@
-1160,7
+1161,7
@@
void
ao_monitor(void);
#define AO_MONITORING_OFF 0
ao_monitor(void);
#define AO_MONITORING_OFF 0
-#define AO_MONITORING_
FULL
1
+#define AO_MONITORING_
ORIG
1
#define AO_MONITORING_TINY 2
void
#define AO_MONITORING_TINY 2
void
@@
-1367,9
+1368,17
@@
ao_packet_slave_init(uint8_t enable);
/* ao_btm.c */
/* ao_btm.c */
-/* Shared by USB, so the USB code calls this function */
+/* If bt_link is on P2, this interrupt is shared by USB, so the USB
+ * code calls this function. Otherwise, it's a regular ISR.
+ */
+
void
void
-ao_btm_isr(void);
+ao_btm_isr(void)
+#if BT_LINK_ON_P1
+ __interrupt 15
+#endif
+ ;
+
void
ao_btm_init(void);
void
ao_btm_init(void);