X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_packet_slave.c;h=9f14052af406c9293b3fbeeb7a73b92c3fff438c;hp=e03ebdc3a20cd90475ee00ea1610b3a3a6f28260;hb=8de9d3cbfcd1db7b554fb761296a8de09aafc8c3;hpb=9394393c24c0a96b94319f2d0aa78fb498a121c9

diff --git a/src/ao_packet_slave.c b/src/ao_packet_slave.c
index e03ebdc3..9f14052a 100644
--- a/src/ao_packet_slave.c
+++ b/src/ao_packet_slave.c
@@ -20,15 +20,16 @@
 void
 ao_packet_slave(void)
 {
-	uint8_t	status;
-
-	ao_radio_set_packet();
 	ao_tx_packet.addr = ao_serial_number;
 	ao_tx_packet.len = AO_PACKET_SYN;
 	while (ao_packet_enable) {
-		status = ao_packet_recv();
-		if (status & AO_DMA_DONE)
+		if (ao_packet_recv()) {
+			memcpy(&ao_tx_packet.callsign, &ao_rx_packet.packet.callsign, AO_MAX_CALLSIGN);
+#if HAS_FLIGHT
+			ao_flight_force_idle = TRUE;
+#endif
 			ao_packet_send();
+		}
 	}
 	ao_exit();
 }
@@ -45,19 +46,19 @@ ao_packet_slave_stop(void)
 {
 	if (ao_packet_enable) {
 		ao_packet_enable = 0;
-		ao_radio_abort();
 		while (ao_packet_task.wchan) {
-			ao_wake_task(&ao_packet_task);
-			ao_yield();
+			ao_radio_recv_abort();
+			ao_delay(AO_MS_TO_TICKS(10));
 		}
-		ao_radio_set_telemetry();
 	}
 }
 
 void
-ao_packet_slave_init(void)
+ao_packet_slave_init(uint8_t enable)
 {
 	ao_add_stdio(ao_packet_pollchar,
 		     ao_packet_putchar,
 		     NULL);
+	if (enable)
+		ao_packet_slave_start();
 }