From: Keith Packard <keithp@keithp.com>
Date: Fri, 1 Jun 2018 05:45:49 +0000 (-0700)
Subject: altos/telelco: Remove STATIC_TEST code from stand-alone LCO boxes
X-Git-Tag: 1.8.6~1^2~32
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=5d9881547706b49cc22b98cc5c94e01e8a7f5181;ds=sidebyside

altos/telelco: Remove STATIC_TEST code from stand-alone LCO boxes

This command conflicts with the 'debug' command in these devices and
so wasn't usable anyways.

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

diff --git a/src/drivers/ao_lco_cmd.c b/src/drivers/ao_lco_cmd.c
index 8de21fb6..dba9a76a 100644
--- a/src/drivers/ao_lco_cmd.c
+++ b/src/drivers/ao_lco_cmd.c
@@ -22,6 +22,10 @@
 #include <ao_lco_func.h>
 #include <ao_radio_cmac.h>
 
+#ifndef HAS_STATIC_TEST
+#define HAS_STATIC_TEST	1
+#endif
+
 static __pdata uint16_t	lco_box;
 static __pdata uint8_t	lco_channels;
 static __pdata uint16_t	tick_offset;
@@ -150,6 +154,7 @@ lco_fire_cmd(void) __reentrant
 	}
 }
 
+#if HAS_STATIC_TEST
 static void
 lco_static_cmd(void) __reentrant
 {
@@ -182,6 +187,7 @@ lco_static_cmd(void) __reentrant
 		ao_delay(AO_MS_TO_TICKS(100));
 	}
 }
+#endif
 
 static void
 lco_arm_cmd(void) __reentrant
@@ -208,18 +214,21 @@ lco_ignite_cmd(void) __reentrant
 }
 
 
+#if HAS_STATIC_TEST
 static void
 lco_endstatic_cmd(void) __reentrant
 {
 	lco_ignite(AO_PAD_ENDSTATIC);
 }
+#endif
 
 static __code struct ao_cmds ao_lco_cmds[] = {
 	{ lco_report_cmd,	"l <box> <channel>\0Get remote status" },
 	{ lco_fire_cmd,		"F <box> <channel> <secs>\0Fire remote igniters" },
-	{ lco_fire_cmd,		"F <box> <channel> <secs>\0Fire remote igniters" },
+#if HAS_STATIC_TEST
 	{ lco_static_cmd,	"S <box> <channel> <secs>\0Initiate static test" },
 	{ lco_endstatic_cmd,	"D\0End static test (and download someday)" },
+#endif
 	{ lco_arm_cmd,		"a <box> <channel>\0Arm remote igniter" },
 	{ lco_ignite_cmd,	"i <box> <channel>\0Pulse remote igniter" },
 	{ 0, NULL },
diff --git a/src/telelco-v0.3/ao_pins.h b/src/telelco-v0.3/ao_pins.h
index dd4aaafb..6fd897a0 100644
--- a/src/telelco-v0.3/ao_pins.h
+++ b/src/telelco-v0.3/ao_pins.h
@@ -54,6 +54,8 @@
 #define HAS_RADIO_RATE		1
 #define HAS_TELEMETRY		0
 #define HAS_AES			1
+#define HAS_STATIC_TEST		0
+
 
 #define HAS_SPI_1		0
 #define SPI_1_PA5_PA6_PA7	0
diff --git a/src/telelco-v2.0/ao_pins.h b/src/telelco-v2.0/ao_pins.h
index 61a8676a..48aeabdf 100644
--- a/src/telelco-v2.0/ao_pins.h
+++ b/src/telelco-v2.0/ao_pins.h
@@ -54,6 +54,7 @@
 #define HAS_RADIO_RATE		1
 #define HAS_TELEMETRY		0
 #define HAS_AES			1
+#define HAS_STATIC_TEST		0
 
 #define HAS_SPI_1		0
 #define SPI_1_PA5_PA6_PA7	0