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

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index c974613e..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
 
@@ -160,7 +160,7 @@ ao_radio_fifo_read(uint8_t *data, uint8_t len)
 }
 
 static uint8_t
-ao_radio_fifo_write(uint8_t *data, uint8_t len)
+ao_radio_fifo_write_start(void)
 {
 	uint8_t	addr = ((0 << CC1120_READ)  |
 			(1 << CC1120_BURST) |
@@ -169,24 +169,28 @@ ao_radio_fifo_write(uint8_t *data, uint8_t len)
 
 	ao_radio_select();
 	ao_radio_duplex(&addr, &status, 1);
-	ao_radio_spi_send(data, len);
+	return status;
+}
+
+static inline uint8_t ao_radio_fifo_write_stop(uint8_t status) {
 	ao_radio_deselect();
 	return status;
 }
 
 static uint8_t
-ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
+ao_radio_fifo_write(uint8_t *data, uint8_t len)
 {
-	uint8_t	addr = ((0 << CC1120_READ)  |
-			(1 << CC1120_BURST) |
-			CC1120_FIFO);
-	uint8_t status;
+	uint8_t	status = ao_radio_fifo_write_start();
+	ao_radio_spi_send(data, len);
+	return ao_radio_fifo_write_stop(status);
+}
 
-	ao_radio_select();
-	ao_radio_duplex(&addr, &status, 1);
+static uint8_t
+ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
+{
+	uint8_t status = ao_radio_fifo_write_start();
 	ao_radio_spi_send_fixed(data, len);
-	ao_radio_deselect();
-	return status;
+	return ao_radio_fifo_write_stop(status);
 }
 
 static uint8_t
@@ -446,19 +450,20 @@ ao_radio_get(uint8_t len)
 
 #define ao_radio_put()	ao_mutex_put(&ao_radio_mutex)
 
-void
-ao_radio_rdf(uint8_t len)
+static void
+ao_rdf_start(uint8_t len)
 {
-	int i;
-
 	ao_radio_abort = 0;
 	ao_radio_get(len);
 
 	ao_radio_set_mode(AO_RADIO_MODE_RDF);
 	ao_radio_wake = 0;
 
-	ao_radio_fifo_write_fixed(ao_radio_rdf_value, len);
+}
 
+static void
+ao_rdf_run(void)
+{
 	ao_radio_start_tx();
 
 	cli();
@@ -470,6 +475,38 @@ ao_radio_rdf(uint8_t len)
 	ao_radio_put();
 }
 
+void
+ao_radio_rdf(void)
+{
+	ao_rdf_start(AO_RADIO_RDF_LEN);
+
+	ao_radio_fifo_write_fixed(ao_radio_rdf_value, AO_RADIO_RDF_LEN);
+
+	ao_rdf_run();
+}
+
+void
+ao_radio_continuity(uint8_t c)
+{
+	uint8_t	i;
+	uint8_t status;
+
+	ao_rdf_start(AO_RADIO_CONT_TOTAL_LEN);
+
+	status = ao_radio_fifo_write_start();
+	for (i = 0; i < 3; i++) {
+		ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_PAUSE_LEN);
+		if (i < c)
+			ao_radio_spi_send_fixed(ao_radio_rdf_value, AO_RADIO_CONT_TONE_LEN);
+		else
+			ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_TONE_LEN);
+	}
+	ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_PAUSE_LEN);
+	status = ao_radio_fifo_write_stop(status);
+	(void) status;
+	ao_rdf_run();
+}
+
 void
 ao_radio_rdf_abort(void)
 {
@@ -478,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;
@@ -605,8 +642,10 @@ ao_radio_rx_isr(void)
 			rx_data[rx_data_cur++] = d;
 		if (rx_waiting && rx_data_cur - rx_data_consumed >= AO_FEC_DECODE_BLOCK) {
 #if AO_PROFILE
-			if (rx_data_consumed == 0)
+			if (!rx_packet_tick)
 				rx_packet_tick = ao_profile_tick();
+			if (rx_data_cur < rx_data_count)
+				return;
 #endif
 			rx_waiting = 0;
 			ao_wakeup(&ao_radio_wake);
@@ -630,6 +669,9 @@ ao_radio_rx_wait(void)
 	if (ao_radio_abort)
 		return 0;
 	rx_data_consumed += AO_FEC_DECODE_BLOCK;
+#if AO_PROFILE
+	return rx_data_cur - rx_data_consumed;
+#endif
 	return AO_FEC_DECODE_BLOCK;
 }
 
@@ -649,6 +691,7 @@ ao_radio_recv(__xdata void *d, uint8_t size)
 	}
 #if AO_PROFILE
 	rx_start_tick = ao_profile_tick();
+	rx_packet_tick = 0;
 #endif
 	len = size + 2;			/* CRC bytes */
 	len += 1 + ~(len & 1);		/* 1 or two pad bytes */
@@ -686,16 +729,11 @@ 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();
 
-	/* Construct final packet */
-
-	if (ret && ((uint8_t *) d)[size] == 0 && ((uint8_t *)d)[size+1] == 0)
-		((uint8_t *) d)[size + 1] = 0x80;
-	else
-		((uint8_t *) d)[size + 1] = 0x00;
+	/* Store the received RSSI value; the crc-OK byte is already done */
 
 	((uint8_t *) d)[size] = (uint8_t) rssi;
 
@@ -960,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");
@@ -970,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" },