projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Don't delete telemetrum-outline.pdf
[fw/altos]
/
src
/
ao_monitor.c
diff --git
a/src/ao_monitor.c
b/src/ao_monitor.c
index f019d3b431a0481af12620280e58b8e87f845624..4ba3da6d848949b27e31495bbde9af68fb56c9eb 100644
(file)
--- a/
src/ao_monitor.c
+++ b/
src/ao_monitor.c
@@
-23,7
+23,7
@@
__pdata uint8_t ao_monitor_led;
void
ao_monitor(void)
{
void
ao_monitor(void)
{
- __xdata struct ao_
radio
_recv recv;
+ __xdata struct ao_
telemetry
_recv recv;
__xdata char callsign[AO_MAX_CALLSIGN+1];
uint8_t state;
int16_t rssi;
__xdata char callsign[AO_MAX_CALLSIGN+1];
uint8_t state;
int16_t rssi;
@@
-31,7
+31,7
@@
ao_monitor(void)
for (;;) {
__critical while (!ao_monitoring)
ao_sleep(&ao_monitoring);
for (;;) {
__critical while (!ao_monitoring)
ao_sleep(&ao_monitoring);
- if (!ao_radio_recv(&recv))
+ if (!ao_radio_recv(&recv
, sizeof (recv)
))
continue;
state = recv.telemetry.flight_state;
continue;
state = recv.telemetry.flight_state;
@@
-41,10
+41,10
@@
ao_monitor(void)
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
- printf("VERSION %d CALL %s SERIAL %
3
d FLIGHT %5u RSSI %4d STATUS %02x STATE %7s ",
+ printf("VERSION %d CALL %s SERIAL %d FLIGHT %5u RSSI %4d STATUS %02x STATE %7s ",
AO_TELEMETRY_VERSION,
callsign,
AO_TELEMETRY_VERSION,
callsign,
- recv.telemetry.
addr
,
+ recv.telemetry.
serial
,
recv.telemetry.flight,
rssi, recv.status,
ao_state_names[state]);
recv.telemetry.flight,
rssi, recv.status,
ao_state_names[state]);
@@
-85,7
+85,7
@@
ao_set_monitor(uint8_t monitoring)
ao_monitoring = monitoring;
ao_wakeup(&ao_monitoring);
if (!ao_monitoring)
ao_monitoring = monitoring;
ao_wakeup(&ao_monitoring);
if (!ao_monitoring)
- ao_radio_abort();
+ ao_radio_
recv_
abort();
}
static void
}
static void