X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_packet_slave.c;h=39d04bbb2e8a70ca43450b9a7457f8991a1198b9;hp=ba5ad1c1d13e6f0ca2cb4069454cb5fdf66d721e;hb=d794ef9e0fbe4d13259db1bbd69f01717c14400b;hpb=0b483233118673cbc2cda1be6acd379df82bc95a

diff --git a/src/ao_packet_slave.c b/src/ao_packet_slave.c
index ba5ad1c1..39d04bbb 100644
--- a/src/ao_packet_slave.c
+++ b/src/ao_packet_slave.c
@@ -24,8 +24,10 @@ ao_packet_slave(void)
 	ao_tx_packet.addr = ao_serial_number;
 	ao_tx_packet.len = AO_PACKET_SYN;
 	while (ao_packet_enable) {
-		ao_packet_recv();
-		ao_packet_send();
+		if (ao_packet_recv()) {
+			memcpy(&ao_tx_packet.callsign, &ao_rx_packet.packet.callsign, AO_MAX_CALLSIGN);
+			ao_packet_send();
+		}
 	}
 	ao_exit();
 }
@@ -40,13 +42,16 @@ ao_packet_slave_start(void)
 void
 ao_packet_slave_stop(void)
 {
-	ao_packet_enable = 0;
-	ao_radio_abort();
-	while (ao_packet_task.wchan) {
-		ao_wake_task(&ao_packet_task);
-		ao_yield();
+	if (ao_packet_enable) {
+		ao_packet_enable = 0;
+		while (ao_packet_task.wchan) {
+			ao_radio_recv_abort();
+			ao_delay(AO_MS_TO_TICKS(10));
+		}
+		ao_radio_get();
+		ao_radio_set_telemetry();
+		ao_radio_put();
 	}
-	ao_radio_set_telemetry();
 }
 
 void
@@ -54,5 +59,5 @@ ao_packet_slave_init(void)
 {
 	ao_add_stdio(ao_packet_pollchar,
 		     ao_packet_putchar,
-		     ao_packet_flush);
+		     NULL);
 }