From 21e39811bd234c6f66ab7644864fcc1b8c316998 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 29 Jul 2012 19:36:50 -0700
Subject: altos/cc1111: Fix serial 0 option 2 pins definitions

tx/rx are 4/5, rts/cts are 2/3

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/Makefile.cc1111 | 2 +-
 src/cc1111/ao_serial.c     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index f7ecce33..bfd444dd 100644
--- a/src/cc1111/Makefile.cc1111
+++ b/src/cc1111/Makefile.cc1111
@@ -2,7 +2,7 @@ CC=sdcc
 
 CFLAGS=--model-small --debug --opt-code-speed -DCODESIZE=$(CODESIZE)
 
-CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../core -I../cc1111 -I../driver -I../product
+CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../core -I../cc1111 -I../drivers -I../product
 
 CODESIZE ?= 0x8000
 
diff --git a/src/cc1111/ao_serial.c b/src/cc1111/ao_serial.c
index 00c85ff3..d90103b0 100644
--- a/src/cc1111/ao_serial.c
+++ b/src/cc1111/ao_serial.c
@@ -236,9 +236,9 @@ ao_serial_init(void)
 		(P2SEL_PRI3P1_USART0 | P2SEL_PRI0P1_USART0);
 
 	/* Make the USART pins be controlled by the USART */
-	P1SEL |= (1 << 2) | (1 << 3);
-#if HAS_SERIAL_0_HW_FLOW
 	P1SEL |= (1 << 5) | (1 << 4);
+#if HAS_SERIAL_0_HW_FLOW
+	P1SEL |= (1 << 3) | (1 << 2);
 #endif
 #endif
 
-- 
cgit v1.2.3


From 843fcab46d633e5bb6959286adeb68e41a4c30a3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 29 Jul 2012 19:44:56 -0700
Subject: altos: Add telefire-v0.1

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/Makefile                    |   3 +-
 src/cc1111/ao_adc.c             |  20 ++++
 src/cc1111/ao_arch.h            |  12 ---
 src/cc1111/ao_pins.h            |  12 +++
 src/core/ao.h                   |   7 ++
 src/core/ao_config.c            |   3 +
 src/core/ao_storage.c           |   1 +
 src/drivers/ao_74hc497.c        |  40 +++++++
 src/drivers/ao_74hc497.h        |  27 +++++
 src/drivers/ao_pad.c            | 227 ++++++++++++++++++++++++++++++++++++++++
 src/drivers/ao_pad.h            |  67 ++++++++++++
 src/drivers/ao_pca9922.c        |  78 ++++++++++++++
 src/telefire-v0.1/Makefile      | 101 ++++++++++++++++++
 src/telefire-v0.1/ao_pins.h     |  94 +++++++++++++++++
 src/telefire-v0.1/ao_telefire.c |  41 ++++++++
 15 files changed, 720 insertions(+), 13 deletions(-)
 create mode 100644 src/drivers/ao_74hc497.c
 create mode 100644 src/drivers/ao_74hc497.h
 create mode 100644 src/drivers/ao_pad.c
 create mode 100644 src/drivers/ao_pad.h
 create mode 100644 src/drivers/ao_pca9922.c
 create mode 100644 src/telefire-v0.1/Makefile
 create mode 100644 src/telefire-v0.1/ao_pins.h
 create mode 100644 src/telefire-v0.1/ao_telefire.c

(limited to 'src/cc1111')

diff --git a/src/Makefile b/src/Makefile
index 491618f6..99ea8f85 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,7 +21,8 @@ ifneq ($(shell which sdcc),)
 	telebt-v0.0 telebt-v0.1 \
 	telemetrum-v0.1-sky telemetrum-v0.1-sirf \
 	telelaunch-v0.1 tidongle test \
-	teleterra-v0.2 teleshield-v0.1
+	teleterra-v0.2 teleshield-v0.1 \
+	telefire-v0.1
 endif
 
 ifneq ($(shell which avr-gcc),)
diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index ce827e25..f7b52281 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -140,6 +140,15 @@ ao_adc_isr(void) __interrupt 1
 	}
 #endif /* telemini || telenano */
 
+#ifdef TELEFIRE_V_0_1
+	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.sense[0] + sequence);
+	a[0] = ADCL;
+	a[1] = ADCH;
+	if (sequence < 5)
+		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+#define GOT_ADC
+#endif /* TELEFIRE_V_0_1 */
+
 #ifndef GOT_ADC
 #error No known ADC configuration set
 #endif
