projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Relabel packet receive status line for TeleFire boxes
[fw/altos]
/
src
/
drivers
/
ao_pad.c
diff --git
a/src/drivers/ao_pad.c
b/src/drivers/ao_pad.c
index eeb9b5052937b9df35352e4d4df8dbfcb2f98013..b415355838ac657c4242bb08154aabc075e8cc77 100644
(file)
--- a/
src/drivers/ao_pad.c
+++ b/
src/drivers/ao_pad.c
@@
-378,7
+378,7
@@
ao_pad(void)
while (ao_pad_disabled)
ao_sleep(&ao_pad_disabled);
ret = ao_radio_cmac_recv(&command, sizeof (command), 0);
while (ao_pad_disabled)
ao_sleep(&ao_pad_disabled);
ret = ao_radio_cmac_recv(&command, sizeof (command), 0);
- PRINTD ("cmac_recv
%d
%d\n", ret, ao_radio_cmac_rssi);
+ PRINTD ("cmac_recv
status %d rssi
%d\n", ret, ao_radio_cmac_rssi);
if (ret != AO_RADIO_CMAC_OK)
continue;
ao_pad_packet_time = ao_time();
if (ret != AO_RADIO_CMAC_OK)
continue;
ao_pad_packet_time = ao_time();
@@
-406,6
+406,10
@@
ao_pad(void)
PRINTD ("time difference too large %d\n", time_difference);
break;
}
PRINTD ("time difference too large %d\n", time_difference);
break;
}
+ if (query.arm_status != AO_PAD_ARM_STATUS_ARMED) {
+ PRINTD ("box not armed locally\n");
+ break;
+ }
PRINTD ("armed\n");
ao_pad_armed = command.channels;
ao_pad_arm_time = ao_time();
PRINTD ("armed\n");
ao_pad_armed = command.channels;
ao_pad_arm_time = ao_time();