projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make ao_flight_test show AGL altitude and positive acceleration under boost
[fw/altos]
/
ao_telemetry.c
diff --git
a/ao_telemetry.c
b/ao_telemetry.c
index ffee9beeae70e941d070d892841610b9d8db9265..5299b487bcbd95b00129b7bc4ad1e953096dfb9c 100644
(file)
--- a/
ao_telemetry.c
+++ b/
ao_telemetry.c
@@
-17,13
+17,6
@@
#include "ao.h"
#include "ao.h"
-/* XXX make serial numbers real */
-
-__xdata uint8_t ao_serial_number = 2;
-
-/* XXX make callsigns real */
-__xdata char ao_callsign[AO_MAX_CALLSIGN] = "KD7SQG";
-
__xdata uint16_t ao_telemetry_interval = 0;
__xdata uint8_t ao_rdf = 0;
__xdata uint16_t ao_rdf_time;
__xdata uint16_t ao_telemetry_interval = 0;
__xdata uint8_t ao_rdf = 0;
__xdata uint16_t ao_rdf_time;
@@
-35,8
+28,9
@@
ao_telemetry(void)
{
static __xdata struct ao_telemetry telemetry;
{
static __xdata struct ao_telemetry telemetry;
+ ao_config_get();
+ memcpy(telemetry.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
telemetry.addr = ao_serial_number;
telemetry.addr = ao_serial_number;
- memcpy(telemetry.callsign, ao_callsign, AO_MAX_CALLSIGN);
ao_rdf_time = ao_time();
for (;;) {
while (ao_telemetry_interval == 0)
ao_rdf_time = ao_time();
for (;;) {
while (ao_telemetry_interval == 0)
@@
-53,6
+47,7
@@
ao_telemetry(void)
{
ao_rdf_time = ao_time() + AO_RDF_INTERVAL;
ao_radio_rdf();
{
ao_rdf_time = ao_time() + AO_RDF_INTERVAL;
ao_radio_rdf();
+ ao_delay(ao_telemetry_interval);
}
}
}
}
}
}