projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eliminate RDF tone generation.
[fw/altos]
/
ao.h
diff --git
a/ao.h
b/ao.h
index 96dd02d00509ae52761ebe13c718cd5530ff298b..1f32ba50f4f0df2ffc3983fd5133d2323cb2070f 100644
(file)
--- a/
ao.h
+++ b/
ao.h
@@
-23,6
+23,9
@@
#include <string.h>
#include "cc1111.h"
#include <string.h>
#include "cc1111.h"
+#define TRUE 1
+#define FALSE 0
+
/* Convert a __data pointer into an __xdata pointer */
#define DATA_TO_XDATA(a) ((void __xdata *) ((uint8_t) (a) | 0xff00))
/* Convert a __data pointer into an __xdata pointer */
#define DATA_TO_XDATA(a) ((void __xdata *) ((uint8_t) (a) | 0xff00))
@@
-565,6
+568,7
@@
extern __pdata enum ao_flight_state ao_flight_state;
extern __pdata uint16_t ao_flight_tick;
extern __pdata int16_t ao_flight_accel;
extern __pdata int16_t ao_flight_pres;
extern __pdata uint16_t ao_flight_tick;
extern __pdata int16_t ao_flight_accel;
extern __pdata int16_t ao_flight_pres;
+extern __pdata int32_t ao_flight_vel;
extern __pdata int16_t ao_ground_pres;
extern __pdata int16_t ao_ground_accel;
extern __pdata int16_t ao_min_pres;
extern __pdata int16_t ao_ground_pres;
extern __pdata int16_t ao_ground_accel;
extern __pdata int16_t ao_min_pres;
@@
-720,6
+724,11
@@
ao_gps_report_init(void);
struct ao_telemetry {
uint8_t addr;
uint8_t flight_state;
struct ao_telemetry {
uint8_t addr;
uint8_t flight_state;
+ int16_t flight_accel;
+ int16_t ground_accel;
+ int32_t flight_vel;
+ int16_t flight_pres;
+ int16_t ground_pres;
struct ao_adc adc;
struct ao_gps_data gps;
char callsign[AO_MAX_CALLSIGN];
struct ao_adc adc;
struct ao_gps_data gps;
char callsign[AO_MAX_CALLSIGN];
@@
-734,9
+743,6
@@
struct ao_telemetry {
void
ao_telemetry_set_interval(uint16_t interval);
void
ao_telemetry_set_interval(uint16_t interval);
-void
-ao_rdf_set(uint8_t rdf);
-
void
ao_telemetry_init(void);
void
ao_telemetry_init(void);
@@
-756,12
+762,6
@@
struct ao_radio_recv {
void
ao_radio_recv(__xdata struct ao_radio_recv *recv) __reentrant;
void
ao_radio_recv(__xdata struct ao_radio_recv *recv) __reentrant;
-void
-ao_radio_rdf(void);
-
-void
-ao_radio_rdf_abort(void);
-
void
ao_radio_init(void);
void
ao_radio_init(void);
@@
-775,7
+775,10
@@
void
ao_monitor(void);
void
ao_monitor(void);
void
-ao_monitor_init(uint8_t led);
+ao_set_monitor(uint8_t monitoring);
+
+void
+ao_monitor_init(uint8_t led, uint8_t monitoring) __reentrant;
/*
* ao_stdio.c
/*
* ao_stdio.c