X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_radio.c;h=b2105ff89c41e3add1f5a86aade8d650952ed953;hb=54468e5dc567aaac5c5c20e921859b7cec28bb88;hp=0849349edb1d10a59208aebad7929c523da414f4;hpb=b0b99f30c4e00689e9faceb363a5c7284541c6be;p=fw%2Faltos

diff --git a/src/ao_radio.c b/src/ao_radio.c
index 0849349e..b2105ff8 100644
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -275,7 +275,7 @@ __xdata uint8_t ao_radio_done;
 __xdata uint8_t ao_radio_mutex;
 
 void
-ao_radio_general_isr(void) interrupt 16
+ao_radio_general_isr(void) __interrupt 16
 {
 	S1CON &= ~0x03;
 	if (RFIF & RFIF_IM_TIMEOUT) {
@@ -432,8 +432,11 @@ ao_radio_rdf(int ms)
 void
 ao_radio_abort(void)
 {
-	ao_dma_abort(ao_radio_dma);
-	ao_radio_idle();
+	/* Only abort if a task is waiting to receive data */
+	if (RFST == RFST_SRX) {
+		ao_dma_abort(ao_radio_dma);
+		ao_radio_idle();
+	}
 }
 
 void
@@ -448,19 +451,32 @@ ao_radio_rdf_abort(void)
 void
 ao_radio_test(void)
 {
-	ao_set_monitor(0);
-	ao_packet_slave_stop();
-	ao_radio_get();
-	printf ("Hit a character to stop..."); flush();
-	RFST = RFST_STX;
-	getchar();
-	ao_radio_idle();
-	ao_radio_put();
-	putchar('\n');
+	uint8_t	mode = 2;
+	ao_cmd_white();
+	if (ao_cmd_lex_c != '\n') {
+		ao_cmd_decimal();
+		mode = (uint8_t) ao_cmd_lex_u32;
+	}
+	mode++;
+	if (mode & 2) {
+		ao_set_monitor(0);
+		ao_packet_slave_stop();
+		ao_radio_get();
+		RFST = RFST_STX;
+	}
+	if (mode == 3) {
+		printf ("Hit a character to stop..."); flush();
+		getchar();
+		putchar('\n');
+	}
+	if (mode & 1) {
+		ao_radio_idle();
+		ao_radio_put();
+	}
 }
 
 __code struct ao_cmds ao_radio_cmds[] = {
-	{ 'C',	ao_radio_test,	"C                                  Radio carrier test" },
+	{ 'C',	ao_radio_test,	"C <1 start, 0 stop, none both>     Radio carrier test" },
 	{ 0,	ao_radio_test,	NULL },
 };