@@ -157,9 +166,13 @@ ao_adc_dump(void) __reentrant
 {
 	static __xdata struct ao_data	packet;
 	ao_data_get(&packet);
+#ifndef AO_ADC_DUMP
 	printf("tick: %5u accel: %5d pres: %5d temp: %5d batt: %5d drogue: %5d main: %5d\n",
 	       packet.tick, packet.adc.accel, packet.adc.pres, packet.adc.temp,
 	       packet.adc.v_batt, packet.adc.sense_d, packet.adc.sense_m);
+#else
+	AO_ADC_DUMP(&packet);
+#endif
 }
 
 __code struct ao_cmds ao_adc_cmds[] = {
@@ -170,6 +183,11 @@ __code struct ao_cmds ao_adc_cmds[] = {
 void
 ao_adc_init(void)
 {
+#ifdef AO_ADC_PINS
+	ADCCFG = AO_ADC_PINS;
+
+#else
+
 #if IGNITE_ON_P2
 	/* TeleMetrum configuration */
 	ADCCFG = ((1 << 0) |	/* acceleration */
@@ -190,6 +208,8 @@ ao_adc_init(void)
 		  (1 << 3));	/* battery voltage */
 #endif
 
+#endif /* else AO_ADC_PINS */
+
 	/* enable interrupts */
 	ADCIF = 0;
 	IEN0 |= IEN0_ADCIE;
diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 06b04b93..a97515a7 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -200,18 +200,6 @@ extern AO_ROMCONFIG_SYMBOL(0x00a6) uint32_t ao_radio_cal;
 
 #define ao_arch_critical(b) __critical { b }
 
-struct ao_adc {
-	int16_t		accel;		/* accelerometer */
-	int16_t		pres;		/* pressure sensor */
-	int16_t		temp;		/* temperature sensor */
-	int16_t		v_batt;		/* battery voltage */
-	int16_t		sense_d;	/* drogue continuity sense */
-	int16_t		sense_m;	/* main continuity sense */
-#if HAS_ACCEL_REF
-	uint16_t	accel_ref;	/* acceleration reference */
-#endif
-};
-
 #define AO_DATA_RING	32
 
 /* ao_button.c */
diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
index fc6ed3ec..2f0e2884 100644
--- a/src/cc1111/ao_pins.h
+++ b/src/cc1111/ao_pins.h
@@ -560,4 +560,16 @@
 #define AO_IGNITER_FIRE_TIME	AO_MS_TO_TICKS(50)
 #define AO_IGNITER_CHARGE_TIME	AO_MS_TO_TICKS(2000)
 
+struct ao_adc {
+	int16_t		accel;		/* accelerometer */
+	int16_t		pres;		/* pressure sensor */
+	int16_t		temp;		/* temperature sensor */
+	int16_t		v_batt;		/* battery voltage */
+	int16_t		sense_d;	/* drogue continuity sense */
+	int16_t		sense_m;	/* main continuity sense */
+#if HAS_ACCEL_REF
+	uint16_t	accel_ref;	/* acceleration reference */
+#endif
+};
+
 #endif /* _AO_PINS_H_ */
diff --git a/src/core/ao.h b/src/core/ao.h
index 65b9eb18..1032dd33 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -432,6 +432,7 @@ ao_gps_report_mega_init(void);
  * ao_telemetry_orig.c
  */
 
+#if LEGACY_MONITOR
 struct ao_adc_orig {
 	uint16_t	tick;		/* tick when the sample was read */
 	int16_t		accel;		/* accelerometer */
@@ -489,6 +490,8 @@ struct ao_telemetry_tiny_recv {
 	uint8_t				status;
 };
 
+#endif /* LEGACY_MONITOR */
+
 /* Unfortunately, we've exposed the CC1111 rssi units as the 'usual' method
  * for reporting RSSI. So, now we use these values everywhere
  */
@@ -582,6 +585,8 @@ ao_radio_init(void);
  * ao_monitor.c
  */
 
+#if HAS_MONITOR
+
 extern const char const * const ao_state_names[];
 
 #define AO_MONITOR_RING	8
@@ -618,6 +623,8 @@ ao_monitor_enable(void);
 void
 ao_monitor_init(void) __reentrant;
 
+#endif
+
 /*
  * ao_stdio.c
  */
diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index e2095e65..f19dd9cd 100644
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -17,8 +17,11 @@
 
 #include "ao.h"
 #include "ao_log.h"
+#include <ao_storage.h>
+#if HAS_FLIGHT
 #include <ao_sample.h>
 #include <ao_data.h>
+#endif
 
 __xdata struct ao_config ao_config;
 __pdata uint8_t ao_config_loaded;
diff --git a/src/core/ao_storage.c b/src/core/ao_storage.c
index b2dd435b..adf7e4d4 100644
--- a/src/core/ao_storage.c
+++ b/src/core/ao_storage.c
@@ -16,6 +16,7 @@
  */
 
 #include <ao.h>
+#include <ao_storage.h>
 
 uint8_t
 ao_storage_read(ao_pos_t pos, __xdata void *buf, uint16_t len) __reentrant
diff --git a/src/drivers/ao_74hc497.c b/src/drivers/ao_74hc497.c
new file mode 100644
index 00000000..93c544c3
--- /dev/null
+++ b/src/drivers/ao_74hc497.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2012 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+/*
+ * 74HC597 driver.
+ * Reads a single byte from the shift register
+ */
+
+#include <ao.h>
+#include <ao_74hc497.h>
+
+uint8_t
+ao_74hc497_read(void)
+{
+	static __xdata state;
+	ao_spi_get_bit(AO_74HC497_CS_PORT, AO_74HC497_CS_PIN, AO_74HC497_CS, AO_74HC497_SPI_BUS, AO_SPI_SPEED_FAST);
+	ao_spi_send(&state, 1, AO_74HC497_SPI_BUS);
+	ao_spi_put_bit(AO_74HC497_CS_PORT, AO_74HC497_CS_PIN, AO_74HC497_CS, AO_74HC497_SPI_BUS);
+	return state;
+}
+
+void
+ao_74hc497_init(void)
+{
+	ao_enable_output(AO_74HC497_CS_PORT, AO_74HC497_CS_PIN, AO_74HC497_CS, 1);
+}
diff --git a/src/drivers/ao_74hc497.h b/src/drivers/ao_74hc497.h
new file mode 100644
index 00000000..6df7bcae
--- /dev/null
+++ b/src/drivers/ao_74hc497.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2012 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_74HC497_H_
+#define _AO_74HC497_H_
+
+uint8_t
+ao_74hc497_read(void);
+
+void
+ao_74hc497_init(void);
+
+#endif /* _AO_74HC497_H_ */
diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
new file mode 100644
index 00000000..21aa788d
--- /dev/null
+++ b/src/drivers/ao_pad.c
@@ -0,0 +1,227 @@
+/*
+ * Copyright © 2012 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <ao.h>
+#include <ao_pad.h>
+#include <ao_74hc497.h>
+
+__xdata uint8_t ao_pad_ignite;
+
+#define ao_pad_igniter_status(c)	AO_PAD_IGNITER_STATUS_UNKNOWN
+#define ao_pad_arm_status()		AO_PAD_ARM_STATUS_UNKNOWN
+
+#if 0
+#define PRINTD(...) printf(__VA_ARGS__)
+#else
+#define PRINTD(...) 
+#endif
+
+static void
+ao_pad_run(void)
+{
+	for (;;) {
+		while (!ao_pad_ignite)
+			ao_sleep(&ao_pad_ignite);
+		/*
+		 * Actually set the pad bits
+		 */
+		AO_PAD_PORT = (AO_PAD_PORT & (~AO_PAD_ALL_PINS)) | ao_pad_ignite;
+		while (ao_pad_ignite) {
+			ao_pad_ignite = 0;
+			ao_delay(AO_PAD_FIRE_TIME);
+		}
+		AO_PAD_PORT &= ~(AO_PAD_ALL_PINS);
+	}
+}
+
+static void
+ao_pad_status(void)
+{
+	for (;;) {
+		ao_delay(AO_SEC_TO_TICKS(1));
+#if 0
+		if (ao_igniter_status(ao_igniter_drogue) == ao_igniter_ready) {
+			if (ao_igniter_status(ao_igniter_main) == ao_igniter_ready) {
+				for (i = 0; i < 5; i++) {
+					ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(50));
+					ao_delay(AO_MS_TO_TICKS(100));
+				}
+			} else {
+				ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(200));
+			}
+		}
+#endif
+	}
+}
+
+static __pdata uint8_t	ao_pad_armed;
+static __pdata uint16_t	ao_pad_arm_time;
+static __pdata uint8_t	ao_pad_box;
+
+static void
+ao_pad(void)
+{
+	static __xdata struct ao_pad_command	command;
+	static __xdata struct ao_pad_query	query;
+	int16_t	time_difference;
+	uint8_t	c;
+
+	ao_led_off(AO_LED_RED);
+	ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(200));
+	ao_pad_box = ao_74hc497_read();
+	for (;;) {
+		flush();
+		if (ao_radio_cmac_recv(&command, sizeof (command), 0) != AO_RADIO_CMAC_OK)
+			continue;
+		
+		PRINTD ("tick %d serial %d cmd %d channel %d\n",
+			command.tick, command.serial, command.cmd, command.channel);
+
+		switch (command.cmd) {
+		case AO_LAUNCH_ARM:
+			if (command.box != ao_pad_box) {
+				PRINTD ("box number mismatch\n");
+				break;
+			}
+
+			if (command.channels & ~(AO_PAD_ALL_PINS))
+				break;
+
+			time_difference = command.tick - ao_time();
+			PRINTD ("arm tick %d local tick %d\n", command.tick, ao_time());
+			if (time_difference < 0)
+				time_difference = -time_difference;
+			if (time_difference > 10) {
+				PRINTD ("time difference too large %d\n", time_difference);
+				break;
+			}
+			PRINTD ("armed\n");
+			ao_pad_armed = command.channels;
+			ao_pad_arm_time = ao_time();
+
+			/* fall through ... */
+
+		case AO_LAUNCH_QUERY:
+			if (command.box != ao_pad_box) {
+				PRINTD ("box number mismatch\n");
+				break;
+			}
+
+			query.tick = ao_time();
+			query.box = ao_pad_box;
+			query.channels = AO_PAD_ALL_PINS;
+			query.armed = ao_pad_armed;
+			query.arm_status = ao_pad_arm_status();
+			for (c = 0; c < AO_PAD_NUM; c++)
+				query.igniter_status[c] = ao_pad_igniter_status(c);
+			PRINTD ("query tick %d serial %d channel %d valid %d arm %d igniter %d\n",
+				query.tick, query.serial, query.channel, query.valid, query.arm_status,
+				query.igniter_status);
+			ao_radio_cmac_send(&query, sizeof (query));
+			break;
+		case AO_LAUNCH_FIRE:
+			if (!ao_pad_armed) {
+				PRINTD ("not armed\n");
+				break;
+			}
+			if ((uint16_t) (ao_time() - ao_pad_arm_time) > AO_SEC_TO_TICKS(20)) {
+				PRINTD ("late pad arm_time %d time %d\n",
+					ao_pad_arm_time, ao_time());
+				break;
+			}
+			time_difference = command.tick - ao_time();
+			if (time_difference < 0)
+				time_difference = -time_difference;
+			if (time_difference > 10) {
+				PRINTD ("time different too large %d\n", time_difference);
+				break;
+			}
+			PRINTD ("ignite\n");
+			ao_pad_ignite = ao_pad_armed;
+			ao_wakeup(&ao_pad_ignite);
+			break;
+		}
+	}
+}
+
+void
+ao_pad_test(void)
+{
+#if 0
+	switch (ao_igniter_status(ao_igniter_drogue)) {
+	case ao_igniter_ready:
+	case ao_igniter_active:
+		printf ("Armed: ");
+		switch (ao_igniter_status(ao_igniter_main)) {
+		default:
+			printf("unknown status\n");
+			break;
+		case ao_igniter_ready:
+			printf("igniter good\n");
+			break;
+		case ao_igniter_open:
+			printf("igniter bad\n");
+			break;
+		}
+		break;
+	default:
+		printf("Disarmed\n");
+	}
+#endif
+}
+
+void
+ao_pad_manual(void)
+{
+	ao_cmd_white();
+	if (!ao_match_word("DoIt"))
+		return;
+	ao_cmd_white();
+	ao_pad_ignite = 1;
+	ao_wakeup(&ao_pad_ignite);
+}
+
+static __xdata struct ao_task ao_pad_task;
+static __xdata struct ao_task ao_pad_ignite_task;
+static __xdata struct ao_task ao_pad_status_task;
+
+__code struct ao_cmds ao_pad_cmds[] = {
+	{ ao_pad_test,	"t\0Test pad continuity" },
+	{ ao_pad_manual,	"i <key>\0Fire igniter. <key> is doit with D&I" },
+	{ 0, NULL }
+};
+
+void
+ao_pad_init(void)
+{
+#if AO_PAD_NUM > 0
+	ao_enable_output(AO_PAD_PORT, AO_PAD_PIN_0, AO_PAD_0, 0);
+#endif
+#if AO_PAD_NUM > 1
+	ao_enable_output(AO_PAD_PORT, AO_PAD_PIN_1, AO_PAD_1, 0);
+#endif
+#if AO_PAD_NUM > 2
+	ao_enable_output(AO_PAD_PORT, AO_PAD_PIN_2, AO_PAD_2, 0);
+#endif
+#if AO_PAD_NUM > 3
+	ao_enable_output(AO_PAD_PORT, AO_PAD_PIN_3, AO_PAD_3, 0);
+#endif
+	ao_cmd_register(&ao_pad_cmds[0]);
+	ao_add_task(&ao_pad_task, ao_pad, "pad listener");
+	ao_add_task(&ao_pad_ignite_task, ao_pad_run, "pad igniter");
+	ao_add_task(&ao_pad_status_task, ao_pad_status, "pad status");
+}
diff --git a/src/drivers/ao_pad.h b/src/drivers/ao_pad.h
new file mode 100644
index 00000000..9ea016ff
--- /dev/null
+++ b/src/drivers/ao_pad.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2012 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_PAD_H_
+#define _AO_PAD_H_
+
+#define AO_PAD_MAX_CHANNELS	8
+
+struct ao_pad_command {
+	uint16_t	tick;
+	uint16_t	box;
+	uint8_t		cmd;
+	uint8_t		channels;
+};
+
+/* Report current telefire status.
+ */
+
+#define AO_PAD_QUERY		1
+
+struct ao_pad_query {
+	uint16_t	tick;		/* telefire tick */
+	uint16_t	box;		/* telefire box number */
+	uint8_t		channels;	/* which chanels are present */
+	uint8_t		armed;		/* which channels are armed */
+	uint8_t		arm_status;	/* status of arming switch */
+	uint8_t		igniter_status[AO_PAD_MAX_CHANNELS];	/* status for each igniter */
+};
+
+/* Set current armed pads, report back status
+ */
+  
+#define AO_PAD_ARM		2
+
+/* Fire current armed pads for 200ms, no report
+ */
+#define AO_PAD_FIRE		3
+
+#define AO_PAD_FIRE_TIME	AO_MS_TO_TICKS(200)
+
+#define AO_PAD_ARM_STATUS_DISARMED	0
+#define AO_PAD_ARM_STATUS_ARMED		1
+#define AO_PAD_ARM_STATUS_UNKNOWN	2
+
+#define AO_PAD_IGNITER_STATUS_NO_IGNITER_RELAY_OPEN	0
+#define AO_PAD_IGNITER_STATUS_GOOD_IGNITER_RELAY_OPEN	1
+#define AO_PAD_IGNITER_STATUS_NO_IGNITER_RELAY_CLOSED	2
+#define AO_PAD_IGNITER_STATUS_UNKNOWN			3
+
+void
+ao_pad_init(void);
+
+#endif /* _AO_PAD_H_ */
diff --git a/src/drivers/ao_pca9922.c b/src/drivers/ao_pca9922.c
new file mode 100644
index 00000000..dc006f55
--- /dev/null
+++ b/src/drivers/ao_pca9922.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2012 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+/*
+ * PCA9922 LED driver. This uses SPI to send a single byte to the device to
+ * set the current state of the LEDs using the existing LED interface
+ */
+
+#include <ao.h>
+
+static __xdata uint8_t	ao_led_state;
+
+static void
+ao_led_apply(void)
+{
+	/* Don't try the SPI bus during initialization */
+	if (!ao_cur_task)
+		return;
+	ao_spi_get_bit(AO_PCA9922_CS_PORT, AO_PCA9922_CS_PIN, AO_PCA9922_CS, AO_PCA9922_SPI_BUS, AO_SPI_SPEED_FAST);
+	ao_spi_send(&ao_led_state, 1, AO_PCA9922_SPI_BUS);
+	ao_spi_put_bit(AO_PCA9922_CS_PORT, AO_PCA9922_CS_PIN, AO_PCA9922_CS, AO_PCA9922_SPI_BUS);
+}
+
+void
+ao_led_on(uint8_t colors)
+{
+	ao_led_state |= colors;
+	ao_led_apply();
+}
+
+void
+ao_led_off(uint8_t colors)
+{
+	ao_led_state &= ~colors;
+	ao_led_apply();
+}
+
+void
+ao_led_set(uint8_t colors)
+{
+	ao_led_state = colors;
+	ao_led_apply();
+}
+
+void
+ao_led_toggle(uint8_t colors)
+{
+	ao_led_state ^= colors;
+	ao_led_apply();
+}
+
+void
+ao_led_for(uint8_t colors, uint16_t ticks) __reentrant
+{
+	ao_led_on(colors);
+	ao_delay(ticks);
+	ao_led_off(colors);
+}
+
+void
+ao_led_init(uint8_t enable)
+{
+	ao_enable_output(AO_PCA9922_CS_PORT, AO_PCA9922_CS_PIN, AO_PCA9922_CS, 1);
+}
diff --git a/src/telefire-v0.1/Makefile b/src/telefire-v0.1/Makefile
new file mode 100644
index 00000000..09cb88fb
--- /dev/null
+++ b/src/telefire-v0.1/Makefile
@@ -0,0 +1,101 @@
+#
+# TeleFire build file
+#
+
+TELEFIRE_VER=0.1
+TELEFIRE_DEF=0_1
+
+vpath %.c ..:../core:../cc1111:../drivers:../product
+vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath ao-make-product.5c ../util
+
+ifndef VERSION
+include ../Version
+endif
+
+INC = \
+	ao.h \
+	ao_pins.h \
+	ao_arch.h \
+	ao_arch_funcs.h \
+	cc1111.h \
+	ao_product.h
+
+CORE_SRC = \
+	ao_cmd.c \
+	ao_config.c \
+	ao_convert.c \
+	ao_mutex.c \
+	ao_panic.c \
+	ao_stdio.c \
+	ao_storage.c \
+	ao_task.c \
+	ao_freq.c
+
+CC1111_SRC = \
+	ao_adc.c \
+	ao_aes.c \
+	ao_beep.c \
+	ao_dma.c \
+	ao_intflash.c \
+	ao_radio.c \
+	ao_radio_cmac.c \
+	ao_romconfig.c \
+	ao_serial.c \
+	ao_spi.c \
+	ao_string.c \
+	ao_timer.c \
+	ao_usb.c \
+	_bp.c
+
+DRIVER_SRC = \
+	ao_pca9922.c \
+	ao_74hc497.c \
+	ao_pad.c
+
+PRODUCT_SRC = \
+	ao_telefire.c
+
+SRC = \
+	$(CORE_SRC) \
+	$(CC1111_SRC) \
+	$(DRIVER_SRC) \
+	$(PRODUCT_SRC)
+
+PROGNAME = telefire-v$(TELEFIRE_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
+PRODUCT=TeleFire-v$(TELEFIRE_VER)
+PRODUCT_DEF=-DTELEFIRE_V_$(TELEFIRE_DEF)
+IDPRODUCT=0x000f
+CODESIZE=0x6700
+
+include ../cc1111/Makefile.cc1111
+
+NICKLE=nickle
+CHECK_STACK=sh ../util/check-stack
+
+V=0
+# The user has explicitly enabled quiet compilation.
+ifeq ($(V),0)
+quiet = @printf "  $1 $2 $@\n"; $($1)
+endif
+# Otherwise, print the full command line.
+quiet ?= $($1)
+
+all: ../$(PROG)
+
+../$(PROG): $(REL) Makefile
+	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)  || rm $@
+
+ao_product.h: ao-make-product.5c ../Version
+	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+
+distclean:	clean
+
+clean: clean-cc1111
+
+install:
+
+uninstall:
+
diff --git a/src/telefire-v0.1/ao_pins.h b/src/telefire-v0.1/ao_pins.h
new file mode 100644
index 00000000..4cf523fc
--- /dev/null
+++ b/src/telefire-v0.1/ao_pins.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2010 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#define HAS_RADIO	1
+
+#define HAS_FLIGHT		0
+#define HAS_USB			1
+#define HAS_BEEP		1
+#define HAS_GPS			0
+#define HAS_SERIAL_1		0
+#define HAS_ADC			1
+#define HAS_DBG			0
+#define HAS_EEPROM		1
+#define HAS_LOG			0
+#define USE_INTERNAL_FLASH	1
+#define DBG_ON_P1 		0
+#define IGNITE_ON_P2		0
+#define IGNITE_ON_P1		1
+#define IGNITE_ON_P0		0
+#define PACKET_HAS_MASTER	0
+#define PACKET_HAS_SLAVE	0
+#define AO_LED_RED		2
+#define AO_LED_GREEN		1
+#define LEDS_AVAILABLE		(0xff)
+#define HAS_EXTERNAL_TEMP	0
+#define HAS_ACCEL_REF		0
+#define SPI_CS_ON_P1		1
+#define HAS_AES			1
+
+#define SPI_CS_PORT	P1
+#define SPI_CS_SEL	P1SEL
+#define SPI_CS_DIR	P1DIR
+
+#define AO_74HC497_CS_PORT	P1
+#define AO_74HC497_CS_PIN	4
+#define AO_74HC497_CS		P1_4
+
+#define AO_PCA9922_CS_PORT	P1
+#define AO_PCA9922_CS_PIN	4
+#define AO_PCA9922_CS		P1_4
+
+#define AO_PAD_NUM		4
+#define	AO_PAD_PORT		P1
+#define AO_PAD_DIR		P1DIR
+#define AO_PAD_PIN_0		0
+#define AO_PAD_0		P1_0
+#define AO_PAD_PIN_1		1
+#define AO_PAD_1		P1_1
+#define AO_PAD_PIN_2		2
+#define AO_PAD_2		P1_2
+#define AO_PAD_PIN_3		3
+#define AO_PAD_3		P1_3
+#define AO_PAD_ALL_PINS		((1 << AO_PAD_PIN_0) | (1 << AO_PAD_PIN_1) | (1 << AO_PAD_PIN_2) | (1 << AO_PAD_PIN_3))
+
+/* test these values with real igniters */
+#define AO_PAD_RELAY_CLOSED	3524
+#define AO_PAD_NO_IGNITER	16904
+#define AO_PAD_GOOD_IGNITER	22514
+
+struct ao_adc {
+	int16_t		sense[4];
+	int16_t		pyro;
+	int16_t		batt;
+};
+
+#define AO_ADC_DUMP(p)							\
+	printf ("tick: %5u 0: %5d 1: %5d 2: %5d 3: %5d pyro: %5d batt %5d\n", \
+		(p)->adc.sense[0],					\
+		(p)->adc.sense[1],					\
+		(p)->adc.sense[2],					\
+		(p)->adc.sense[3],					\
+		(p)->adc.pyro,						\
+		(p)->adc.batt)
+
+#define AO_ADC_PINS	((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5))
+
+#endif /* _AO_PINS_H_ */
diff --git a/src/telefire-v0.1/ao_telefire.c b/src/telefire-v0.1/ao_telefire.c
new file mode 100644
index 00000000..96413a63
--- /dev/null
+++ b/src/telefire-v0.1/ao_telefire.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2012 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ao.h"
+#include "ao_pins.h"
+
+void
+main(void)
+{
+	ao_clock_init();
+
+	ao_led_init(LEDS_AVAILABLE);
+
+	ao_timer_init();
+	ao_adc_init();
+	ao_beep_init();
+	ao_cmd_init();
+	ao_spi_init();
+	ao_storage_init();
+	ao_usb_init();
+	ao_radio_init();
+	ao_aes_init();
+	ao_radio_cmac_init();
+	ao_pad_init();
+	ao_config_init();
+	ao_start_scheduler();
+}
-- 
cgit v1.2.3


