X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_packet_master.c;h=3b23ad92c882396f543a169c02053dbe1b7afcd7;hb=07213dc34fa20470a4b36a327a83d75b0f010ebb;hp=f3a024caa78433696b156e03bfb1239638c3dbbc;hpb=036400a2db303f3db3be7cc0426f88359c6bd2b1;p=fw%2Faltos

diff --git a/src/ao_packet_master.c b/src/ao_packet_master.c
index f3a024ca..3b23ad92 100644
--- a/src/ao_packet_master.c
+++ b/src/ao_packet_master.c
@@ -18,7 +18,7 @@
 #include "ao.h"
 
 static char
-ao_packet_getchar(void)
+ao_packet_getchar(void) __critical
 {
 	char c;
 	while ((c = ao_packet_pollchar()) == AO_READ_AGAIN)
@@ -29,6 +29,8 @@ ao_packet_getchar(void)
 			ao_wake_task(&ao_packet_task);
 		ao_usb_flush();
 		ao_sleep(&ao_stdin_ready);
+		if (!ao_packet_enable)
+			break;
 	}
 	return c;
 }
@@ -75,21 +77,20 @@ ao_packet_master_check_busy(void)
 void
 ao_packet_master(void)
 {
-	uint8_t	status;
-
+	ao_config_get();
 	ao_radio_set_packet();
 	ao_tx_packet.addr = ao_serial_number;
 	ao_tx_packet.len = AO_PACKET_SYN;
 	ao_packet_master_time = ao_time();
 	ao_packet_master_delay = AO_PACKET_MASTER_DELAY_SHORT;
 	while (ao_packet_enable) {
+		memcpy(ao_tx_packet.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
 		ao_packet_send();
 		if (ao_tx_packet.len)
 			ao_packet_master_busy();
 		ao_packet_master_check_busy();
 		ao_alarm(ao_packet_master_delay);
-		status = ao_packet_recv();
-		if (status & AO_DMA_DONE) {
+		if (ao_packet_recv()) {
 			/* if we can transmit data, do so */
 			if (ao_packet_tx_used && ao_tx_packet.len == 0)
 				continue;
@@ -100,6 +101,7 @@ ao_packet_master(void)
 			ao_packet_master_sleeping = 0;
 		}
 	}
+	ao_radio_set_telemetry();
 	ao_exit();
 }
 
@@ -118,12 +120,15 @@ ao_packet_forward(void) __reentrant
 		if (c == '\r') c = '\n';
 		ao_packet_putchar(c);
 	}
+
+	/* Wait for a second if there is any pending data */
+	for (c = 0; (ao_packet_tx_used || ao_tx_packet.len) && c < 10; c++)
+		ao_delay(AO_MS_TO_TICKS(100));
 	ao_packet_enable = 0;
-	ao_radio_abort();
 	while (ao_packet_echo_task.wchan || ao_packet_task.wchan) {
-		ao_wake_task(&ao_packet_echo_task);
-		ao_wake_task(&ao_packet_task);
-		ao_yield();
+		if (ao_packet_echo_task.wchan)
+			ao_wake_task(&ao_packet_echo_task);
+		ao_delay(AO_MS_TO_TICKS(10));
 	}
 }