projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mjb/master'
[fw/altos]
/
src
/
drivers
/
ao_cc1120.c
diff --git
a/src/drivers/ao_cc1120.c
b/src/drivers/ao_cc1120.c
index 569df3b7c80ad92416130ac6391dda1130f42f18..4df931b5094b0349b9c903f768170dc21553f89f 100644
(file)
--- a/
src/drivers/ao_cc1120.c
+++ b/
src/drivers/ao_cc1120.c
@@
-29,7
+29,7
@@
uint8_t ao_radio_in_recv;
#define CC1120_DEBUG AO_FEC_DEBUG
#define CC1120_TRACE 0
#define CC1120_DEBUG AO_FEC_DEBUG
#define CC1120_TRACE 0
-
const uint32_t ao_radio_cal = 0x6ca333
;
+
extern const uint32_t ao_radio_cal
;
#define FOSC 32000000
#define FOSC 32000000
@@
-515,7
+515,7
@@
ao_radio_rdf_abort(void)
}
static void
}
static void
-ao_radio_test(void)
+ao_radio_test
_cmd
(void)
{
uint8_t mode = 2;
uint8_t radio_on;
{
uint8_t mode = 2;
uint8_t radio_on;
@@
-1008,7
+1008,7
@@
ao_radio_test_recv()
#endif
static const struct ao_cmds ao_radio_cmds[] = {
#endif
static const struct ao_cmds ao_radio_cmds[] = {
- { ao_radio_test
,
"C <1 start, 0 stop, none both>\0Radio carrier test" },
+ { ao_radio_test
_cmd,
"C <1 start, 0 stop, none both>\0Radio carrier test" },
#if CC1120_DEBUG
{ ao_radio_show, "R\0Show CC1120 status" },
{ ao_radio_beep, "b\0Emit an RDF beacon" },
#if CC1120_DEBUG
{ ao_radio_show, "R\0Show CC1120 status" },
{ ao_radio_beep, "b\0Emit an RDF beacon" },