From 2610b316eb939c1532061646b05207fcd54d984f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 5 Aug 2012 12:15:36 -0700
Subject: src/cc1111: Add ao_gpio_set macro

Allows general GPIO-using code to run on cc1111

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_arch_funcs.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 0737e7ab..29755b5c 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -88,3 +88,4 @@ ao_spi_init(void);
 #define token_paster(x,y)	x ## y
 #define token_evaluator(x,y)	token_paster(x,y)
 #define ao_enable_output(port,bit,pin,v) cc1111_enable_output(port,token_evaluator(port,DIR), token_evaluator(port,SEL), pin, bit, v)
+#define ao_gpio_set(port, bit, pin, v) ((pin) = (v))
-- 
cgit v1.2.3


From 39594fdb3e30a1a25dd894c217e3d9d773bab972 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 5 Aug 2012 12:16:25 -0700
Subject: src/cc1111: Allow serial0 without serial1

The ao_serial_speed structure is needed by serial0 too.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_serial.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_serial.c b/src/cc1111/ao_serial.c
index d90103b0..d5431070 100644
--- a/src/cc1111/ao_serial.c
+++ b/src/cc1111/ao_serial.c
@@ -17,6 +17,25 @@
 
 #include "ao.h"
 
+const __code struct ao_serial_speed ao_serial_speeds[] = {
+	/* [AO_SERIAL_SPEED_4800] = */ {
+		/* .baud = */ 163,
+		/* .gcr  = */ (7 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+	},
+	/* [AO_SERIAL_SPEED_9600] = */ {
+		/* .baud = */ 163,
+		/* .gcr  = */ (8 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+	},
+	/* [AO_SERIAL_SPEED_19200] = */ {
+		/* .baud = */ 163,
+		/* .gcr  = */ (9 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+	},
+	/* [AO_SERIAL_SPEED_57600] = */ {
+		/* .baud = */ 59,
+		/* .gcr =  */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+	},
+};
+
 #if HAS_SERIAL_0
 
 volatile __xdata struct ao_fifo	ao_serial0_rx_fifo;
@@ -181,25 +200,6 @@ ao_serial1_drain(void) __critical
 		ao_sleep(&ao_serial1_tx_fifo);
 }
 
-const __code struct ao_serial_speed ao_serial_speeds[] = {
-	/* [AO_SERIAL_SPEED_4800] = */ {
-		/* .baud = */ 163,
-		/* .gcr  = */ (7 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
-	},
-	/* [AO_SERIAL_SPEED_9600] = */ {
-		/* .baud = */ 163,
-		/* .gcr  = */ (8 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
-	},
-	/* [AO_SERIAL_SPEED_19200] = */ {
-		/* .baud = */ 163,
-		/* .gcr  = */ (9 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
-	},
-	/* [AO_SERIAL_SPEED_57600] = */ {
-		/* .baud = */ 59,
-		/* .gcr =  */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
-	},
-};
-
 void
 ao_serial1_set_speed(uint8_t speed)
 {
-- 
cgit v1.2.3


From 0f82021186565fda10df7893b95deae4a1f32778 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 5 Aug 2012 12:17:25 -0700
Subject: src/cc1111: Enable SPI slave mode

This is untested...

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_spi.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_spi.c b/src/cc1111/ao_spi.c
index 1bf5e155..88cff9dd 100644
--- a/src/cc1111/ao_spi.c
+++ b/src/cc1111/ao_spi.c
@@ -40,6 +40,7 @@ static __xdata uint8_t ao_spi_const;
 void
 ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 {
+#if !AO_SPI_SLAVE
 	ao_dma_set_transfer(ao_spi_dma_in_id,
 			    &U0DBUFXADDR,
 			    &ao_spi_const,
@@ -50,7 +51,7 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
-
+#endif
 	ao_dma_set_transfer(ao_spi_dma_out_id,
 			    block,
 			    &U0DBUFXADDR,
@@ -62,11 +63,18 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
 
+#if !AO_SPI_SLAVE
 	ao_dma_start(ao_spi_dma_in_id);
+#endif
 	ao_dma_start(ao_spi_dma_out_id);
 	ao_dma_trigger(ao_spi_dma_out_id);
+#if AO_SPI_SLAVE
+	__critical while (!ao_spi_dma_out_done)
+			   ao_sleep(&ao_spi_dma_out_done);
+#else
 	__critical while (!ao_spi_dma_in_done)
 		ao_sleep(&ao_spi_dma_in_done);
+#endif
 }
 
 /* Receive bytes over SPI.
@@ -115,10 +123,19 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
  * 	MO	P1_5
  * 	MI	P1_4
  * 	CLK	P1_3
+ *	CSS	P1_2
  *
- * Chip select is the responsibility of the caller
+ * Chip select is the responsibility of the caller in master mode
  */
 
+#if AO_SPI_SLAVE
+#define CSS	(1 << 2)
+#define UxCSR_DIRECTION	UxCSR_SLAVE
+#else
+#define CSS	0
+#define UxCSR_DIRECTION	UxCSR_MASTER
+#endif
+
 void
 ao_spi_init(void)
 {
@@ -131,7 +148,7 @@ ao_spi_init(void)
 	P2SEL = (P2SEL & ~P2SEL_PRI3P1_MASK) | P2SEL_PRI3P1_USART0;
 
 	/* Make the SPI pins be controlled by the USART peripheral */
-	P1SEL |= ((1 << 5) | (1 << 4) | (1 << 3));
+	P1SEL |= ((1 << 5) | (1 << 4) | (1 << 3) | CSS);
 
 	/* Set up OUT DMA */
 	ao_spi_dma_out_id = ao_dma_alloc(&ao_spi_dma_out_done);
@@ -143,7 +160,7 @@ ao_spi_init(void)
 	 *
 	 * SPI master mode
 	 */
-	U0CSR = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_MASTER);
+	U0CSR = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_DIRECTION);
 
 	/* Set the baud rate and signal parameters
 	 *
-- 
cgit v1.2.3


From de701d5a234cd21930cf92c9cabebb0e230da9b5 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 5 Aug 2012 14:58:40 -0700
Subject: altos: Build ao_kalman.h from cc1111 subdirs as needed

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/Makefile.cc1111 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/cc1111')

diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index bfd444dd..0e19603b 100644
--- a/src/cc1111/Makefile.cc1111
+++ b/src/cc1111/Makefile.cc1111
@@ -33,3 +33,6 @@ clean-cc1111:
 	rm -f $(PROGNAME)-*
 	rm -f ao_product.h
 	rm -f ../$(PROGNAME)-*
+
+../ao_kalman.h:
+	+(cd .. && make ao_kalman.h)
-- 
cgit v1.2.3


From c58f3d1a373b20fac3f51037008bcc40955f1348 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 7 Aug 2012 11:30:47 -0700
Subject: altos: Oops. Serial 1 stdin was busted by typo

A typo in the symbol used to enable stdin wakeups from serial1 caused
the input to pend until some other wakeup occurred.

This also makes the serial1 hw flow control pin selects in config 2
work right, although those aren't used by any current product

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_serial.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_serial.c b/src/cc1111/ao_serial.c
index d5431070..48383802 100644
--- a/src/cc1111/ao_serial.c
+++ b/src/cc1111/ao_serial.c
@@ -135,7 +135,7 @@ ao_serial1_rx_isr(void) __interrupt 3
 	if (!ao_fifo_full(ao_serial1_rx_fifo))
 		ao_fifo_insert(ao_serial1_rx_fifo, U1DBUF);
 	ao_wakeup(&ao_serial1_rx_fifo);
-#if USE_SERIAL1_STDIN
+#if USE_SERIAL_1_STDIN
 	ao_wakeup(&ao_stdin_ready);
 #endif
 }
@@ -292,7 +292,9 @@ ao_serial_init(void)
 
 	/* Make the USART pins be controlled by the USART */
 	P1SEL |= (1 << 6) | (1 << 7);
+#if HAS_SERIAL_1_HW_FLOW
 	P1SEL |= (1 << 5) | (1 << 4);
+#endif
 #endif
 
 	/* UART mode with receiver enabled */
-- 
cgit v1.2.3


From 8457ca81adc9d62a7ffe56a7c0c36f2fcadaa682 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 18 Aug 2012 21:25:34 -0700
Subject: altos/cc1111: Document SPI bus pin options

Just a comment in the source code about which pins each option selects.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_spi.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_spi.c b/src/cc1111/ao_spi.c
index 88cff9dd..52087fb4 100644
--- a/src/cc1111/ao_spi.c
+++ b/src/cc1111/ao_spi.c
@@ -118,13 +118,34 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 }
 
 /*
- * Initialize USART0 for SPI using config alt 2
+ * USART0 SPI config alt 2	 (using this one)
  *
  * 	MO	P1_5
  * 	MI	P1_4
  * 	CLK	P1_3
  *	CSS	P1_2
  *
+ * USART0 SPI config alt 1
+ * 
+ *	MO	P0_3
+ *	MI	P0_2
+ *	CLK	P0_5
+ *	SS	P0_4
+ *
+ * USART1 SPI config alt 2
+ *
+ *	MO	P1_6
+ *	MI	P1_7
+ *	CLK	P1_5
+ *	SS	P1_4
+ *
+ * USART1 SPI config alt 1
+ *
+ *	MO	P0_4
+ *	MI	P0_5
+ *	CLK	P0_3
+ *	SS	P0_2
+ *
  * Chip select is the responsibility of the caller in master mode
  */
 
-- 
cgit v1.2.3


From 7a0ed0ff4192060854d69e640de2c30105eb2f62 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 24 Aug 2012 00:27:13 -0700
Subject: altos: Disable telefire 'pad' listener when testing radio

Ensures that the radio testing won't block waiting for a firing mode
packet to arrive.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_radio.c |  9 +++++++++
 src/drivers/ao_pad.c  | 19 +++++++++++++++++++
 src/drivers/ao_pad.h  |  6 ++++++
 3 files changed, 34 insertions(+)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_radio.c b/src/cc1111/ao_radio.c
index 2071c47a..46b2362d 100644
--- a/src/cc1111/ao_radio.c
+++ b/src/cc1111/ao_radio.c
@@ -16,6 +16,9 @@
  */
 
 #include "ao.h"
+#if HAS_PAD
+#include <ao_pad.h>
+#endif
 
 /* Values from SmartRF® Studio for:
  *
@@ -484,6 +487,9 @@ ao_radio_test(void)
 #endif
 #if PACKET_HAS_SLAVE
 		ao_packet_slave_stop();
+#endif
+#if HAS_PAD
+		ao_pad_disable();
 #endif
 		ao_radio_get(0xff);
 		RFST = RFST_STX;
@@ -500,6 +506,9 @@ ao_radio_test(void)
 		radio_on = 0;
 #if HAS_MONITOR
 		ao_monitor_enable();
+#endif
+#if HAS_PAD
+		ao_pad_enable();
 #endif
 	}
 }
diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index 21aa788d..b6dbcefe 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -71,6 +71,23 @@ ao_pad_status(void)
 static __pdata uint8_t	ao_pad_armed;
 static __pdata uint16_t	ao_pad_arm_time;
 static __pdata uint8_t	ao_pad_box;
+static __xdata uint8_t	ao_pad_disabled;
+
+void
+ao_pad_disable(void)
+{
+	if (!ao_pad_disabled) {
+		ao_pad_disabled = 1;
+		ao_radio_recv_abort();
+	}
+}
+
+void
+ao_pad_enable(void)
+{
+	ao_pad_disabled = 0;
+	ao_wakeup (&ao_pad_disabled);
+}
 
 static void
 ao_pad(void)
@@ -85,6 +102,8 @@ ao_pad(void)
 	ao_pad_box = ao_74hc497_read();
 	for (;;) {
 		flush();
+		while (ao_pad_disabled)
+			ao_sleep(&ao_pad_disabled);
 		if (ao_radio_cmac_recv(&command, sizeof (command), 0) != AO_RADIO_CMAC_OK)
 			continue;
 		
diff --git a/src/drivers/ao_pad.h b/src/drivers/ao_pad.h
index 9ea016ff..d5ca3a88 100644
--- a/src/drivers/ao_pad.h
+++ b/src/drivers/ao_pad.h
@@ -64,4 +64,10 @@ struct ao_pad_query {
 void
 ao_pad_init(void);
 
+void
+ao_pad_disable(void);
+
+void
+ao_pad_enable(void);
+
 #endif /* _AO_PAD_H_ */
-- 
cgit v1.2.3


From 50b58d703b8b48005a3ca9ad4e3603d6f7ac1430 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 24 Aug 2012 00:33:38 -0700
Subject: altos: Make cc1111 SPI pins configurable

Allow either USART in any configuration. Still only supports one SPI
bus though.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_spi.c | 188 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 128 insertions(+), 60 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_spi.c b/src/cc1111/ao_spi.c
index 52087fb4..e7480fd7 100644
--- a/src/cc1111/ao_spi.c
+++ b/src/cc1111/ao_spi.c
@@ -17,6 +17,109 @@
 
 #include "ao.h"
 
+/* Default pin usage for existing Altus Metrum devices */
+#if !HAS_SPI_0 && !HAS_SPI_1
+#define HAS_SPI_0	1
+#define SPI_0_ALT_2	1
+#endif
+
+#ifndef SPI_CONST
+#define SPI_CONST	0xff
+#endif
+
+/*
+ * USART0 SPI config alt 1
+ * 
+ *	MO	P0_3
+ *	MI	P0_2
+ *	CLK	P0_5
+ *	SS	P0_4
+ *
+ * USART0 SPI config alt 2
+ *
+ * 	MO	P1_5
+ * 	MI	P1_4
+ * 	CLK	P1_3
+ *	CSS	P1_2
+ *
+ * USART1 SPI config alt 1
+ *
+ *	MO	P0_4
+ *	MI	P0_5
+ *	CLK	P0_3
+ *	SS	P0_2
+ *
+ * USART1 SPI config alt 2
+ *
+ *	MO	P1_6
+ *	MI	P1_7
+ *	CLK	P1_5
+ *	SS	P1_4
+ *
+ *
+ * Chip select is the responsibility of the caller in master mode
+ */
+
+#if HAS_SPI_0
+#define SPI_CSR		U0CSR
+#define SPI_BUF		U0DBUFXADDR
+#define SPI_BAUD	U0BAUD
+#define SPI_GCR		U0GCR
+#define SPI_CFG_MASK	PERCFG_U0CFG_ALT_MASK
+#define SPI_DMA_TX	DMA_CFG0_TRIGGER_UTX0
+#define SPI_DMA_RX	DMA_CFG0_TRIGGER_URX0
+
+#if SPI_0_ALT_1
+#define SPI_CFG		PERCFG_U0CFG_ALT_1
+#define SPI_SEL		P0SEL
+#define SPI_BITS	(1 << 3) | (1 << 2) | (1 << 5)
+#define SPI_CSS_BIT	(1 << 4)
+#endif
+
+#if SPI_0_ALT_2
+#define SPI_CFG		PERCFG_U0CFG_ALT_2
+#define SPI_SEL		P1SEL
+#define SPI_PRI		P2SEL_PRI3P1_USART0
+#define SPI_BITS	(1 << 5) | (1 << 4) | (1 << 3)
+#define SPI_CSS_BIT	(1 << 2)
+#endif
+
+#endif
+
+#if HAS_SPI_1
+#define SPI_CSR		U1CSR
+#define SPI_BUF		U1DBUFXADDR
+#define SPI_BAUD	U1BAUD
+#define SPI_GCR		U1GCR
+#define SPI_CFG_MASK	PERCFG_U1CFG_ALT_MASK
+#define SPI_DMA_TX	DMA_CFG0_TRIGGER_UTX1
+#define SPI_DMA_RX	DMA_CFG0_TRIGGER_URX1
+
+#if SPI_1_ALT_1
+#define SPI_CFG		PERCFG_U1CFG_ALT_1
+#define SPI_SEL		P0SEL
+#define SPI_BITS	(1 << 4) | (1 << 5) | (1 << 3)
+#define SPI_CSS_BIT	(1 << 2)
+#endif
+
+#if SPI_1_ALT_2
+#define SPI_CFG		PERCFG_U1CFG_ALT_2
+#define SPI_SEL		P1SEL
+#define SPI_PRI		P2SEL_PRI3P1_USART1
+#define SPI_BITS	(1 << 6) | (1 << 7) | (1 << 5)
+#define SPI_CSS_BIT	(1 << 4)
+#endif
+
+#endif
+
+#if AO_SPI_SLAVE
+#define CSS		SPI_CSS_BIT
+#define UxCSR_DIRECTION	UxCSR_SLAVE
+#else
+#define CSS		0
+#define UxCSR_DIRECTION	UxCSR_MASTER
+#endif
+
 /* Shared mutex to protect SPI bus, must cover the entire
  * operation, from CS low to CS high. This means that any SPI
  * user must protect the SPI bus with this mutex
@@ -42,23 +145,23 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 {
 #if !AO_SPI_SLAVE
 	ao_dma_set_transfer(ao_spi_dma_in_id,
-			    &U0DBUFXADDR,
+			    &SPI_BUF,
 			    &ao_spi_const,
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    DMA_CFG0_TRIGGER_URX0,
+			    SPI_DMA_RX,
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
 #endif
 	ao_dma_set_transfer(ao_spi_dma_out_id,
 			    block,
-			    &U0DBUFXADDR,
+			    &SPI_BUF,
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    DMA_CFG0_TRIGGER_UTX0,
+			    SPI_DMA_TX,
 			    DMA_CFG1_SRCINC_1 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
@@ -77,6 +180,8 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 #endif
 }
 
+
+
 /* Receive bytes over SPI.
  *
  * This sets up tow DMA engines, one reading the data and another
@@ -87,25 +192,25 @@ void
 ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 {
 	ao_dma_set_transfer(ao_spi_dma_in_id,
-			    &U0DBUFXADDR,
+			    &SPI_BUF,
 			    block,
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    DMA_CFG0_TRIGGER_URX0,
+			    SPI_DMA_RX,
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_1 |
 			    DMA_CFG1_PRIORITY_NORMAL);
 
-	ao_spi_const = 0xff;
+	ao_spi_const = SPI_CONST;
 
 	ao_dma_set_transfer(ao_spi_dma_out_id,
 			    &ao_spi_const,
-			    &U0DBUFXADDR,
+			    &SPI_BUF,
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    DMA_CFG0_TRIGGER_UTX0,
+			    SPI_DMA_TX,
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
@@ -117,59 +222,22 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 		ao_sleep(&ao_spi_dma_in_done);
 }
 
-/*
- * USART0 SPI config alt 2	 (using this one)
- *
- * 	MO	P1_5
- * 	MI	P1_4
- * 	CLK	P1_3
- *	CSS	P1_2
- *
- * USART0 SPI config alt 1
- * 
- *	MO	P0_3
- *	MI	P0_2
- *	CLK	P0_5
- *	SS	P0_4
- *
- * USART1 SPI config alt 2
- *
- *	MO	P1_6
- *	MI	P1_7
- *	CLK	P1_5
- *	SS	P1_4
- *
- * USART1 SPI config alt 1
- *
- *	MO	P0_4
- *	MI	P0_5
- *	CLK	P0_3
- *	SS	P0_2
- *
- * Chip select is the responsibility of the caller in master mode
- */
-
-#if AO_SPI_SLAVE
-#define CSS	(1 << 2)
-#define UxCSR_DIRECTION	UxCSR_SLAVE
-#else
-#define CSS	0
-#define UxCSR_DIRECTION	UxCSR_MASTER
-#endif
 
 void
 ao_spi_init(void)
 {
 	/* Set up the USART pin assignment */
-	PERCFG = (PERCFG & ~PERCFG_U0CFG_ALT_MASK) | PERCFG_U0CFG_ALT_2;
+	PERCFG = (PERCFG & ~SPI_CFG_MASK) | SPI_CFG;
 
-	/* Ensure that USART0 takes precidence over USART1 for pins that
-	 * they share
+	/* Ensure that SPI USART takes precidence over the other USART
+	 * for pins that they share
 	 */
-	P2SEL = (P2SEL & ~P2SEL_PRI3P1_MASK) | P2SEL_PRI3P1_USART0;
+#ifdef SPI_PRI
+	P2SEL = (P2SEL & ~P2SEL_PRI3P1_MASK) | SPI_PRI;
+#endif
 
 	/* Make the SPI pins be controlled by the USART peripheral */
-	P1SEL |= ((1 << 5) | (1 << 4) | (1 << 3) | CSS);
+	SPI_SEL |= SPI_BITS | CSS;
 
 	/* Set up OUT DMA */
 	ao_spi_dma_out_id = ao_dma_alloc(&ao_spi_dma_out_done);
@@ -179,9 +247,9 @@ ao_spi_init(void)
 
 	/* Set up the USART.
 	 *
-	 * SPI master mode
+	 * SPI master/slave mode
 	 */
-	U0CSR = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_DIRECTION);
+	SPI_CSR = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_DIRECTION);
 
 	/* Set the baud rate and signal parameters
 	 *
@@ -189,9 +257,9 @@ ao_spi_init(void)
 	 * Every peripheral I've ever seen goes faster than that,
 	 * so set the clock to 3MHz (BAUD_E 17, BAUD_M 0)
 	 */
-	U0BAUD = 0;
-	U0GCR = (UxGCR_CPOL_NEGATIVE |
-		 UxGCR_CPHA_FIRST_EDGE |
-		 UxGCR_ORDER_MSB |
-		 (17 << UxGCR_BAUD_E_SHIFT));
+	SPI_BAUD = 0;
+	SPI_GCR = (UxGCR_CPOL_NEGATIVE |
+		   UxGCR_CPHA_FIRST_EDGE |
+		   UxGCR_ORDER_MSB |
+		   (17 << UxGCR_BAUD_E_SHIFT));
 }
-- 
cgit v1.2.3


From 89f1a685a02c7808cf03853aa9a5ee50c6baf49e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 26 Aug 2012 09:43:34 -0700
Subject: altos: Allow sharing of radio DMA with aes engine

otherwise, telefire doesn't have enough DMA channels.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_aes.c             | 4 ++++
 src/telefire-v0.1/ao_pins.h     | 1 +
 src/telefire-v0.1/ao_telefire.c | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_aes.c b/src/cc1111/ao_aes.c
index d50fecfb..0e32abf6 100644
--- a/src/cc1111/ao_aes.c
+++ b/src/cc1111/ao_aes.c
@@ -136,7 +136,11 @@ void
 ao_aes_init(void)
 {
 	ao_aes_dma_in = ao_dma_alloc(&ao_aes_dma_in_done);
+#if DMA_SHARE_AES_RADIO
+	ao_aes_dma_out = ao_radio_dma;
+#else
 	ao_aes_dma_out = ao_dma_alloc(&ao_aes_dma_out_done);
+#endif
 	S0CON = 0;
 	ENCIE = 1;
 }
diff --git a/src/telefire-v0.1/ao_pins.h b/src/telefire-v0.1/ao_pins.h
index d3a9e9e3..eecf783e 100644
--- a/src/telefire-v0.1/ao_pins.h
+++ b/src/telefire-v0.1/ao_pins.h
@@ -53,6 +53,7 @@
 #define HAS_ACCEL_REF		0
 #define SPI_CS_ON_P1		1
 #define HAS_AES			1
+#define DMA_SHARE_AES_RADIO	1
 
 #define SPI_CS_PORT	P1
 #define SPI_CS_SEL	P1SEL
diff --git a/src/telefire-v0.1/ao_telefire.c b/src/telefire-v0.1/ao_telefire.c
index c1335d66..210be08b 100644
--- a/src/telefire-v0.1/ao_telefire.c
+++ b/src/telefire-v0.1/ao_telefire.c
@@ -35,7 +35,7 @@ main(void)
 	ao_storage_init();
 	ao_usb_init();
 	ao_radio_init();
-//	ao_aes_init();
+	ao_aes_init();
 	ao_pad_init();
 	ao_config_init();
 	ao_start_scheduler();
-- 
cgit v1.2.3


From a27b9b5c36cf748e415ba210c8d8ae72d8227a98 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 27 Aug 2012 13:35:39 -0700
Subject: altos: Add SPI slave get/put macros to cc1111

Theese don't try to drive the chip select line

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_arch_funcs.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 29755b5c..5e2fc13d 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -29,6 +29,15 @@ extern __xdata uint8_t	ao_spi_mutex;
 					  UxGCR_ORDER_MSB |		\
 					  ((speed) << UxGCR_BAUD_E_SHIFT)))
 
+#define ao_spi_get_slave(bus) do {			\
+		ao_mutex_get(&ao_spi_mutex);		\
+		ao_spi_set_speed(AO_SPI_SPEED_FAST);	\
+	} while (0)
+
+#define ao_spi_put_slave(bus) do {		\
+		ao_mutex_put(&ao_spi_mutex);	\
+	} while (0)
+
 #define ao_spi_get_mask(reg,mask,bus,speed) do {	\
 		ao_mutex_get(&ao_spi_mutex);		\
 		ao_spi_set_speed(speed);		\
