X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_radio.c;h=3fb4afd7d4831d87c556a201634655e70ba95b3c;hp=6d25df39e0d98bdb149f365a24f5f993c1dba764;hb=d1005f68376d695039c314b8d7a68bbf9acbca4f;hpb=cd49847f3125df1733f298b56a43e8027ab5ce05

diff --git a/src/ao_radio.c b/src/ao_radio.c
index 6d25df39..3fb4afd7 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) {
@@ -317,26 +317,25 @@ ao_radio_idle(void)
 {
 	if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
 	{
-		RFST = RFST_SIDLE;
 		do {
+			RFST = RFST_SIDLE;
 			ao_yield();
 		} while (RF_MARCSTATE != RF_MARCSTATE_IDLE);
 	}
 }
 
-static void
+void
 ao_radio_get(void)
 {
 	ao_config_get();
 	ao_mutex_get(&ao_radio_mutex);
 	ao_radio_idle();
 	RF_CHANNR = ao_config.radio_channel;
-	RF_FREQ2 = (uint8_t) (ao_config.radio_frequency >> 16);
-	RF_FREQ1 = (uint8_t) (ao_config.radio_frequency >> 8);
-	RF_FREQ0 = (uint8_t) (ao_config.radio_frequency);
+	RF_FREQ2 = (uint8_t) (ao_config.radio_cal >> 16);
+	RF_FREQ1 = (uint8_t) (ao_config.radio_cal >> 8);
+	RF_FREQ0 = (uint8_t) (ao_config.radio_cal);
 }
 
-#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
 
 void
 ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant
@@ -449,18 +448,32 @@ ao_radio_rdf_abort(void)
 void
 ao_radio_test(void)
 {
-	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 },
 };