altos: add callsign to packet mode, increase payload to 64 bytes

[fw/altos] / src / ao_packet_master.c

diff --git a/src/ao_packet_master.c b/src/ao_packet_master.c
index d03899d1336e40c0d8b7a4309c6b7206decb1674..72bb908a671e4e2f790f1f6492c340627e43468a 100644 (file)
--- a/src/ao_packet_master.c
+++ b/src/ao_packet_master.c
@@ -18,7 +18,7 @@
 #include "ao.h"
 
 static char
 #include "ao.h"
 
 static char

-ao_packet_getchar(void)
+ao_packet_getchar(void) __critical

 {
        char c;
        while ((c = ao_packet_pollchar()) == AO_READ_AGAIN)
 {
        char c;
        while ((c = ao_packet_pollchar()) == AO_READ_AGAIN)


@@ -27,7 +27,7 @@ ao_packet_getchar(void)
                        break;
                if (ao_packet_master_sleeping)
                        ao_wake_task(&ao_packet_task);
                        break;
                if (ao_packet_master_sleeping)
                        ao_wake_task(&ao_packet_task);

-               flush();
+               ao_usb_flush();

                ao_sleep(&ao_stdin_ready);
        }
        return c;
                ao_sleep(&ao_stdin_ready);
        }
        return c;


@@ -40,7 +40,7 @@ ao_packet_echo(void) __reentrant
        while (ao_packet_enable) {
                c = ao_packet_getchar();
                if (ao_packet_enable)
        while (ao_packet_enable) {
                c = ao_packet_getchar();
                if (ao_packet_enable)

-                       putchar(c);
+                       ao_usb_putchar(c);

        }
        ao_exit();
 }
        }
        ao_exit();
 }


@@ -77,12 +77,14 @@ ao_packet_master(void)
 {
        uint8_t status;
 
 {
        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) {
        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();
                ao_packet_send();
                if (ao_tx_packet.len)
                        ao_packet_master_busy();


@@ -100,6 +102,7 @@ ao_packet_master(void)
                        ao_packet_master_sleeping = 0;
                }
        }
                        ao_packet_master_sleeping = 0;
                }
        }

+       ao_radio_set_telemetry();

        ao_exit();
 }
 
        ao_exit();
 }
 


@@ -114,7 +117,7 @@ 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");
        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);
        }
                if (c == '\r') c = '\n';
                ao_packet_putchar(c);
        }