-- 
cgit v1.2.3


From 28c3923b6180e24a77aecc7162bb2852cec7d770 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 27 Aug 2012 13:37:14 -0700
Subject: altos: More SPI slave changes for cc1111 driver

Don't enable DMA in the other direction when doing slave transfers.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_spi.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_spi.c b/src/cc1111/ao_spi.c
index e7480fd7..2b4fd186 100644
--- a/src/cc1111/ao_spi.c
+++ b/src/cc1111/ao_spi.c
@@ -204,6 +204,7 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 
 	ao_spi_const = SPI_CONST;
 
+#if !AO_SPI_SLAVE
 	ao_dma_set_transfer(ao_spi_dma_out_id,
 			    &ao_spi_const,
 			    &SPI_BUF,
@@ -214,10 +215,13 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
+#endif
 
 	ao_dma_start(ao_spi_dma_in_id);
+#if !AO_SPI_SLAVE
 	ao_dma_start(ao_spi_dma_out_id);
 	ao_dma_trigger(ao_spi_dma_out_id);
+#endif
 	__critical while (!ao_spi_dma_in_done)
 		ao_sleep(&ao_spi_dma_in_done);
 }
-- 
cgit v1.2.3


From 0f3483f93137f41a61f3fcbe06afcaffb1b9e17b Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 27 Aug 2012 13:47:16 -0700
Subject: altos: Clean up radio APIs

