altos: Don't init packet slave on TD. Make slave start optional

Oops. TeleDongle was starting the packet slave code, which kinda
wrecked its ability to receive telemetry packets. This patch simply
removes the packet slave code from teledongle as it cannot be used
(yet), it also makes the packet slave code initialization take a
parameter which controls whether to start that by default; in the
future, perhaps TeleDongle will gain a command to start packet slave mode.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/ao.h b/src/ao.h
index 63f806788cc1f7ad7a4ef6fc5c0d4fe4424da327..00c395d6437663195721aa9991eacec4b19d2f81 100644 (file)
--- a/src/ao.h
+++ b/src/ao.h
@@ -1197,6 +1197,6 @@ void
 ao_packet_slave_stop(void);
 
 void
-ao_packet_slave_init(void);
+ao_packet_slave_init(uint8_t enable);
 
 #endif /* _AO_H_ */

diff --git a/src/ao_packet_slave.c b/src/ao_packet_slave.c
index eb456dab48b98bcf72af2ad4badfbeb90eeee596..e40ddfec4a2ec2917c36e1843bf77e5c7f02c08e 100644 (file)
--- a/src/ao_packet_slave.c
+++ b/src/ao_packet_slave.c
@@ -58,10 +58,11 @@ ao_packet_slave_stop(void)
 }
 
 void
-ao_packet_slave_init(void)
+ao_packet_slave_init(uint8_t enable)
 {
        ao_add_stdio(ao_packet_pollchar,
                     ao_packet_putchar,
                     NULL);
-       ao_packet_slave_start();
+       if (enable)
+               ao_packet_slave_start();
 }

diff --git a/src/ao_teledongle.c b/src/ao_teledongle.c
index 505dc0cbfb0497c9ac67f4a2d98de96d923c4f02..008b200a0b75eb9f61a06e0b2d9f1cfe04f8a2ef 100644 (file)
--- a/src/ao_teledongle.c
+++ b/src/ao_teledongle.c
@@ -31,7 +31,6 @@ main(void)
        ao_monitor_init(AO_LED_GREEN, TRUE);
        ao_rssi_init(AO_LED_RED);
        ao_radio_init();
-       ao_packet_slave_init();
        ao_packet_master_init();
 #if HAS_DBG
        ao_dbg_init();

diff --git a/src/ao_telemetrum.c b/src/ao_telemetrum.c
index ed43c4473d12c9c38502aacfa5d78dc1efb8c9f4..4ace415c23be7b3487f6bc9768c7a3b8b47e7bdd 100644 (file)
--- a/src/ao_telemetrum.c
+++ b/src/ao_telemetrum.c
@@ -59,7 +59,7 @@ main(void)
        ao_gps_report_init();
        ao_telemetry_init();
        ao_radio_init();
-       ao_packet_slave_init();
+       ao_packet_slave_init(TRUE);
        ao_igniter_init();
 #if HAS_DBG
        ao_dbg_init();

diff --git a/src/ao_telemini.c b/src/ao_telemini.c
index 97bc2cf4ecd495870995908b58faaa0e8991f3d4..dbc3b74c097bc2ab655c39b80d4d421c9f79137d 100644 (file)
--- a/src/ao_telemini.c
+++ b/src/ao_telemini.c
@@ -42,9 +42,9 @@ main(void)
        ao_flight_init();
        ao_log_init();
        ao_report_init();
-       ao_telemetry_init();
+       ao_telemetry_tiny_init();
        ao_radio_init();
-       ao_packet_slave_init();
+       ao_packet_slave_init(TRUE);
        ao_igniter_init();
        ao_config_init();
        ao_start_scheduler();