altos: flush pending output when terminating packet mode

[fw/altos] / src / ao_packet_master.c

diff --git a/src/ao_packet_master.c b/src/ao_packet_master.c
index 2751f414a374e7bfc04ed35169b92dacdccb0caa..5e13a91adecb3889727688e172e0f9a957458fb3 100644 (file)
--- 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,6 +27,7 @@ ao_packet_getchar(void)
                        break;
                if (ao_packet_master_sleeping)
                        ao_wake_task(&ao_packet_task);
+               ao_usb_flush();
                ao_sleep(&ao_stdin_ready);
        }
        return c;
@@ -39,7 +40,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();
 }
@@ -76,12 +77,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();
@@ -94,13 +97,12 @@ ao_packet_master(void)
                                continue;
                        if (ao_rx_packet.packet.len)
                                ao_packet_master_busy();
-                       else
-                               flush();
                        ao_packet_master_sleeping = 1;
                        ao_delay(ao_packet_master_delay);
                        ao_packet_master_sleeping = 0;
                }
        }
+       ao_radio_set_telemetry();
        ao_exit();
 }
 
@@ -115,10 +117,14 @@ 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) {