Move api to ao_radio_cmac.h include file.
Expose ao_radio_test as standard API.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_launch.c   |  3 +-
 src/cc1111/ao_radio.c    | 69 +++++++++++++++++++++++----------------
 src/core/ao.h            |  6 ++--
 src/core/ao_aes.h        | 17 ----------
 src/core/ao_radio_cmac.c | 84 +++---------------------------------------------
 src/core/ao_radio_cmac.h | 43 +++++++++++++++++++++++++
 src/drivers/ao_cc1120.c  |  4 +--
 src/drivers/ao_pad.c     |  1 +
 8 files changed, 97 insertions(+), 130 deletions(-)
 create mode 100644 src/core/ao_radio_cmac.h

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_launch.c b/src/cc1111/ao_launch.c
index a593d0b2..420f7568 100644
--- a/src/cc1111/ao_launch.c
+++ b/src/cc1111/ao_launch.c
@@ -15,7 +15,8 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "ao.h"
+#include <ao.h>
+#include <ao_radio_cmac.h>
 
 __xdata uint16_t ao_launch_ignite;
 
diff --git a/src/cc1111/ao_radio.c b/src/cc1111/ao_radio.c
index 46b2362d..cb2c2fdd 100644
--- a/src/cc1111/ao_radio.c
+++ b/src/cc1111/ao_radio.c
@@ -470,8 +470,44 @@ ao_radio_rdf_abort(void)
 
 
 /* Output carrier */
