X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_packet_master.c;h=641b49f411a48a5c5821e376f055a9872d754363;hp=d03899d1336e40c0d8b7a4309c6b7206decb1674;hb=3ffaa5d1c00b28be20fd4a26deb7bd41d953e92a;hpb=bc62bb254085cc705203b57260c04ac5e14c6611

diff --git a/src/ao_packet_master.c b/src/ao_packet_master.c
index d03899d1..641b49f4 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)
@@ -27,8 +27,10 @@ ao_packet_getchar(void)
 			break;
 		if (ao_packet_master_sleeping)
 			ao_wake_task(&ao_packet_task);
-		flush();
+		ao_usb_flush();
 		ao_sleep(&ao_stdin_ready);
+		if (!ao_packet_enable)
+			break;
 	}
 	return c;
 }
@@ -40,7 +42,7 @@ ao_packet_echo(void) __reentrant
 	while (ao_packet_enable) {
 		c = ao_packet_getchar();
 		if (ao_packet_enable)
-			putchar(c);
+			ao_usb_putchar(c);
 	}
 	ao_exit();
 }
@@ -77,12 +79,14 @@ 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();
@@ -100,6 +104,7 @@ ao_packet_master(void)
 			ao_packet_master_sleeping = 0;
 		}
 	}
+	ao_radio_set_telemetry();
 	ao_exit();
 }
 
@@ -114,16 +119,19 @@ ao_packet_forward(void) __reentrant
 	ao_set_monitor(0);
 	ao_add_task(&ao_packet_task, ao_packet_master, "master");
 	ao_add_task(&ao_packet_echo_task, ao_packet_echo, "echo");
-	while ((c = getchar()) != '~') {
+	while ((c = ao_usb_getchar()) != '~') {
 		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));
 	}
 }