altos: check for valid flight number in ao_log_delete

[fw/altos] / src / ao_packet_slave.c

diff --git a/src/ao_packet_slave.c b/src/ao_packet_slave.c
index ba5ad1c1d13e6f0ca2cb4069454cb5fdf66d721e..39d04bbb2e8a70ca43450b9a7457f8991a1198b9 100644 (file)
--- 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);
 }