+
+static __xdata	ao_radio_test_on;
+
 void
-ao_radio_test(void)
+ao_radio_test(uint8_t on)
+{
+	if (on) {
+		if (!ao_radio_test_on) {
+#if HAS_MONITOR
+			ao_monitor_disable();
+#endif
+#if PACKET_HAS_SLAVE
+			ao_packet_slave_stop();
+#endif
+#if HAS_PAD
+			ao_pad_disable();
+#endif
+			ao_radio_get(0xff);
+			RFST = RFST_STX;
+			ao_radio_test_on = 1;
+		}
+	} else  {
+		if (ao_radio_test_on) {
+			ao_radio_idle();
+			ao_radio_put();
+			ao_radio_test_on = 0;
+#if HAS_MONITOR
+			ao_monitor_enable();
+#endif
+#if HAS_PAD
+			ao_pad_enable();
+#endif
+		}
+	}
+}
+
+static void
+ao_radio_test_cmd(void)
 {
 	uint8_t	mode = 2;
 	static __xdata radio_on;
@@ -481,40 +517,19 @@ ao_radio_test(void)
 		mode = (uint8_t) ao_cmd_lex_u32;
 	}
 	mode++;
-	if ((mode & 2) && !radio_on) {
-#if HAS_MONITOR
-		ao_monitor_disable();
-#endif
-#if PACKET_HAS_SLAVE
-		ao_packet_slave_stop();
-#endif
-#if HAS_PAD
-		ao_pad_disable();
-#endif
-		ao_radio_get(0xff);
-		RFST = RFST_STX;
-		radio_on = 1;
-	}
+	if ((mode & 2))
+		ao_radio_test(1);
 	if (mode == 3) {
 		printf ("Hit a character to stop..."); flush();
 		getchar();
 		putchar('\n');
 	}
