X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc1120.c;h=4df931b5094b0349b9c903f768170dc21553f89f;hb=583458772746317b98fced907ec780edff465888;hp=a36d922c15ac27bca4d28e75418e39665d2771d0;hpb=fb60d87b02c0fc83a0b4268212f0b6b740c984e3;p=fw%2Faltos

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index a36d922c..4df931b5 100644
--- 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
 
-const uint32_t	ao_radio_cal = 0x6ca333;
+extern const uint32_t	ao_radio_cal;
 
 #define FOSC	32000000
 
@@ -515,7 +515,7 @@ ao_radio_rdf_abort(void)
 }
 
 static void
-ao_radio_test(void)
+ao_radio_test_cmd(void)
 {
 	uint8_t	mode = 2;
 	uint8_t radio_on;
@@ -729,7 +729,7 @@ ao_radio_recv(__xdata void *d, uint8_t size)
 
 	/* Convert from 'real' rssi to cc1111-style values */
 
-	rssi = (((int8_t) ao_radio_reg_read(CC1120_RSSI1)) + 74) * 2;
+	rssi = AO_RADIO_FROM_RSSI(ao_radio_reg_read(CC1120_RSSI1));
 
 	ao_radio_put();
 
@@ -998,7 +998,7 @@ ao_radio_test_recv()
 			printf ("CRC OK");
 		else
 			printf ("CRC BAD");
-		printf (" RSSI %d", (int16_t) ((int8_t) bytes[32] >> 1) - 74);
+		printf (" RSSI %d", AO_RSSI_FROM_RADIO(bytes[32]));
 		for (b = 0; b < 32; b++)
 			printf (" %02x", bytes[b]);
 		printf ("\n");
@@ -1008,7 +1008,7 @@ ao_radio_test_recv()
 #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" },