X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_radio.c;h=d7c00213dfac795e312d29004df08b9278d9a8ad;hb=c826fab31f8aea25a942b6bb8435d4b04c1bef10;hp=362b73aa3053c67452ace38ce15fa879aed4d0bb;hpb=07213dc34fa20470a4b36a327a83d75b0f010ebb;p=fw%2Faltos

diff --git a/src/ao_radio.c b/src/ao_radio.c
index 362b73aa..d7c00213 100644
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -217,7 +217,7 @@ static __code uint8_t rdf_setup[] = {
 				 RF_PKTCTRL0_LENGTH_CONFIG_FIXED),
 };
 
-static __code uint8_t telemetry_setup[] = {
+static __code uint8_t fixed_pkt_setup[] = {
 	RF_MDMCFG4_OFF,		((CHANBW_E << RF_MDMCFG4_CHANBW_E_SHIFT) |
 				 (CHANBW_M << RF_MDMCFG4_CHANBW_M_SHIFT) |
 				 (DRATE_E << RF_MDMCFG4_DRATE_E_SHIFT)),
@@ -232,34 +232,8 @@ static __code uint8_t telemetry_setup[] = {
 	RF_DEVIATN_OFF,		((DEVIATION_E << RF_DEVIATN_DEVIATION_E_SHIFT) |
 				 (DEVIATION_M << RF_DEVIATN_DEVIATION_M_SHIFT)),
 
-	/* max packet length */
-	RF_PKTLEN_OFF,		sizeof (struct ao_telemetry),
-	RF_PKTCTRL1_OFF,	((1 << PKTCTRL1_PQT_SHIFT)|
-				 PKTCTRL1_APPEND_STATUS|
-				 PKTCTRL1_ADR_CHK_NONE),
-	RF_PKTCTRL0_OFF,	(RF_PKTCTRL0_WHITE_DATA|
-				 RF_PKTCTRL0_PKT_FORMAT_NORMAL|
-				 RF_PKTCTRL0_CRC_EN|
-				 RF_PKTCTRL0_LENGTH_CONFIG_FIXED),
-};
-
-static __code uint8_t packet_setup[] = {
-	RF_MDMCFG4_OFF,		((CHANBW_E << RF_MDMCFG4_CHANBW_E_SHIFT) |
-				 (CHANBW_M << RF_MDMCFG4_CHANBW_M_SHIFT) |
-				 (DRATE_E << RF_MDMCFG4_DRATE_E_SHIFT)),
-	RF_MDMCFG3_OFF,		(DRATE_M << RF_MDMCFG3_DRATE_M_SHIFT),
-	RF_MDMCFG2_OFF,		(RF_MDMCFG2_DEM_DCFILT_OFF |
-				 RF_MDMCFG2_MOD_FORMAT_GFSK |
-				 RF_MDMCFG2_SYNC_MODE_15_16_THRES),
-	RF_MDMCFG1_OFF,		(RF_MDMCFG1_FEC_EN |
-				 RF_MDMCFG1_NUM_PREAMBLE_4 |
-				 (2 << RF_MDMCFG1_CHANSPC_E_SHIFT)),
-
-	RF_DEVIATN_OFF,		((DEVIATION_E << RF_DEVIATN_DEVIATION_E_SHIFT) |
-				 (DEVIATION_M << RF_DEVIATN_DEVIATION_M_SHIFT)),
-
-	/* max packet length */
-	RF_PKTLEN_OFF,		sizeof (struct ao_packet),
+	/* max packet length -- now set inline */
+	// RF_PKTLEN_OFF,		sizeof (struct ao_telemetry),
 	RF_PKTCTRL1_OFF,	((1 << PKTCTRL1_PQT_SHIFT)|
 				 PKTCTRL1_APPEND_STATUS|
 				 PKTCTRL1_ADR_CHK_NONE),
@@ -290,27 +264,12 @@ ao_radio_general_isr(void) __interrupt 16
 }
 
 void
-ao_radio_set_telemetry(void)
-{
-	uint8_t	i;
-	for (i = 0; i < sizeof (telemetry_setup); i += 2)
-		RF[telemetry_setup[i]] = telemetry_setup[i+1];
-}
-
-void
-ao_radio_set_packet(void)
+ao_radio_set_fixed_pkt(size_t size)
 {
 	uint8_t	i;
-	for (i = 0; i < sizeof (packet_setup); i += 2)
-		RF[packet_setup[i]] = packet_setup[i+1];
-}
-
-void
-ao_radio_set_rdf(void)
-{
-	uint8_t	i;
-	for (i = 0; i < sizeof (rdf_setup); i += 2)
-		RF[rdf_setup[i]] = rdf_setup[i+1];
+	for (i = 0; i < sizeof (fixed_pkt_setup); i += 2)
+		RF[fixed_pkt_setup[i]] = fixed_pkt_setup[i+1];
+	RF[RF_PKTLEN_OFF] = size;
 }
 
 void
@@ -377,8 +336,13 @@ ao_radio_recv(__xdata void *packet, uint8_t size) __reentrant
 			    DMA_CFG1_PRIORITY_HIGH);
 	ao_dma_start(ao_radio_dma);
 	RFST = RFST_SRX;
+
+	/* Wait for DMA to be done, for the radio receive process to
+	 * get aborted or for a receive timeout to fire
+	 */
 	__critical while (!ao_radio_dma_done && !ao_radio_abort)
-			   ao_sleep(&ao_radio_dma_done);
+			   if (ao_sleep(&ao_radio_dma_done))
+				   break;
 
 	/* If recv was aborted, clean up by stopping the DMA engine
 	 * and idling the radio
@@ -447,8 +411,7 @@ ao_radio_rdf(int ms)
 		ao_dma_abort(ao_radio_dma);
 		ao_radio_idle();
 	}
-	for (i = 0; i < sizeof (telemetry_setup); i += 2)
-		RF[telemetry_setup[i]] = telemetry_setup[i+1];
+	ao_radio_set_telemetry();
 	ao_radio_put();
 }
 
@@ -492,8 +455,8 @@ ao_radio_test(void)
 }
 
 __code struct ao_cmds ao_radio_cmds[] = {
-	{ 'C',	ao_radio_test,	"C <1 start, 0 stop, none both>     Radio carrier test" },
-	{ 0,	ao_radio_test,	NULL },
+	{ ao_radio_test,	"C <1 start, 0 stop, none both>\0Radio carrier test" },
+	{ 0,	NULL },
 };
 
 void