-	if ((mode & 1) && radio_on) {
-		ao_radio_idle();
-		ao_radio_put();
-		radio_on = 0;
-#if HAS_MONITOR
-		ao_monitor_enable();
-#endif
-#if HAS_PAD
-		ao_pad_enable();
-#endif
-	}
+	if ((mode & 1))
+		ao_radio_test(0);
 }
 
 __code struct ao_cmds ao_radio_cmds[] = {
-	{ ao_radio_test,	"C <1 start, 0 stop, none both>\0Radio carrier test" },
+	{ ao_radio_test_cmd,	"C <1 start, 0 stop, none both>\0Radio carrier test" },
 	{ 0,	NULL },
 };
 
diff --git a/src/core/ao.h b/src/core/ao.h
index 5e1fbb9d..b8bedd85 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -543,9 +543,6 @@ ao_telemetry_tiny_init(void);
  */
 
 extern __xdata uint8_t	ao_radio_dma;
-extern __xdata uint8_t ao_radio_dma_done;
-extern __xdata uint8_t ao_radio_done;
-extern __xdata uint8_t ao_radio_mutex;
 
 #ifdef PKT_APPEND_STATUS_1_CRC_OK
 #define AO_RADIO_STATUS_CRC_OK	PKT_APPEND_STATUS_1_CRC_OK
