X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco_cmd.c;h=6f195e550cfc909063984a0115a9163807038da5;hp=acbf589aa4cd0d13054b24d5037804f27689cec5;hb=HEAD;hpb=5c9172ba5681ff93d63c9c263a453d0025170045

diff --git a/src/drivers/ao_lco_cmd.c b/src/drivers/ao_lco_cmd.c
index acbf589a..391b4547 100644
--- a/src/drivers/ao_lco_cmd.c
+++ b/src/drivers/ao_lco_cmd.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,17 +22,18 @@
 #include <ao_lco_func.h>
 #include <ao_radio_cmac.h>
 
-static __pdata uint16_t	lco_box;
-static __pdata uint8_t	lco_channels;
-static __pdata uint16_t	tick_offset;
+#ifndef HAS_STATIC_TEST
+#define HAS_STATIC_TEST	1
+#endif
+
+static uint16_t	lco_box;
+static uint8_t	lco_channels;
 
 static void
-lco_args(void) __reentrant
+lco_args(void) 
 {
-	ao_cmd_decimal();
-	lco_box = ao_cmd_lex_i;
-	ao_cmd_hex();
-	lco_channels = ao_cmd_lex_i;
+	lco_box = (uint16_t) ao_cmd_decimal();
+	lco_channels = (uint8_t) ao_cmd_hex();
 }
 
 static struct ao_pad_query	ao_pad_query;
@@ -60,13 +62,13 @@ lco_arm(void)
 }
 
 static void
-lco_ignite(void)
+lco_ignite(uint8_t cmd)
 {
-	ao_lco_ignite(lco_box, lco_channels, tick_offset);
+	ao_lco_ignite(cmd);
 }
 
 static void
-lco_report_cmd(void) __reentrant
+lco_report_cmd(void) 
 {
 	int8_t		r;
 	uint8_t		c;
@@ -117,15 +119,47 @@ lco_report_cmd(void) __reentrant
 }
 
 static void
-lco_fire_cmd(void) __reentrant
+lco_fire_cmd(void) 
+{
+	uint8_t		secs;
+	uint8_t		i;
+	int8_t		r;
+
+	lco_args();
+	secs = (uint8_t) ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	r = lco_query();
+	if (r != AO_RADIO_CMAC_OK) {
+		printf("query failed %d\n", r);
+		return;
+	}
+
+	for (i = 0; i < 4; i++) {
+		printf("arm %d\n", i); flush();
+		lco_arm();
+	}
+
+	secs = (uint8_t) (secs * 10 - 5);
+	if (secs > 100)
+		secs = 100;
+	for (i = 0; i < secs; i++) {
+		printf("fire %d\n", i); flush();
+		lco_ignite(AO_PAD_FIRE);
+		ao_delay(AO_MS_TO_TICKS(100));
+	}
+}
+
+#if HAS_STATIC_TEST
+static void
+lco_static_cmd(void) 
 {
 	uint8_t		secs;
 	uint8_t		i;
 	int8_t		r;
 
 	lco_args();
-	ao_cmd_decimal();
-	secs = ao_cmd_lex_i;
+	secs = (uint8_t) ao_cmd_decimal();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
 	r = lco_query();
@@ -139,18 +173,19 @@ lco_fire_cmd(void) __reentrant
 		lco_arm();
 	}
 
-	secs = secs * 10 - 5;
+	secs = (uint8_t) (secs * 10 - 5);
 	if (secs > 100)
 		secs = 100;
 	for (i = 0; i < secs; i++) {
 		printf("fire %d\n", i); flush();
-		lco_ignite();
+		lco_ignite(AO_PAD_STATIC);
 		ao_delay(AO_MS_TO_TICKS(100));
 	}
 }
+#endif
 
 static void
-lco_arm_cmd(void) __reentrant
+lco_arm_cmd(void) 
 {
 	uint8_t	i;
 	int8_t  r;
@@ -165,17 +200,30 @@ lco_arm_cmd(void) __reentrant
 }
 
 static void
-lco_ignite_cmd(void) __reentrant
+lco_ignite_cmd(void) 
 {
 	uint8_t i;
 	lco_args();
 	for (i = 0; i < 4; i++)
-		lco_ignite();
+		lco_ignite(AO_PAD_FIRE);
+}
+
+
+#if HAS_STATIC_TEST
+static void
+lco_endstatic_cmd(void) 
+{
+	lco_ignite(AO_PAD_ENDSTATIC);
 }
+#endif
 
-static __code struct ao_cmds ao_lco_cmds[] = {
+static const 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" },
+#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 },