From: Keith Packard <keithp@keithp.com>
Date: Sun, 20 Mar 2011 06:27:15 +0000 (-0700)
Subject: altos: Don't init packet slave on TD. Make slave start optional
X-Git-Tag: 0.9.3~126
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5c28b9312d90a3a66016abc641c20bcd852d69f8

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 63f80678..00c395d6 100644
--- 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 eb456dab..e40ddfec 100644
--- 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 505dc0cb..008b200a 100644
--- 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 ed43c447..4ace415c 100644
--- 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 97bc2cf4..dbc3b74c 100644
--- 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();