@@ -566,6 +563,9 @@ ao_radio_recv(__xdata void *d, uint8_t size) __reentrant;
 void
 ao_radio_recv_abort(void);
 
+void
+ao_radio_test(uint8_t on);
+
 /*
  * Compute the packet length as follows:
  *
diff --git a/src/core/ao_aes.h b/src/core/ao_aes.h
index ab3e367e..c47bc2db 100644
--- a/src/core/ao_aes.h
+++ b/src/core/ao_aes.h
@@ -51,21 +51,4 @@ ao_aes_run(__xdata uint8_t *in,
 void
 ao_aes_init(void);
 
-/* ao_radio_cmac.c */
-
-int8_t
-ao_radio_cmac_send(__xdata void *packet, uint8_t len) __reentrant;
-
-#define AO_RADIO_CMAC_OK	0
-#define AO_RADIO_CMAC_LEN_ERROR	-1
-#define AO_RADIO_CMAC_CRC_ERROR	-2
-#define AO_RADIO_CMAC_MAC_ERROR	-3
-#define AO_RADIO_CMAC_TIMEOUT	-4
-
-int8_t
-ao_radio_cmac_recv(__xdata void *packet, uint8_t len, uint16_t timeout) __reentrant;
-
-void
-ao_radio_cmac_init(void);
-
 #endif /* _AO_AES_H_ */
diff --git a/src/core/ao_radio_cmac.c b/src/core/ao_radio_cmac.c
index 3e8dce53..fc0ca8b1 100644
--- a/src/core/ao_radio_cmac.c
+++ b/src/core/ao_radio_cmac.c
@@ -15,38 +15,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "ao.h"
-
-#define AO_CMAC_KEY_LEN		AO_AES_LEN
-#define AO_CMAC_MAX_LEN		(128 - AO_CMAC_KEY_LEN)
+#include <ao.h>
+#include <ao_radio_cmac.h>
 
 static __xdata uint8_t ao_radio_cmac_mutex;
-__pdata int16_t ao_radio_cmac_rssi;
+__pdata int8_t ao_radio_cmac_rssi;
 static __xdata uint8_t cmac_data[AO_CMAC_MAX_LEN + AO_CMAC_KEY_LEN + 2 + AO_CMAC_KEY_LEN];
 static __pdata uint8_t ao_radio_cmac_len;
 
-static uint8_t
-getnibble(void)
-{
-	int8_t	b;
-
-	b = ao_cmd_hexchar(getchar());
-	if (b < 0) {
-		ao_cmd_status = ao_cmd_lex_error;
-		return 0;
-	}
-	return (uint8_t) b;
-}
-
-static uint8_t
-getbyte(void)
-{
-	uint8_t	b;
-	b = getnibble() << 4;
-	b |= getnibble();
-	return b;
-}
-	
 static uint8_t
 round_len(uint8_t len)
 {
@@ -120,7 +96,7 @@ radio_cmac_recv(uint8_t len, uint16_t timeout) __reentrant
 		return AO_RADIO_CMAC_TIMEOUT;
 	}
 
-	ao_radio_cmac_rssi = (int16_t) (((int8_t) cmac_data[len + AO_CMAC_KEY_LEN]) >> 1) - 74;
+	ao_radio_cmac_rssi = (int8_t) (((int8_t) cmac_data[len + AO_CMAC_KEY_LEN]) >> 1) - 74;
 	if (!(cmac_data[len + AO_CMAC_KEY_LEN +1] & AO_RADIO_STATUS_CRC_OK))
 		return AO_RADIO_CMAC_CRC_ERROR;
 
@@ -191,55 +167,3 @@ ao_radio_cmac_recv(__xdata void *packet, uint8_t len, uint16_t timeout) __reentr
 	return i;
 }
 
-static void
-radio_cmac_send_cmd(void) __reentrant
-{
-	uint8_t	i;
-	uint8_t	len;
-
-	ao_cmd_decimal();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	len = ao_cmd_lex_i;
-	if (len > AO_CMAC_MAX_LEN) {
-		ao_cmd_status = ao_cmd_syntax_error;
-		return;
-	}
-	flush();
-	ao_mutex_get(&ao_radio_cmac_mutex);
-	len = ao_cmd_lex_i;
-	for (i = 0; i < len; i++) {
-		cmac_data[i] = getbyte();
-		if (ao_cmd_status != ao_cmd_success)
-			return;
-	}
-	radio_cmac_send(len);
-	ao_mutex_put(&ao_radio_cmac_mutex);
-}
-
-static void
-radio_cmac_recv_cmd(void) __reentrant
-{
-	uint8_t		len, i;
-	uint16_t	timeout;
-
-	ao_cmd_decimal();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	len = ao_cmd_lex_i;
-	ao_cmd_decimal();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	timeout = AO_MS_TO_TICKS(ao_cmd_lex_i);
-	ao_mutex_get(&ao_radio_cmac_mutex);
-	i = radio_cmac_recv(len, timeout);
-	if (i == AO_RADIO_CMAC_OK) {
-		printf ("PACKET ");
-		for (i = 0; i < len; i++)
-			printf("%02x", cmac_data[i]);
-		printf (" %d\n", ao_radio_cmac_rssi);
-	} else
-		printf ("ERROR %d %d\n", i, ao_radio_cmac_rssi);
-	ao_mutex_put(&ao_radio_cmac_mutex);
-}
-
diff --git a/src/core/ao_radio_cmac.h b/src/core/ao_radio_cmac.h
new file mode 100644
index 00000000..e86f31e9
--- /dev/null
+++ b/src/core/ao_radio_cmac.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2012 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; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_RADIO_CMAC_H_
+#define _AO_RADIO_CMAC_H_
+
+#include <ao_aes.h>
+
+#define AO_CMAC_KEY_LEN		AO_AES_LEN
+#define AO_CMAC_MAX_LEN		(128 - AO_CMAC_KEY_LEN)
+
+extern __pdata int8_t ao_radio_cmac_rssi;
+
+int8_t
+ao_radio_cmac_send(__xdata void *packet, uint8_t len) __reentrant;
+
+#define AO_RADIO_CMAC_OK	0
+#define AO_RADIO_CMAC_LEN_ERROR	-1
+#define AO_RADIO_CMAC_CRC_ERROR	-2
+#define AO_RADIO_CMAC_MAC_ERROR	-3
+#define AO_RADIO_CMAC_TIMEOUT	-4
+
+int8_t
+ao_radio_cmac_recv(__xdata void *packet, uint8_t len, uint16_t timeout) __reentrant;
+
+void
+ao_radio_cmac_init(void);
+
+#endif /* _AO_RADIO_CMAC_H_ */
diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index 97a434d8..4df931b5 100644
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -515,7 +515,7 @@ ao_radio_rdf_abort(void)
 }
 
 static void
-ao_radio_test(void)
+ao_radio_test_cmd(void)
 {
 	uint8_t	mode = 2;
 	uint8_t radio_on;
@@ -1008,7 +1008,7 @@ ao_radio_test_recv()
 #endif
 
 static const struct ao_cmds ao_radio_cmds[] = {
-	{ ao_radio_test,	"C <1 start, 0 stop, none both>\0Radio carrier test" },
+	{ ao_radio_test_cmd,	"C <1 start, 0 stop, none both>\0Radio carrier test" },
 #if CC1120_DEBUG
 	{ ao_radio_show,	"R\0Show CC1120 status" },
 	{ ao_radio_beep,	"b\0Emit an RDF beacon" },
diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index 791c9a47..b33a5ffd 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -18,6 +18,7 @@
 #include <ao.h>
 #include <ao_pad.h>
 #include <ao_74hc497.h>
+#include <ao_radio_cmac.h>
 
 static __xdata uint8_t ao_pad_ignite;
 static __xdata struct ao_pad_command	command;
-- 
cgit v1.2.3