3 files changed, 46 insertions, 1 deletions
diff --git a/src/cc1111/ao_launch.c b/src/cc1111/ao_launch.c
index 4f0a0c14..76d6d13b 100644
--- a/src/cc1111/ao_launch.c
+++ b/src/cc1111/ao_launch.c
@@ -17,6 +17,7 @@
  */
 
 #include <ao.h>
+#include <ao_launch.h>
 #include <ao_radio_cmac.h>
 
 __xdata uint16_t ao_launch_ignite;
diff --git a/src/cc1111/ao_launch.h b/src/cc1111/ao_launch.h
new file mode 100644
index 00000000..966b5cea
--- /dev/null
+++ b/src/cc1111/ao_launch.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2017 Keith Packard <keithp@keithp.com>
+ *
+ * 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, 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef _AO_LAUNCH_H_
+#define _AO_LAUNCH_H_
+/* ao_launch.c */
+
+struct ao_launch_command {
+	uint16_t	tick;
+	uint16_t	serial;
+	uint8_t		cmd;
+	uint8_t		channel;
+	uint16_t	unused;
+};
+
+#define AO_LAUNCH_QUERY		1
+
+struct ao_launch_query {
+	uint16_t	tick;
+	uint16_t	serial;
+	uint8_t		channel;
+	uint8_t		valid;
+	uint8_t		arm_status;
+	uint8_t		igniter_status;
+};
+
+#define AO_LAUNCH_ARM		2
+#define AO_LAUNCH_FIRE		3
+
+void
+ao_launch_init(void);
+
+#endif /* _AO_LAUNCH_H_ */
diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index 0acef562..a3d454da 100644
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -62,7 +62,7 @@ ao_timer_init(void)
 	/* NOTE:  This uses a timer only present on cc1111 architecture. */
 
 	/* disable timer 1 */
-	T1CTL = 0;
+/*	T1CTL = 0; */
 
 	/* set the sample rate */
 	T1CC0H = T1_SAMPLE_TIME >> 8;