From 8a19805a6b079450b5afd5fa2334cede8495ae4a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 17 May 2013 03:21:08 -0700
Subject: altos/cc1111: Hack on USB driver to make Windows happy

The Windows modem driver is quite chatty at startup time, getting and
setting the comm parameters each time the device is opened. Sometimes,
when setting the parameters, the cc1111 would STALL EP0.

Most of the time, Windows would happily pass this as an error back to
AltosUI which would then re-try the open (and succeed, most of the
time).

Sometimes, Windows would stall for 30 seconds before passing the error
back. This made the whole UI freeze, and I suspect most people assumed
our app had died.

A bit of analysis with the beagle USB sniffer and I discovered the
STALL settings, but there wasn't any correlation between the data on
the wire and when the STALL would be generated.

So, I found a couple of other cc1111 USB stacks on the net and just
looked to see how our driver differed. There wasn't anything clearly
related, but there were a list of small differences:

 1) Other drivers didn't bother waiting for the hardware to
    ack the USBADDR setting; doing it this way means we can set
    the address *before* acking the setup packet. It'll get
    set eventually, at which point the device will start responding to
    packets again.

    Easy to fix, and saves a bit of code space too.

 2) The other drivers set the STALL bit for setup packets which aren't
    understood. This shouldn't have any effect on 'good' systems as
    those shouldn't ever be generating bogus setup packets anyways.

    The driver already handled the STALL state in the interrupt
    handler, the only requirement was to figure out when to explicitly
    set the STALL bit.

    That required moving the state updating code from the start of the
    ep0 setup handling to the end, after the setup packet had been
    examined and data queued in or out as appropriate.

 3) Our driver explicitly queued an IN packet for any setup request
    that wasn't waiting for an OUT pack. This appears to tie in with
    the USBADDR change above as before I made that change, this change
    caused the driver to fail to respond to most setup packets.

    This was simple once the above change was made, just move the
    generation of the IN packet inside the code that switched to the
    IN state.

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

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_usb.c b/src/cc1111/ao_usb.c
index 8bd2efdf..a655d1be 100644
--- a/src/cc1111/ao_usb.c
+++ b/src/cc1111/ao_usb.c
@@ -152,19 +152,17 @@ ao_usb_ep0_fill(void)
 		*ao_usb_ep0_out_data++ = USBFIFO[0];
 }
 
-void
+static void
 ao_usb_ep0_queue_byte(uint8_t a)
 {
 	ao_usb_ep0_in_buf[ao_usb_ep0_in_len++] = a;
 }
 
-void
+static void
 ao_usb_set_address(uint8_t address)
 {
 	ao_usb_running = 1;
-	USBADDR = address | 0x80;
-	while (USBADDR & 0x80)
-		;
+	USBADDR = address;
 }
 
 static void
@@ -191,24 +189,6 @@ ao_usb_ep0_setup(void)
 	if (ao_usb_ep0_out_len != 0)
 		return;
 
-	/* Figure out how to ACK the setup packet */
-	if (ao_usb_setup.dir_type_recip & AO_USB_DIR_IN) {
-		if (ao_usb_setup.length)
-			ao_usb_ep0_state = AO_USB_EP0_DATA_IN;
-		else
-			ao_usb_ep0_state = AO_USB_EP0_IDLE;
-	} else {
-		if (ao_usb_setup.length)
-			ao_usb_ep0_state = AO_USB_EP0_DATA_OUT;
-		else
-			ao_usb_ep0_state = AO_USB_EP0_IDLE;
-	}
-	USBINDEX = 0;
-	if (ao_usb_ep0_state == AO_USB_EP0_IDLE)
-		USBCS0 = USBCS0_CLR_OUTPKT_RDY | USBCS0_DATA_END;
-	else
-		USBCS0 = USBCS0_CLR_OUTPKT_RDY;
-
 	ao_usb_ep0_in_data = ao_usb_ep0_in_buf;
 	ao_usb_ep0_in_len = 0;
 	switch(ao_usb_setup.dir_type_recip & AO_USB_SETUP_TYPE_MASK) {
@@ -274,10 +254,39 @@ ao_usb_ep0_setup(void)
 		}
 		break;
 	}
-	if (ao_usb_ep0_state != AO_USB_EP0_DATA_OUT) {
+
+	/* Figure out how to ACK the setup packet and the
+	 * next state
+	 */
+	USBINDEX = 0;
+	if (ao_usb_ep0_in_len) {
+
+		/* Sending data back to the host
+		 */
+		ao_usb_ep0_state = AO_USB_EP0_DATA_IN;
+		USBCS0 = USBCS0_CLR_OUTPKT_RDY;
 		if (ao_usb_setup.length < ao_usb_ep0_in_len)
 			ao_usb_ep0_in_len = ao_usb_setup.length;
 		ao_usb_ep0_flush();
+	} else if (ao_usb_ep0_out_len) {
+		
+		/* Receiving data from the host
+		 */
+		ao_usb_ep0_state = AO_USB_EP0_DATA_OUT;
+		USBCS0 = USBCS0_CLR_OUTPKT_RDY;
+	} else if (ao_usb_setup.length) {
+
+		/* Uh-oh, the host expected to send or receive data
+		 * and we don't know what to do.
+		 */
+		ao_usb_ep0_state = AO_USB_EP0_STALL;
+		USBCS0 = USBCS0_CLR_OUTPKT_RDY | USBCS0_SEND_STALL;
+	} else {
+
+		/* Simple setup packet with no data
+		 */
+		ao_usb_ep0_state = AO_USB_EP0_IDLE;
+		USBCS0 = USBCS0_CLR_OUTPKT_RDY | USBCS0_DATA_END;
 	}
 }
 
@@ -299,12 +308,12 @@ ao_usb_ep0(void)
 		USBINDEX = 0;
 		cs0 = USBCS0;
 		if (cs0 & USBCS0_SETUP_END) {
-			ao_usb_ep0_state = AO_USB_EP0_IDLE;
 			USBCS0 = USBCS0_CLR_SETUP_END;
+			ao_usb_ep0_state = AO_USB_EP0_IDLE;
 		}
 		if (cs0 & USBCS0_SENT_STALL) {
+			USBCS0 = 0;
 			ao_usb_ep0_state = AO_USB_EP0_IDLE;
-			USBCS0 &= ~USBCS0_SENT_STALL;
 		}
 		if (ao_usb_ep0_state == AO_USB_EP0_DATA_IN &&
 		    (cs0 & USBCS0_INPKT_RDY) == 0)
@@ -318,12 +327,11 @@ ao_usb_ep0(void)
 				break;
 			case AO_USB_EP0_DATA_OUT:
 				ao_usb_ep0_fill();
-				if (ao_usb_ep0_out_len == 0)
-					ao_usb_ep0_state = AO_USB_EP0_IDLE;
 				USBINDEX = 0;
-				if (ao_usb_ep0_state == AO_USB_EP0_IDLE)
+				if (ao_usb_ep0_out_len == 0) {
+					ao_usb_ep0_state = AO_USB_EP0_IDLE;
 					USBCS0 = USBCS0_CLR_OUTPKT_RDY | USBCS0_DATA_END;
-				else
+				} else
 					USBCS0 = USBCS0_CLR_OUTPKT_RDY;
 				break;
 			}
-- 
cgit v1.2.3


From 187f661c2512e4260d0ca64134de8fad199f5944 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 9 Jun 2013 10:00:54 -0700
Subject: altos: Add telefire v0.2 support

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/Makefile                    |   9 +--
 src/cc1111/ao_adc.c             |   2 +-
 src/drivers/ao_pad.c            |  25 +++++--
 src/telefire-v0.2/Makefile      | 103 ++++++++++++++++++++++++++++
 src/telefire-v0.2/ao_pins.h     | 144 ++++++++++++++++++++++++++++++++++++++++
 src/telefire-v0.2/ao_telefire.c |  45 +++++++++++++
 6 files changed, 317 insertions(+), 11 deletions(-)
 create mode 100644 src/telefire-v0.2/Makefile
 create mode 100644 src/telefire-v0.2/ao_pins.h
 create mode 100644 src/telefire-v0.2/ao_telefire.c

(limited to 'src/cc1111')

diff --git a/src/Makefile b/src/Makefile
index ff26ac20..ee76c325 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,14 +16,11 @@ include Version
 
 SDCCDIRS=\
 	telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
-	teledongle-v0.2 teledongle-v0.1 \
-	telemini-v1.0 telenano-v0.1 \
+	teledongle-v0.2 \
+	telemini-v1.0 \
 	telebt-v1.0 \
-	telemetrum-v0.1-sky telemetrum-v0.1-sirf \
-	telelaunch-v0.1 tidongle test \
 	teleterra-v0.2 teleshield-v0.1 \
-	telefire-v0.1 \
-	spiradio-v0.1
+	telefire-v0.1 telefire-v0.2
 
 AVRDIRS=\
 	telescience-v0.1 telescience-pwm micropeak
diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index ed76179b..4a58023d 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -144,7 +144,7 @@ ao_adc_isr(void) __interrupt 1
 	}
 #endif /* telemini || telenano */
 
-#ifdef TELEFIRE_V_0_1
+#if defined(TELEFIRE_V_0_1) || defined(TELEFIRE_V_0_2)
 	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.sense[0] + sequence - AO_ADC_FIRST_PIN);
 	a[0] = ADCL;
 	a[1] = ADCH;
diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index 6cec98ab..e0c03c74 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -17,7 +17,7 @@
 
 #include <ao.h>
 #include <ao_pad.h>
-#include <ao_74hc497.h>
+#include <ao_74hc165.h>
 #include <ao_radio_cmac.h>
 
 static __xdata uint8_t ao_pad_ignite;
@@ -218,6 +218,21 @@ ao_pad_enable(void)
 	ao_wakeup (&ao_pad_disabled);
 }
 
+#if HAS_74HC165
+static uint8_t
+ao_pad_read_box(void)
+{
+	uint8_t		byte = ao_74hc165_read();
+	uint8_t		h, l;
+
+	h = byte >> 4;
+	l = byte & 0xf;
+	return h * 10 + l;
+}
+#else
+#define ao_pad_read_box()	0
+#endif
+
 static void
 ao_pad(void)
 {
@@ -236,8 +251,10 @@ ao_pad(void)
 		if (ret != AO_RADIO_CMAC_OK)
 			continue;
 		
-		PRINTD ("tick %d box %d cmd %d channels %02x\n",
-			command.tick, command.box, command.cmd, command.channels);
+		ao_pad_box = ao_pad_read_box();
+
+		PRINTD ("tick %d box %d (me %d) cmd %d channels %02x\n",
+			command.tick, command.box, ao_pad_box, command.cmd, command.channels);
 
 		switch (command.cmd) {
 		case AO_LAUNCH_ARM:
@@ -327,7 +344,7 @@ ao_pad_test(void)
 	}
 
 	for (c = 0; c < AO_PAD_NUM; c++) {
-		printf ("Pad %d: ");
+		printf ("Pad %d: ", c);
 		switch (query.igniter_status[c]) {
 		case AO_PAD_IGNITER_STATUS_NO_IGNITER_RELAY_CLOSED:	printf ("No igniter. Relay closed\n"); break;
 		case AO_PAD_IGNITER_STATUS_NO_IGNITER_RELAY_OPEN:	printf ("No igniter. Relay open\n"); break;
diff --git a/src/telefire-v0.2/Makefile b/src/telefire-v0.2/Makefile
new file mode 100644
index 00000000..3353bc1a
--- /dev/null
+++ b/src/telefire-v0.2/Makefile
@@ -0,0 +1,103 @@
+#
+# TeleFire build file
+#
+
+TELEFIRE_VER=0.2
+TELEFIRE_DEF=0_2
+
+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 \
+	ao_pad.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_74hc165.c \
+	ao_pad.c \
+	ao_radio_cmac_cmd.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.2/ao_pins.h b/src/telefire-v0.2/ao_pins.h
new file mode 100644
index 00000000..f4050722
--- /dev/null
+++ b/src/telefire-v0.2/ao_pins.h
@@ -0,0 +1,144 @@
+/*
+ * 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		0
+#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 HAS_PAD			1
+#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_CONTINUITY(c)	(1 << (c))
+#define AO_LED_CONTINUITY_MASK	(0xf)
+#define AO_LED_RX		0x10
+#define AO_LED_TX		0x20
+#define AO_LED_ARMED		0x40
+#define AO_LED_POWER		0x80
+
+#define AO_LED_RED		AO_LED_TX
+#define AO_LED_GREEN		AO_LED_RX
+
+#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 DMA_SHARE_AES_RADIO	1
+
+#define SPI_CS_PORT	P1
+#define SPI_CS_SEL	P1SEL
+#define SPI_CS_DIR	P1DIR
+
+#define SPI_CONST	0x00
+
+#define HAS_SPI_0		0
+#define HAS_SPI_1		1
+#define SPI_1_ALT_1		0
+#define SPI_1_ALT_2		1
+
+#define HAS_74HC165		1
+#define AO_74HC165_CS_PORT	P1
+#define AO_74HC165_CS_PIN	4
+#define AO_74HC165_CS		P1_4
+
+#define AO_PCA9922_CS_PORT	P2
+#define AO_PCA9922_CS_PIN	0
+#define AO_PCA9922_CS		P2_0
+
+#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_ADC_0		0
+
+#define AO_PAD_PIN_1		1
+#define AO_PAD_1		P1_1
+#define AO_PAD_ADC_1		1
+
+#define AO_PAD_PIN_2		2
+#define AO_PAD_2		P1_2
+#define AO_PAD_ADC_2		2
+
+#define AO_PAD_PIN_3		3
+#define AO_PAD_3		P1_3
+#define AO_PAD_ADC_3		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))
+#define AO_PAD_ALL_CHANNELS	((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))
+
+#define AO_SIREN_PORT		P2
+#define AO_SIREN_DIR		P2DIR
+#define AO_SIREN_PIN		3
+#define AO_SIREN		P2_3
+
+#define AO_STROBE_PORT		P2
+#define AO_STROBE_DIR		P2DIR
+#define AO_STROBE_PIN		4
+#define AO_STROBE		P2_4
+
+/* test these values with real igniters */
+#define AO_PAD_RELAY_CLOSED	3524
+#define AO_PAD_NO_IGNITER	16904
+#define AO_PAD_GOOD_IGNITER	22514
+
+#define AO_PAD_ADC_PYRO		4
+#define AO_PAD_ADC_BATT		5
+
+#define AO_ADC_FIRST_PIN	0
+
+struct ao_adc {
+	int16_t		sense[AO_PAD_NUM];
+	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)->tick,						\
+		(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 << AO_PAD_ADC_0) | \
+			 (1 << AO_PAD_ADC_1) | \
+			 (1 << AO_PAD_ADC_2) | \
+			 (1 << AO_PAD_ADC_3) | \
+			 (1 << AO_PAD_ADC_PYRO) | \
+			 (1 << AO_PAD_ADC_BATT))
+
+#endif /* _AO_PINS_H_ */
diff --git a/src/telefire-v0.2/ao_telefire.c b/src/telefire-v0.2/ao_telefire.c
new file mode 100644
index 00000000..f27ca5e8
--- /dev/null
+++ b/src/telefire-v0.2/ao_telefire.c
@@ -0,0 +1,45 @@
+/*
+ * 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_74hc165.h>
+#include <ao_radio_cmac_cmd.h>
+
+void
+main(void)
+{
+	ao_clock_init();
+
+	ao_led_init(LEDS_AVAILABLE);
+
+	ao_task_init();
+
+	ao_timer_init();
+	ao_adc_init();
+	ao_cmd_init();
+	ao_spi_init();
+	ao_74hc165_init();
+	ao_storage_init();
+	ao_usb_init();
+	ao_radio_init();
+	ao_aes_init();
+	ao_pad_init();
+//	ao_radio_cmac_cmd_init();
+	ao_config_init();
+	ao_start_scheduler();
+}
-- 
cgit v1.2.3


From 572faa19b9a496866e3b589d5eb9f37a680206ab Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 19 Jun 2013 22:42:58 -0700
Subject: altos/cc1111: Fetch RSSI for TeleFire from correct byte

Reading the status byte doesn't provide very useful RSSI info

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

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_radio.c b/src/cc1111/ao_radio.c
index 88b8f686..190647ce 100644
--- a/src/cc1111/ao_radio.c
+++ b/src/cc1111/ao_radio.c
@@ -374,7 +374,7 @@ ao_radio_recv(__xdata void *packet, uint8_t size, uint8_t timeout) __reentrant
 	}
 #if NEED_RADIO_RSSI
 	else
-		ao_radio_rssi = AO_RSSI_FROM_RADIO(((uint8_t *)packet)[size - 1]);
+		ao_radio_rssi = AO_RSSI_FROM_RADIO(((uint8_t *)packet)[size - 2]);
 #endif
 	ao_radio_put();
 	return ao_radio_dma_done;
-- 
cgit v1.2.3


From d0b4e926ecececa7499a301b6135189be119512e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 22 May 2013 13:03:06 -0700
Subject: Initial TeleMini bits

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_adc.c                  |   5 ++
 src/cc1111/ao_usb.c                  |   5 ++
 src/core/ao_data.c                   |   2 +
 src/core/ao_data.h                   |   2 +-
 src/core/ao_log_mini.c               |   1 -
 src/core/ao_telemetry.c              |  40 +++++++++-
 src/core/ao_telemetry.h              |  27 +++++++
 src/drivers/ao_ms5607.c              |  40 +++++-----
 src/drivers/ao_ms5607.h              |   2 +-
 src/drivers/ao_ms5607_convert_8051.c |  60 +++++++++++++++
 src/telemini-v2.0/Makefile           | 108 +++++++++++++++++++++++++++
 src/telemini-v2.0/ao_pins.h          | 140 +++++++++++++++++++++++++++++++++++
 src/telemini-v2.0/ao_telemini.c      |  54 ++++++++++++++
 src/test/Makefile                    |   5 +-
 14 files changed, 466 insertions(+), 25 deletions(-)
 create mode 100644 src/drivers/ao_ms5607_convert_8051.c
 create mode 100644 src/telemini-v2.0/Makefile
 create mode 100644 src/telemini-v2.0/ao_pins.h
 create mode 100644 src/telemini-v2.0/ao_telemini.c

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 4a58023d..6cc08399 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -162,6 +162,11 @@ ao_adc_isr(void) __interrupt 1
 #define GOT_ADC
 #endif	
 
+#ifdef FETCH_ADC
+	FETCH_ADC()
+#define GOT_ADC
+#endif
+
 #ifndef GOT_ADC
 #error No known ADC configuration set
 #endif
diff --git a/src/cc1111/ao_usb.c b/src/cc1111/ao_usb.c
index a655d1be..b0ab409d 100644
--- a/src/cc1111/ao_usb.c
+++ b/src/cc1111/ao_usb.c
@@ -201,6 +201,11 @@ ao_usb_ep0_setup(void)
 				ao_usb_ep0_queue_byte(0);
 				break;
 			case AO_USB_REQ_SET_ADDRESS:
+#if USB_FORCE_FLIGHT_IDLE
+				/* Go to idle mode if USB is connected
+				 */
+				ao_flight_force_idle = 1;
+#endif
 				ao_usb_set_address(ao_usb_setup.value);
 				break;
 			case AO_USB_REQ_GET_DESCRIPTOR:
diff --git a/src/core/ao_data.c b/src/core/ao_data.c
index 38d2f7ff..6a3d02a1 100644
--- a/src/core/ao_data.c
+++ b/src/core/ao_data.c
@@ -22,6 +22,7 @@ volatile __xdata struct ao_data	ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t		ao_data_head;
 volatile __data uint8_t		ao_data_present;
 
+#ifndef ao_data_count
 void
 ao_data_get(__xdata struct ao_data *packet)
 {
@@ -32,3 +33,4 @@ ao_data_get(__xdata struct ao_data *packet)
 #endif
 	memcpy(packet, (void *) &ao_data_ring[i], sizeof (struct ao_data));
 }
+#endif
diff --git a/src/core/ao_data.h b/src/core/ao_data.h
index b0f086f8..080a534f 100644
--- a/src/core/ao_data.h
+++ b/src/core/ao_data.h
@@ -101,7 +101,7 @@ extern volatile __data uint8_t		ao_data_count;
  * signaled by the timer tick
  */
 #define AO_DATA_WAIT() do {				\
-		ao_sleep((void *) &ao_data_count);	\
+		ao_sleep(DATA_TO_XDATA ((void *) &ao_data_count));	\
 	} while (0)
 
 #endif /* AO_DATA_RING */
diff --git a/src/core/ao_log_mini.c b/src/core/ao_log_mini.c
index 1273b0e3..46b285f3 100644
--- a/src/core/ao_log_mini.c
+++ b/src/core/ao_log_mini.c
@@ -79,7 +79,6 @@ void
 ao_log(void)
 {
 	__pdata uint16_t	next_sensor, next_other;
-	uint8_t			i;
 
 	ao_storage_setup();
 
diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 03a8a273..9c673030 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -171,6 +171,36 @@ ao_send_mega_data(void)
 }
 #endif /* AO_SEND_MEGA */
 
+#ifdef AO_SEND_MINI
+
+static void
+ao_send_mini(void)
+{
+	__xdata	struct ao_data *packet = (__xdata struct ao_data *) &ao_data_ring[ao_data_ring_prev(ao_sample_data)];
+			
+	telemetry.generic.tick = packet->tick;
+	telemetry.generic.type = AO_TELEMETRY_MINI;
+
+	telemetry.mini.state = ao_flight_state;
+
+	telemetry.mini.v_batt = packet->adc.v_batt;
+	telemetry.mini.sense_a = packet->adc.sense_a;
+	telemetry.mini.sense_m = packet->adc.sense_m;
+
+	telemetry.mini.pres = ao_data_pres(packet);
+	telemetry.mini.temp = ao_data_temp(packet);
+
+	telemetry.mini.acceleration = ao_accel;
+	telemetry.mini.speed = ao_speed;
+	telemetry.mini.height = ao_height;
+
+	telemetry.mini.ground_pres = ao_ground_pres;
+
+	ao_radio_send(&telemetry, sizeof (telemetry));
+}
+
+#endif
+
 #ifdef AO_SEND_ALL_BARO
 static uint8_t		ao_baro_sample;
 
@@ -323,12 +353,16 @@ ao_telemetry(void)
 				ao_send_baro();
 #endif
 #if HAS_FLIGHT
-#ifdef AO_SEND_MEGA
+# ifdef AO_SEND_MEGA
 				ao_send_mega_sensor();
 				ao_send_mega_data();
-#else
+# else
+#  ifdef AO_SEND_MINI
+				ao_send_mini();
+#  else
 				ao_send_sensor();
-#endif
+#  endif
+# endif
 #endif
 
 #if HAS_COMPANION
diff --git a/src/core/ao_telemetry.h b/src/core/ao_telemetry.h
index f2d201de..77601529 100644
--- a/src/core/ao_telemetry.h
+++ b/src/core/ao_telemetry.h
@@ -207,6 +207,32 @@ struct ao_telemetry_mega_data {
 };
 
 
+#define AO_TELEMETRY_MINI		0x10
+
+struct ao_telemetry_mini {
+	uint16_t	serial;		/*  0 */
+	uint16_t	tick;		/*  2 */
+	uint8_t		type;		/*  4 */
+
+	uint8_t         state;          /*  5 flight state */
+
+	int16_t		v_batt;		/*  6 battery voltage */
+	int16_t		sense_a;	/*  8 apogee continuity */
+	int16_t		sense_m;	/* 10 main continuity */
+
+	int32_t		pres;		/* 12 Pa * 10 */
+	int16_t		temp;		/* 16 °C * 100 */
+
+	int16_t         acceleration;   /* 18 m/s² * 16 */
+	int16_t         speed;          /* 20 m/s * 16 */
+	int16_t         height;         /* 22 m */
+
+	int32_t		ground_pres;	/* 24 average pres on pad */
+
+	int32_t		pad28;		/* 28 */
+	/* 32 */
+};
+
 /* #define AO_SEND_ALL_BARO */
 
 #define AO_TELEMETRY_BARO		0x80
@@ -240,6 +266,7 @@ union ao_telemetry_all {
 	struct ao_telemetry_companion		companion;
 	struct ao_telemetry_mega_sensor		mega_sensor;
 	struct ao_telemetry_mega_data		mega_data;
+	struct ao_telemetry_mini		mini;
 	struct ao_telemetry_baro		baro;
 };
 
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 8f1dcbe1..5259b265 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -21,7 +21,7 @@
 
 #if HAS_MS5607 || HAS_MS5611
 
-static struct ao_ms5607_prom	ms5607_prom;
+static __xdata struct ao_ms5607_prom	ms5607_prom;
 static uint8_t	  		ms5607_configured;
 
 static void
@@ -40,7 +40,7 @@ ao_ms5607_reset(void) {
 
 	cmd = AO_MS5607_RESET;
 	ao_ms5607_start();
-	ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+	ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
 	ao_delay(AO_MS_TO_TICKS(10));
 	ao_ms5607_stop();
 }
@@ -69,17 +69,17 @@ ao_ms5607_crc(uint8_t *prom)
 }
 
 static void
-ao_ms5607_prom_read(struct ao_ms5607_prom *prom)
+ao_ms5607_prom_read(__xdata struct ao_ms5607_prom *prom)
 {
-	uint8_t		addr;
-	uint8_t		crc;
-	uint16_t	*r;
+	uint8_t			addr;
+	uint8_t			crc;
+	__xdata uint16_t	*r;
 
-	r = (uint16_t *) prom;
+	r = (__xdata uint16_t *) prom;
 	for (addr = 0; addr < 8; addr++) {
 		uint8_t	cmd = AO_MS5607_PROM_READ(addr);
 		ao_ms5607_start();
-		ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+		ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
 		ao_spi_recv(r, 2, AO_MS5607_SPI_INDEX);
 		ao_ms5607_stop();
 		r++;
@@ -114,25 +114,25 @@ ao_ms5607_setup(void)
 	ao_ms5607_prom_read(&ms5607_prom);
 }
 
-static volatile uint8_t	ao_ms5607_done;
+static __xdata volatile uint8_t	ao_ms5607_done;
 
 static void
 ao_ms5607_isr(void)
 {
 	ao_exti_disable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
 	ao_ms5607_done = 1;
-	ao_wakeup((void *) &ao_ms5607_done);
+	ao_wakeup((__xdata void *) &ao_ms5607_done);
 }
 
 static uint32_t
 ao_ms5607_get_sample(uint8_t cmd) {
-	uint8_t	reply[3];
-	uint8_t read;
+	__xdata uint8_t	reply[3];
+	__xdata uint8_t read;
 
 	ao_ms5607_done = 0;
 
 	ao_ms5607_start();
-	ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+	ao_spi_send(DATA_TO_XDATA(&cmd), 1, AO_MS5607_SPI_INDEX);
 
 	ao_exti_enable(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN);
 
@@ -179,10 +179,14 @@ ao_ms5607_sample(struct ao_ms5607_sample *sample)
 	sample->temp = ao_ms5607_get_sample(AO_CONVERT_D2);
 }
 
+#ifdef _CC1111_H_
+#include "ao_ms5607_convert_8051.c"
+#else
 #include "ao_ms5607_convert.c"
+#endif
 
 #if HAS_TASK
-struct ao_ms5607_sample	ao_ms5607_current;
+__xdata struct ao_ms5607_sample	ao_ms5607_current;
 
 static void
 ao_ms5607(void)
@@ -191,10 +195,10 @@ ao_ms5607(void)
 	for (;;)
 	{
 		ao_ms5607_sample(&ao_ms5607_current);
-		ao_arch_critical(
-			AO_DATA_PRESENT(AO_DATA_MS5607);
-			AO_DATA_WAIT();
-			);
+		ao_arch_block_interrupts();
+		AO_DATA_PRESENT(AO_DATA_MS5607);
+		AO_DATA_WAIT();
+		ao_arch_release_interrupts();
 	}
 }
 
diff --git a/src/drivers/ao_ms5607.h b/src/drivers/ao_ms5607.h
index b2f98a59..3fd43fd4 100644
--- a/src/drivers/ao_ms5607.h
+++ b/src/drivers/ao_ms5607.h
@@ -56,7 +56,7 @@ struct ao_ms5607_value {
 	int32_t		temp;	/* in °C * 100 */
 };
 
-extern struct ao_ms5607_sample	ao_ms5607_current;
+extern __xdata struct ao_ms5607_sample	ao_ms5607_current;
 
 void
 ao_ms5607_setup(void);
diff --git a/src/drivers/ao_ms5607_convert_8051.c b/src/drivers/ao_ms5607_convert_8051.c
new file mode 100644
index 00000000..f47972c9
--- /dev/null
+++ b/src/drivers/ao_ms5607_convert_8051.c
@@ -0,0 +1,60 @@
+/*
+ * 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_ms5607.h>
+
+void
+ao_ms5607_convert(struct ao_ms5607_sample *sample, struct ao_ms5607_value *value)
+{
+#if 0
+	int32_t	dT;
+	int32_t TEMP;
+	int64_t OFF;
+	int64_t SENS;
+
+	dT = sample->temp - ((int32_t) ms5607_prom.tref << 8);
+	
+	TEMP = 2000 + (((int64_t) dT * ms5607_prom.tempsens) >> 23);
+
+#if HAS_MS5611
+	OFF = ((int64_t) ms5607_prom.off << 16) + (((int64_t) ms5607_prom.tco * dT) >> 7);
+	SENS = ((int64_t) ms5607_prom.sens << 15) + (((int64_t) ms5607_prom.tcs * dT) >> 8);
+#else
+	OFF = ((int64_t) ms5607_prom.off << 17) + (((int64_t) ms5607_prom.tco * dT) >> 6);
+	SENS = ((int64_t) ms5607_prom.sens << 16) + (((int64_t) ms5607_prom.tcs * dT) >> 7);
+#endif
+
+	if (TEMP < 2000) {
+		int32_t	T2 = ((int64_t) dT * (int64_t) dT) >> 31;
+		int32_t TEMPM = TEMP - 2000;
+		int64_t OFF2 = (61 * (int64_t) TEMPM * (int64_t) TEMPM) >> 4;
+		int64_t SENS2 = 2 * (int64_t) TEMPM * (int64_t) TEMPM;
+		if (TEMP < 1500) {
+			int32_t TEMPP = TEMP + 1500;
+			int64_t TEMPP2 = TEMPP * TEMPP;
+			OFF2 = OFF2 + 15 * TEMPP2;
+			SENS2 = SENS2 + 8 * TEMPP2;
+		}
+		TEMP -= T2;
+		OFF -= OFF2;
+		SENS -= SENS2;
+	}
+
+	value->pres = ((((int64_t) sample->pres * SENS) >> 21) - OFF) >> 15;
+	value->temp = TEMP;
+#endif
+}
diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
new file mode 100644
index 00000000..afd529f0
--- /dev/null
+++ b/src/telemini-v2.0/Makefile
@@ -0,0 +1,108 @@
+#
+# TeleMini build file
+#
+
+TELEMINI_VER=2.0
+TELEMINI_DEF=2_0
+
+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_flight.c \
+	ao_kalman.c \
+	ao_log.c \
+	ao_log_mini.c \
+	ao_mutex.c \
+	ao_panic.c \
+	ao_report.c \
+	ao_sample.c \
+	ao_stdio.c \
+	ao_storage.c \
+	ao_task.c \
+	ao_telemetry.c \
+	ao_freq.c
+
+CC1111_SRC = \
+	ao_adc.c \
+	ao_dma.c \
+	ao_ignite.c \
+	ao_led.c \
+	ao_packet.c \
+	ao_packet_slave.c \
+	ao_radio.c \
+	ao_romconfig.c \
+	ao_string.c \
+	ao_spi.c \
+	ao_usb.c \
+	ao_convert_pa.c \
+	ao_data.c \
+	ao_beep.c \
+	ao_timer.c \
+	_bp.c
+
+DRIVER_SRC = \
+	ao_ms5607.c \
+	ao_m25.c
+
+PRODUCT_SRC = \
+	ao_telemini.c
+
+SRC = \
+	$(CORE_SRC) \
+	$(CC1111_SRC) \
+	$(DRIVER_SRC) \
+	$(PRODUCT_SRC)
+
+PROGNAME = telemini-v$(TELEMINI_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
+PRODUCT=TeleMini-v$(TELEMINI_VER)
+PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
+IDPRODUCT=0x000a
+
+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/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
new file mode 100644
index 00000000..386c8dc3
--- /dev/null
+++ b/src/telemini-v2.0/ao_pins.h
@@ -0,0 +1,140 @@
+/*
+ * 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		1
+#define HAS_USB			1
+#define USB_FORCE_FLIGHT_IDLE	1
+#define HAS_BEEP		1
+#define HAS_GPS			0
+#define HAS_SERIAL_1		0
+#define HAS_EEPROM		1
+#define HAS_LOG			1
+#define USE_INTERNAL_FLASH	0
+#define HAS_DBG			0
+#define PACKET_HAS_SLAVE	1
+#define USE_FAST_ASCENT_LOG	1
+
+#define AO_LED_GREEN		1
+#define AO_LED_RED		2
+#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
+#define HAS_EXTERNAL_TEMP	0
+#define HAS_ACCEL		0
+#define HAS_IGNITE		1
+#define HAS_IGNITE_REPORT 1
+#define HAS_MONITOR		0
+
+/*
+ * SPI
+ */
+
+#define SPI_CS_PORT		P1
+#define SPI_CS_SEL		P1SEL
+#define SPI_CS_DIR		P1DIR
+
+/*
+ * Flash
+ */
+#define AO_M25_SPI_CS_PORT	SPI_CS_PORT
+#define AO_M25_SPI_CS_MASK	0x04	/* cs_flash is P1_2 */
+#define M25_MAX_CHIPS		1
+
+/*
+ * MS5607
+ */
+
+#define HAS_MS5607		1
+#define HAS_MS5611		0
+#define AO_MS5607_PRIVATE_PINS	0
+#define AO_MS5607_CS_PORT	P1
+#define AO_MS5607_CS_PIN	3
+#define AO_MS5607_CS		P1_3
+#define AO_MS5607_CS_MASK	(1 << AO_MS5607_CS_PIN)
+#define AO_MS5607_MISO_PORT	P0
+#define AO_MS5607_MISO_PIN	2
+#define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO_PIN)
+#define AO_MS5607_SPI_INDEX	0
+
+/*
+ * Igniters
+ */
+#define AO_IGNITER_PORT		P2
+#define AO_IGNITER_DROGUE_PORT	AO_IGNITER_PORT
+#define AO_IGNITER_DROGUE	P2_3
+#define AO_IGNITER_MAIN		P2_4
+#define AO_IGNITER_DIR		P2DIR
+#define AO_IGNITER_DROGUE_BIT	(1 << 3)
+#define AO_IGNITER_MAIN_BIT	(1 << 4)
+#define AO_IGNITER_DROGUE_PIN	3
+#define AO_IGNITER_MAIN_PIN	4
+
+#define AO_IGNITER_DROGUE_PORT	AO_IGNITER_PORT
+#define AO_IGNITER_MAIN_PORT	AO_IGNITER_PORT
+
+/* test these values with real igniters */
+#define AO_IGNITER_OPEN		1000
+#define AO_IGNITER_CLOSED	7000
+#define AO_IGNITER_FIRE_TIME	AO_MS_TO_TICKS(50)
+#define AO_IGNITER_CHARGE_TIME	AO_MS_TO_TICKS(2000)
+
+#define AO_SEND_MINI
+
+/*
+ * ADC
+ */
+
+#define HAS_ADC			1
+#define AO_ADC_FIRST_PIN	0
+
+struct ao_adc {
+	int16_t		sense_a;	/* apogee continuity sense */
+	int16_t		sense_m;	/* main continuity sense */
+	int16_t		v_batt;		/* battery voltage */
+};
+
+#define ao_data_count	ao_adc_count
+
+#define AO_SENSE_DROGUE(p)	((p)->adc.sense_a)
+#define AO_SENSE_MAIN(p)	((p)->adc.sense_m)
+
+#define AO_ADC_DUMP(p) \
+	printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
+	       (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
+
+#define FETCH_ADC() 							\
+	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); 	\
+	switch (sequence) {						\
+	case 4:								\
+		a += 4;							\
+		sequence = 0;						\
+		break;							\
+	case 1:								\
+		a += 2;							\
+		sequence = 4;						\
+		break;							\
+	case 0:								\
+		sequence = 1;						\
+		break;							\
+	}								\
+	if (sequence)							\
+		;
+
+#endif /* _AO_PINS_H_ */
diff --git a/src/telemini-v2.0/ao_telemini.c b/src/telemini-v2.0/ao_telemini.c
new file mode 100644
index 00000000..84df2b8c
--- /dev/null
+++ b/src/telemini-v2.0/ao_telemini.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2011 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"
+
+__xdata uint8_t ao_force_freq;
+
+void
+main(void)
+{
+	/*
+	 * Reduce the transient on the ignite pins at startup by
+	 * pulling the pins low as soon as possible at power up
+	 */
+	ao_ignite_set_pins();
+
+	ao_clock_init();
+
+	/* Turn on the red LED until the system is stable */
+	ao_led_init(LEDS_AVAILABLE);
+	ao_led_on(AO_LED_RED);
+
+	ao_task_init();
+
+	ao_timer_init();
+	ao_adc_init();
+	ao_cmd_init();
+	ao_storage_init();
+	ao_ms5607_init();
+	ao_flight_init();
+	ao_log_init();
+	ao_report_init();
+	ao_telemetry_init();
+	ao_radio_init();
+	ao_packet_slave_init(TRUE);
+	ao_igniter_init();
+	ao_config_init();
+	ao_start_scheduler();
+}
diff --git a/src/test/Makefile b/src/test/Makefile
index 75b1f848..9c304318 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -2,7 +2,7 @@ vpath % ..:../core:../drivers:../util:../micropeak:../aes
 
 PROGS=ao_flight_test ao_flight_test_baro ao_flight_test_accel ao_flight_test_noisy_accel ao_flight_test_mm \
 	ao_gps_test ao_gps_test_skytraq ao_gps_test_ublox ao_convert_test ao_convert_pa_test ao_fec_test \
-	ao_aprs_test ao_micropeak_test ao_fat_test ao_aes_test
+	ao_aprs_test ao_micropeak_test ao_fat_test ao_aes_test ao_int64_test
 
 INCS=ao_kalman.h ao_ms5607.h ao_log.h ao_data.h altitude-pa.h altitude.h
 
@@ -73,3 +73,6 @@ ao_fat_test: ao_fat_test.c ao_fat.c ao_bufio.c
 
 ao_aes_test: ao_aes_test.c ao_aes.c ao_aes_tables.c
 	cc $(CFLAGS) -o $@ ao_aes_test.c
+
+ao_int64_test: ao_int64_test.c ao_int64.c ao_int64.h
+	cc $(CFLAGS) -o $@ ao_int64_test.c
-- 
cgit v1.2.3


From 312f6194a4bc75473cb0d61a6d58b66fb1f7c068 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 12 Jun 2013 00:43:31 -0700
Subject: altos/teletiny-v2.0: Support multiple SPI busses on CC1111

Needed for TeleMini v2.0

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_arch.h            |   5 +
 src/cc1111/ao_arch_funcs.h      |  82 +++++++++----
 src/cc1111/ao_spi.c             | 257 +++++++++++++++++++++++++---------------
 src/drivers/ao_ms5607.c         |   2 +-
 src/telemini-v2.0/ao_pins.h     |   4 +
 src/telemini-v2.0/ao_telemini.c |   1 +
 6 files changed, 231 insertions(+), 120 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 9097557f..34235b08 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -321,4 +321,9 @@ void
 ao_serial1_tx_isr(void) ao_arch_interrupt(14);
 #endif
 
+#if HAS_EXTI_0
+void
+ao_p0_isr(void) __interrupt(13);
+#endif
+
 #endif /* _AO_ARCH_H_ */
diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 8f1cc094..ae184108 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -19,46 +19,74 @@
  * ao_spi.c
  */
 
-extern __xdata uint8_t	ao_spi_mutex;
+#if !HAS_SPI_0 && !HAS_SPI_1
+#define HAS_SPI_0	1
+#define SPI_0_ALT_2	1
+#endif
+
+#if HAS_SPI_0 && HAS_SPI_1
+#define MULTI_SPI	1
+#define N_SPI		2
+#else
+#define MULTI_SPI	0
+#define N_SPI		1
+#endif
+
+extern __xdata uint8_t	ao_spi_mutex[N_SPI];
+
+#if MULTI_SPI
+#define ao_spi_get(bus)	ao_mutex_get(&ao_spi_mutex[bus])
+#define ao_spi_put(bus)	ao_mutex_put(&ao_spi_mutex[bus])
+#else
+#define ao_spi_get(bus)	ao_mutex_get(&ao_spi_mutex[0])
+#define ao_spi_put(bus)	ao_mutex_put(&ao_spi_mutex[0])
+#endif
 
 #define AO_SPI_SPEED_FAST	17
 #define AO_SPI_SPEED_200kHz	13
 
-#define ao_spi_set_speed(speed) (U0GCR = (UxGCR_CPOL_NEGATIVE |		\
-					  UxGCR_CPHA_FIRST_EDGE |	\
-					  UxGCR_ORDER_MSB |		\
-					  ((speed) << UxGCR_BAUD_E_SHIFT)))
+#if MULTI_SPI
+#define ao_spi_set_speed(bus,speed) (*(bus ? &U1GCR : &U0GCR) =(UxGCR_CPOL_NEGATIVE | \
+								UxGCR_CPHA_FIRST_EDGE |	\
+								UxGCR_ORDER_MSB | \
+								((speed) << UxGCR_BAUD_E_SHIFT)))
+#else
+#define ao_spi_set_speed(bus,speed) (U0GCR = (UxGCR_CPOL_NEGATIVE |	\
+					      UxGCR_CPHA_FIRST_EDGE |	\
+					      UxGCR_ORDER_MSB |		\
+					      ((speed) << UxGCR_BAUD_E_SHIFT)))
+#endif
 
 #define ao_spi_get_slave(bus) do {			\
-		ao_mutex_get(&ao_spi_mutex);		\
-		ao_spi_set_speed(AO_SPI_SPEED_FAST);	\
+		ao_spi_get(bus);			\
+		ao_spi_set_speed(bus,AO_SPI_SPEED_FAST);	\
 	} while (0)
 
 #define ao_spi_put_slave(bus) do {		\
-		ao_mutex_put(&ao_spi_mutex);	\
+		ao_spi_put(bus);		\
 	} while (0)
 
 #define ao_spi_get_mask(reg,mask,bus,speed) do {	\
-		ao_mutex_get(&ao_spi_mutex);		\
-		ao_spi_set_speed(speed);		\
+		ao_spi_get(bus);			\
+		ao_spi_set_speed(bus,speed);		\
 		(reg) &= ~(mask);			\
 	} while (0)
 
 #define ao_spi_put_mask(reg,mask,bus) do {		\
 	(reg) |= (mask); \
-	ao_mutex_put(&ao_spi_mutex); \
+	ao_spi_put(bus); \
 	} while (0)
 
 
 #define ao_spi_get_bit(reg,bit,pin,bus,speed) do {	\
-		ao_mutex_get(&ao_spi_mutex);	\
-		ao_spi_set_speed(speed);	\
-		pin = 0;			\
+		ao_spi_get(bus);			\
+		ao_spi_set_speed(bus,speed);		\
+		pin = 0;				\
 	} while (0)
 
 #define ao_spi_put_bit(reg,bit,pin,bus) do {	\
 		pin = 1;			\
-		ao_mutex_put(&ao_spi_mutex);	\
+		ao_spi_put(bus);		\
 	} while (0)
 
 
@@ -68,6 +96,13 @@ extern __xdata uint8_t	ao_spi_mutex;
  * from chip select low to chip select high
  */
 
+#if MULTI_SPI
+void
+ao_spi_send(void __xdata *block, uint16_t len, uint8_t bus) __reentrant;
+
+void
+ao_spi_recv(void __xdata *block, uint16_t len, uint8_t bus) __reentrant;
+#else
 void
 ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant;
 
@@ -76,6 +111,7 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant;
 
 #define ao_spi_send(block, len, bus) ao_spi_send_bus(block, len)
 #define ao_spi_recv(block, len, bus) ao_spi_recv_bus(block, len)
+#endif
 
 #if AO_SPI_SLAVE
 void
@@ -88,10 +124,15 @@ ao_spi_recv_wait(void);
 void
 ao_spi_init(void);
 
-#define ao_spi_init_cs(port, mask) do {		\
-		SPI_CS_PORT |= mask;		\
-		SPI_CS_DIR |= mask;		\
-		SPI_CS_SEL &= ~mask;		\
+#define token_paster(x,y)	x ## y
+#define token_paster3(x,y,z)	x ## y ## z
+#define token_evaluator(x,y)	token_paster(x,y)
+#define token_evaluator3(x,y,z)	token_paster3(x,y,z)
+
+#define ao_spi_init_cs(port, mask) do {			\
+		port |= mask;				\
+		token_evaluator(port,DIR) |= mask;	\
+		token_evaluator(port,SEL) &= ~mask;	\
 	} while (0)
 
 #define cc1111_enable_output(port,dir,sel,pin,bit,v) do {	\
@@ -102,7 +143,6 @@ ao_spi_init(void);
 
 #define disable_unreachable	_Pragma("disable_warning 126")
 
-#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))
+
diff --git a/src/cc1111/ao_spi.c b/src/cc1111/ao_spi.c
index cdef6bda..fb08f3f5 100644
--- a/src/cc1111/ao_spi.c
+++ b/src/cc1111/ao_spi.c
@@ -18,10 +18,6 @@
 #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
@@ -61,62 +57,107 @@
  */
 
 #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
+#define SPI_BUF_0	&U0DBUFXADDR
+#define SPI_CSR_0	U0CSR
+#define SPI_BAUD_0	U0BAUD
+#define SPI_GCR_0	U0GCR
+#define SPI_CFG_MASK_0	PERCFG_U0CFG_ALT_MASK
+#define SPI_DMA_TX_0	DMA_CFG0_TRIGGER_UTX0
+#define SPI_DMA_RX_0	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)
+#define SPI_CFG_0	PERCFG_U0CFG_ALT_1
+#define SPI_SEL_0	P0SEL
+#define SPI_BITS_0	(1 << 3) | (1 << 2) | (1 << 5)
+#define SPI_CSS_BIT_0	(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)
+#define SPI_CFG_0	PERCFG_U0CFG_ALT_2
+#define SPI_SEL_0	P1SEL
+#define SPI_PRI_0	P2SEL_PRI3P1_USART0
+#define SPI_BITS_0	(1 << 5) | (1 << 4) | (1 << 3)
+#define SPI_CSS_BIT_0	(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
+#define SPI_BUF_1	&U1DBUFXADDR
+#define SPI_CSR_1	U1CSR
+#define SPI_BAUD_1	U1BAUD
+#define SPI_GCR_1	U1GCR
+#define SPI_CFG_MASK_1	PERCFG_U1CFG_ALT_MASK
+#define SPI_DMA_TX_1	DMA_CFG0_TRIGGER_UTX1
+#define SPI_DMA_RX_1	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)
+#define SPI_CFG_1	PERCFG_U1CFG_ALT_1
+#define SPI_SEL_1	P0SEL
+#define SPI_BITS_1	(1 << 4) | (1 << 5) | (1 << 3)
+#define SPI_CSS_BIT_1	(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)
+#define SPI_CFG_1	PERCFG_U1CFG_ALT_2
+#define SPI_SEL_1	P1SEL
+#define SPI_PRI_1	P2SEL_PRI3P1_USART1
+#define SPI_BITS_1	(1 << 6) | (1 << 7) | (1 << 5)
+#define SPI_CSS_BIT_1	(1 << 4)
 #endif
 
 #endif
 
+#if MULTI_SPI
+
+#define SPI_BUF(bus)		((bus) ? SPI_BUF_1 : SPI_BUF_0)
+#define SPI_CSR(bus)		((bus) ? SPI_CSR_1 : SPI_CSR_0)
+#define SPI_BAUD(bus)		((bus) ? SPI_BAUD_1 : SPI_BAUD_0)
+#define SPI_GCR(bus)		((bus) ? SPI_GCR_1 : SPI_GCR_0)
+#define SPI_CFG_MASK(bus)	((bus) ? SPI_CFG_MASK_1 : SPI_CFG_MASK_0)
+#define SPI_DMA_TX(bus)		((bus) ? SPI_DMA_TX_1 : SPI_DMA_TX_0)
+#define SPI_DMA_RX(bus)		((bus) ? SPI_DMA_RX_1 : SPI_DMA_RX_0)
+#define SPI_CFG(bus)		((bus) ? SPI_CFG_1 : SPI_CFG_0)
+#define SPI_SEL(bus)		((bus) ? SPI_SEL_1 : SPI_SEL_0)
+#define SPI_BITS(bus)		((bus) ? SPI_BITS_1 : SPI_BITS_0)
+#define SPI_CSS_BIT(bus)	((bus) ? SPI_CSS_BIT_1 : SPI_CSS_BIT_0)
+
+#else
+
+#if HAS_SPI_0
+#define SPI_BUF(bus)		SPI_BUF_0
+#define SPI_CSR(bus)		SPI_CSR_0
+#define SPI_BAUD(bus)		SPI_BAUD_0
+#define SPI_GCR(bus)		SPI_GCR_0
+#define SPI_CFG_MASK(bus)	SPI_CFG_MASK_0
+#define SPI_DMA_TX(bus)		SPI_DMA_TX_0
+#define SPI_DMA_RX(bus)		SPI_DMA_RX_0
+#define SPI_CFG(bus)		SPI_CFG_0
+#define SPI_SEL(bus)		SPI_SEL_0
+#define SPI_BITS(bus)		SPI_BITS_0
+#define SPI_CSS_BIT(bus)	SPI_CSS_BIT_0
+#endif
+#if HAS_SPI_1
+#define SPI_BUF(bus)		SPI_BUF_1
+#define SPI_CSR(bus)		SPI_CSR_1
+#define SPI_BAUD(bus)		SPI_BAUD_1
+#define SPI_GCR(bus)		SPI_GCR_1
+#define SPI_CFG_MASK(bus)	SPI_CFG_MASK_1
+#define SPI_DMA_TX(bus)		SPI_DMA_TX_1
+#define SPI_DMA_RX(bus)		SPI_DMA_RX_1
+#define SPI_CFG(bus)		SPI_CFG_1
+#define SPI_SEL(bus)		SPI_SEL_1
+#define SPI_BITS(bus)		SPI_BITS_1
+#define SPI_CSS_BIT(bus)	SPI_CSS_BIT_1
+#endif
+
+#endif /* MULTI_SPI */
+
 #if AO_SPI_SLAVE
-#define CSS		SPI_CSS_BIT
+#define CSS(bus)		SPI_CSS_BIT(bus)
 #define UxCSR_DIRECTION	UxCSR_SLAVE
 #else
-#define CSS		0
+#define CSS(bus)		0
 #define UxCSR_DIRECTION	UxCSR_MASTER
 #endif
 
@@ -124,15 +165,16 @@
  * operation, from CS low to CS high. This means that any SPI
  * user must protect the SPI bus with this mutex
  */
-__xdata uint8_t	ao_spi_mutex;
-__xdata uint8_t ao_spi_dma_in_done;
-__xdata uint8_t ao_spi_dma_out_done;
+__xdata uint8_t	ao_spi_mutex[N_SPI];
+__xdata uint8_t ao_spi_dma_in_done[N_SPI];
+__xdata uint8_t ao_spi_dma_out_done[N_SPI];
 
-uint8_t	ao_spi_dma_out_id;
-uint8_t ao_spi_dma_in_id;
+uint8_t	ao_spi_dma_out_id[N_SPI];
+uint8_t ao_spi_dma_in_id[N_SPI];
 
 static __xdata uint8_t ao_spi_const;
 
+
 /* Send bytes over SPI.
  *
  * This sets up two DMA engines, one writing the data and another reading
@@ -140,45 +182,52 @@ static __xdata uint8_t ao_spi_const;
  * is complete, as the transmit register is double buffered and hence signals
  * completion one byte before the transfer is actually complete
  */
+#if MULTI_SPI
+void
+ao_spi_send(void __xdata *block, uint16_t len, uint8_t bus) __reentrant
+#else
 void
 ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
+#define bus	0
+#endif
 {
-	ao_dma_set_transfer(ao_spi_dma_in_id,
-			    &SPI_BUF,
+	ao_dma_set_transfer(ao_spi_dma_in_id[bus],
+			    SPI_BUF(bus),
 			    &ao_spi_const,
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    SPI_DMA_RX,
+			    SPI_DMA_RX(bus),
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
-	ao_dma_set_transfer(ao_spi_dma_out_id,
+	ao_dma_set_transfer(ao_spi_dma_out_id[bus],
 			    block,
-			    &SPI_BUF,
+			    SPI_BUF(bus),
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    SPI_DMA_TX,
+			    SPI_DMA_TX(bus),
 			    DMA_CFG1_SRCINC_1 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
 
-	ao_dma_start(ao_spi_dma_in_id);
-	ao_dma_start(ao_spi_dma_out_id);
-	ao_dma_trigger(ao_spi_dma_out_id);
+	ao_dma_start(ao_spi_dma_in_id[bus]);
+	ao_dma_start(ao_spi_dma_out_id[bus]);
+	ao_dma_trigger(ao_spi_dma_out_id[bus]);
 #if !AO_SPI_SLAVE
-	__critical while (!ao_spi_dma_in_done)
-		ao_sleep(&ao_spi_dma_in_done);
+	__critical while (!ao_spi_dma_in_done[bus])
+		ao_sleep(&ao_spi_dma_in_done[bus]);
 #endif
+#undef bus
 }
 
 #if AO_SPI_SLAVE
 void
 ao_spi_send_wait(void)
 {
-	__critical while (!ao_spi_dma_in_done)
-		ao_sleep(&ao_spi_dma_in_done);
+	__critical while (!ao_spi_dma_in_done[0])
+		ao_sleep(&ao_spi_dma_in_done[0]);
 }
 #endif
 
@@ -188,16 +237,22 @@ ao_spi_send_wait(void)
  * writing constant values to the SPI transmitter as that is what
  * clocks the data coming in.
  */
+#if MULTI_SPI
+void
+ao_spi_recv(void __xdata *block, uint16_t len, uint8_t bus) __reentrant
+#else
 void
 ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
+#define bus 0
+#endif
 {
-	ao_dma_set_transfer(ao_spi_dma_in_id,
-			    &SPI_BUF,
+	ao_dma_set_transfer(ao_spi_dma_in_id[bus],
+			    SPI_BUF(bus),
 			    block,
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    SPI_DMA_RX,
+			    SPI_DMA_RX(bus),
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_1 |
 			    DMA_CFG1_PRIORITY_NORMAL);
@@ -205,24 +260,24 @@ 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_dma_set_transfer(ao_spi_dma_out_id[bus],
 			    &ao_spi_const,
-			    &SPI_BUF,
+			    SPI_BUF(bus),
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    SPI_DMA_TX,
+			    SPI_DMA_TX(bus),
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
 #endif
 
-	ao_dma_start(ao_spi_dma_in_id);
+	ao_dma_start(ao_spi_dma_in_id[bus]);
 #if !AO_SPI_SLAVE
-	ao_dma_start(ao_spi_dma_out_id);
-	ao_dma_trigger(ao_spi_dma_out_id);
-	__critical while (!ao_spi_dma_in_done)
-		ao_sleep(&ao_spi_dma_in_done);
+	ao_dma_start(ao_spi_dma_out_id[bus]);
+	ao_dma_trigger(ao_spi_dma_out_id[bus]);
+	__critical while (!ao_spi_dma_in_done[bus])
+		ao_sleep(&ao_spi_dma_in_done[bus]);
 #endif
 }
 
@@ -230,17 +285,43 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 void
 ao_spi_recv_wait(void)
 {
-	__critical while (!ao_spi_dma_in_done)
-		ao_sleep(&ao_spi_dma_in_done);
+	__critical while (!ao_spi_dma_in_done[0])
+		ao_sleep(&ao_spi_dma_in_done[0]);
 }
 #endif
 
+/* Set up the USART.
+ *
+ * SPI master/slave mode
+ */
+/* Set the baud rate and signal parameters
+ *
+ * The cc1111 is limited to a 24/8 MHz SPI clock.
+ * Every peripheral I've ever seen goes faster than that,
+ * so set the clock to 3MHz (BAUD_E 17, BAUD_M 0)
+ */
+#define SPI_INIT(bus,o)	do {						\
+		/* Set up the USART pin assignment */			\
+		PERCFG = (PERCFG & ~SPI_CFG_MASK(bus)) | SPI_CFG(bus);	\
+									\
+		/* Make the SPI pins be controlled by the USART peripheral */ \
+		SPI_SEL(bus) |= SPI_BITS(bus) | CSS(bus);		\
+		SPI_CSR(bus) = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_DIRECTION); \
+		SPI_BAUD(bus) = 0;					\
+		SPI_GCR(bus) = (UxGCR_CPOL_NEGATIVE |			\
+				UxGCR_CPHA_FIRST_EDGE |			\
+				UxGCR_ORDER_MSB |			\
+				(17 << UxGCR_BAUD_E_SHIFT));		\
+		/* Set up OUT DMA */					\
+		ao_spi_dma_out_id[o] = ao_dma_alloc(&ao_spi_dma_out_done[o]); \
+									\
+		/* Set up IN DMA */					\
+		ao_spi_dma_in_id[o] = ao_dma_alloc(&ao_spi_dma_in_done[o]);	\
+	} while (0)
+
 void
 ao_spi_init(void)
 {
-	/* Set up the USART pin assignment */
-	PERCFG = (PERCFG & ~SPI_CFG_MASK) | SPI_CFG;
-
 	/* Ensure that SPI USART takes precidence over the other USART
 	 * for pins that they share
 	 */
@@ -248,30 +329,10 @@ ao_spi_init(void)
 	P2SEL = (P2SEL & ~P2SEL_PRI3P1_MASK) | SPI_PRI;
 #endif
 
-	/* Make the SPI pins be controlled by the USART peripheral */
-	SPI_SEL |= SPI_BITS | CSS;
-
-	/* Set up OUT DMA */
-	ao_spi_dma_out_id = ao_dma_alloc(&ao_spi_dma_out_done);
-
-	/* Set up IN DMA */
-	ao_spi_dma_in_id = ao_dma_alloc(&ao_spi_dma_in_done);
-
-	/* Set up the USART.
-	 *
-	 * SPI master/slave mode
-	 */
-	SPI_CSR = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_DIRECTION);
-
-	/* Set the baud rate and signal parameters
-	 *
-	 * The cc1111 is limited to a 24/8 MHz SPI clock.
-	 * Every peripheral I've ever seen goes faster than that,
-	 * so set the clock to 3MHz (BAUD_E 17, BAUD_M 0)
-	 */
-	SPI_BAUD = 0;
-	SPI_GCR = (UxGCR_CPOL_NEGATIVE |
-		   UxGCR_CPHA_FIRST_EDGE |
-		   UxGCR_ORDER_MSB |
-		   (17 << UxGCR_BAUD_E_SHIFT));
+#if HAS_SPI_0
+	SPI_INIT(0, 0);
+#endif
+#if HAS_SPI_1
+	SPI_INIT(1, MULTI_SPI);
+#endif
 }
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 4b4403a7..7c1acdd1 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -22,7 +22,7 @@
 #if HAS_MS5607 || HAS_MS5611
 
 static __xdata struct ao_ms5607_prom	ms5607_prom;
-static uint8_t	  		ms5607_configured;
+static __xdata uint8_t	  		ms5607_configured;
 
 static void
 ao_ms5607_start(void) {
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index c27f47f1..9ecd076e 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -47,7 +47,9 @@
  */
 
 #define HAS_SPI_0		1
+#define SPI_0_ALT_1		1
 #define HAS_SPI_1		1
+#define SPI_1_ALT_2		1
 #define SPI_CS_PORT		P1
 #define SPI_CS_SEL		P1SEL
 #define SPI_CS_DIR		P1DIR
@@ -55,6 +57,7 @@
 /*
  * Flash
  */
+#define AO_M25_SPI_BUS		1
 #define AO_M25_SPI_CS_PORT	SPI_CS_PORT
 #define AO_M25_SPI_CS_MASK	0x04	/* cs_flash is P1_2 */
 #define M25_MAX_CHIPS		1
@@ -74,6 +77,7 @@
 #define AO_MS5607_MISO_PIN	2
 #define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO_PIN)
 #define AO_MS5607_SPI_INDEX	0
+#define HAS_EXTI_0		1
 
 /*
  * Igniters
diff --git a/src/telemini-v2.0/ao_telemini.c b/src/telemini-v2.0/ao_telemini.c
index b85ce8c8..6b7545fb 100644
--- a/src/telemini-v2.0/ao_telemini.c
+++ b/src/telemini-v2.0/ao_telemini.c
@@ -17,6 +17,7 @@
 
 #include "ao.h"
 #include "ao_pins.h"
+#include <ao_exti.h>
 
 __xdata uint8_t ao_force_freq;
 
-- 
cgit v1.2.3


From 2380a4b9bd69629c78eec0a87ff8681a0524d8d2 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 16:41:33 -0700
Subject: cc1111: Rework ADC configuration a bit, fix Tm V2 ADC usage

The Tm v2 ADC code was not actually fetching and storing the ADC
conversion values.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_adc.c         | 35 +++++++++++++++++------------------
 src/telemini-v2.0/ao_pins.h | 11 ++++++++---
 2 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 6cc08399..1523f94a 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -20,22 +20,22 @@
 volatile __xdata struct ao_data	ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t		ao_data_head;
 
+#ifdef TELENANO_V_0_1
+# define AO_ADC_FIRST_PIN	1
+#endif
+
+#if HAS_ACCEL_REF
+# define AO_ADC_FIRST_PIN	2
+#endif
+
 #ifndef AO_ADC_FIRST_PIN
-#define AO_ADC_FIRST_PIN	0
+# define AO_ADC_FIRST_PIN	0
 #endif
 
 void
 ao_adc_poll(void)
 {
-#if HAS_ACCEL_REF
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 2;
-#else
-# ifdef TELENANO_V_0_1
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 1;
-# else
 	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | AO_ADC_FIRST_PIN;
-# endif
-#endif
 }
 
 void
@@ -141,6 +141,7 @@ ao_adc_isr(void) __interrupt 1
 	if (sequence) {
 		/* Start next conversion */
 		ADCCON3 = sequence;
+		return;
 	}
 #endif /* telemini || telenano */
 
@@ -148,8 +149,10 @@ ao_adc_isr(void) __interrupt 1
 	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.sense[0] + sequence - AO_ADC_FIRST_PIN);
 	a[0] = ADCL;
 	a[1] = ADCH;
-	if (sequence < 5)
+	if (sequence < 5) {
 		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+		return;
+	}
 #define GOT_ADC
 #endif /* TELEFIRE_V_0_1 */
 
@@ -157,8 +160,6 @@ ao_adc_isr(void) __interrupt 1
 	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.batt);
 	a[0] = ADCL;
 	a[1] = ADCH;
-	if (0)
-		;
 #define GOT_ADC
 #endif	
 
@@ -171,12 +172,10 @@ ao_adc_isr(void) __interrupt 1
 #error No known ADC configuration set
 #endif
 
-	else {
-		/* record this conversion series */
-		ao_data_ring[ao_data_head].tick = ao_time();
-		ao_data_head = ao_data_ring_next(ao_data_head);
-		ao_wakeup(DATA_TO_XDATA(&ao_data_head));
-	}
+	/* record this conversion series */
+	ao_data_ring[ao_data_head].tick = ao_time();
+	ao_data_head = ao_data_ring_next(ao_data_head);
+	ao_wakeup(DATA_TO_XDATA(&ao_data_head));
 }
 
 static void
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index 9ecd076e..fac6c535 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -31,7 +31,6 @@
 #define USE_INTERNAL_FLASH	0
 #define HAS_DBG			0
 #define PACKET_HAS_SLAVE	1
-#define USE_FAST_ASCENT_LOG	1
 
 #define AO_LED_GREEN		1
 #define AO_LED_RED		2
@@ -127,6 +126,8 @@ struct ao_adc {
 	printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
 	       (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
 
+#define AO_ADC_PINS	((1 << 0) | (1 << 1) | (1 << 4))
+
 #define FETCH_ADC() 							\
 	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); 	\
 	switch (sequence) {						\
@@ -142,7 +143,11 @@ struct ao_adc {
 		sequence = 1;						\
 		break;							\
 	}								\
-	if (sequence)							\
-		;
+	a[0] = ADCL;							\
+	a[1] = ADCH;							\
+	if (sequence) {							\
+		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence; \
+		return;							\
+	}
 
 #endif /* _AO_PINS_H_ */
-- 
cgit v1.2.3


From af9f9cf0c21630562c74fae41773319229bf44d3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 16:42:45 -0700
Subject: cc1111: Hacky pin interrupt support. Only useful for TeleMini v2

This code is designed to support the MS5607 MISO interrupt bits.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_exti.c | 33 ++++++++++++++++++++++++++++++
 src/cc1111/ao_exti.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 src/cc1111/ao_exti.c
 create mode 100644 src/cc1111/ao_exti.h

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_exti.c b/src/cc1111/ao_exti.c
new file mode 100644
index 00000000..537f6252
--- /dev/null
+++ b/src/cc1111/ao_exti.c
@@ -0,0 +1,33 @@
+/*
+ * 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_exti.h>
+
+#if HAS_EXTI_0
+__xdata void 	(*ao_int_callback)(void);
+
+void
+ao_p0_isr(void) __interrupt(13)
+{
+	if (P0IF && (P0IFG & (AO_MS5607_MISO_MASK))) {
+		(*ao_int_callback)();
+	}
+	P0IFG = 0;
+	P0IF = 0;
+}
+#endif
diff --git a/src/cc1111/ao_exti.h b/src/cc1111/ao_exti.h
new file mode 100644
index 00000000..00d99a2b
--- /dev/null
+++ b/src/cc1111/ao_exti.h
@@ -0,0 +1,57 @@
+/*
+ * 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_EXTI_H_
+#define _AO_EXTI_H_
+
+#define AO_EXTI_MODE_RISING	1
+#define AO_EXTI_MODE_FALLING	2
+#define AO_EXTI_MODE_PULL_UP	4
+#define AO_EXTI_MODE_PULL_DOWN	8
+#define AO_EXTI_PRIORITY_LOW	16
+#define AO_EXTI_PRIORITY_MED	0
+#define AO_EXTI_PRIORITY_HIGH	32
+
+extern void 	(*ao_int_callback)(void);
+
+#define ao_exti_setup(gpio, pin, mode, callback) do { \
+		ao_int_callback = callback;	      \
+	} while (0)
+
+#define ao_exti_set_mode(gpio, pin, mode) do { \
+	} while (0)
+
+#define ao_exti_set_callback(port, pin, callback) do {	\
+		ao_int_callback = callback;		\
+	} while (0)
+
+#define ao_exti_init() do {			\
+		IEN1 &= IEN1_P0IE;		\
+		PICTL |= PICTL_P0IENL;		\
+	} while (0)
+
+#define ao_exti_enable(port, pin) do {		\
+		P0IFG &= ~(1 << pin);		\
+		P0IF = 0;			\
+		IEN1 |= IEN1_P0IE;		\
+	} while (0)
+
+#define ao_exti_disable(port, pin) do {		\
+		IEN1 &= ~IEN1_P0IE;		\
+	} while (0)
+
+#endif /* _AO_EXTI_H_ */
-- 
cgit v1.2.3


From 8ca98dc8c868c47c372d6b666c36e691fa402824 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 17:15:55 -0700
Subject: altos: Get telemini to copy current MS5607 state to ring.

The ADC code is responsible for actually inserting the non-ADC data
into the ring, so do the copy there.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_adc.c         |  2 +-
 src/telemini-v2.0/ao_pins.h | 48 +++++++++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 1523f94a..97a39c4d 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -164,7 +164,7 @@ ao_adc_isr(void) __interrupt 1
 #endif	
 
 #ifdef FETCH_ADC
-	FETCH_ADC()
+	FETCH_ADC();
 #define GOT_ADC
 #endif
 
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index fac6c535..c1a36f8c 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -128,26 +128,32 @@ struct ao_adc {
 
 #define AO_ADC_PINS	((1 << 0) | (1 << 1) | (1 << 4))
 
-#define FETCH_ADC() 							\
-	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); 	\
-	switch (sequence) {						\
-	case 4:								\
-		a += 4;							\
-		sequence = 0;						\
-		break;							\
-	case 1:								\
-		a += 2;							\
-		sequence = 4;						\
-		break;							\
-	case 0:								\
-		sequence = 1;						\
-		break;							\
-	}								\
-	a[0] = ADCL;							\
-	a[1] = ADCH;							\
-	if (sequence) {							\
-		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence; \
-		return;							\
-	}
+#define FETCH_ADC() do {						\
+		a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); \
+		switch (sequence) {					\
+		case 4:							\
+			a += 4;						\
+			sequence = 0;					\
+			break;						\
+		case 1:							\
+			a += 2;						\
+			sequence = 4;					\
+			break;						\
+		case 0:							\
+			sequence = 1;					\
+			break;						\
+		}							\
+		a[0] = ADCL;						\
+		a[1] = ADCH;						\
+		if (sequence) {						\
+			ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence; \
+			return;						\
+		}							\
+		AO_DATA_PRESENT(AO_DATA_ADC);				\
+		if (ao_data_present != AO_DATA_ALL)			\
+			return;						\
+		ao_data_ring[ao_data_head].ms5607_raw.pres = ao_ms5607_current.pres; \
+		ao_data_ring[ao_data_head].ms5607_raw.temp = ao_ms5607_current.temp; \
+	} while (0)
 
 #endif /* _AO_PINS_H_ */
-- 
cgit v1.2.3


From 3b2f83a7d686b5fbc0aaa56d48cb734f353631c8 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 17:16:54 -0700
Subject: altos/cc1111: Leave pin interrupts completely disabled at init time

Don't even turn in the PICTL bits as that seems to cause the chip to
be unhappy.

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

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_exti.h b/src/cc1111/ao_exti.h
index 00d99a2b..49fca5d2 100644
--- a/src/cc1111/ao_exti.h
+++ b/src/cc1111/ao_exti.h
@@ -39,19 +39,18 @@ extern void 	(*ao_int_callback)(void);
 		ao_int_callback = callback;		\
 	} while (0)
 
-#define ao_exti_init() do {			\
-		IEN1 &= IEN1_P0IE;		\
-		PICTL |= PICTL_P0IENL;		\
-	} while (0)
+#define ao_exti_init()
 
 #define ao_exti_enable(port, pin) do {		\
 		P0IFG &= ~(1 << pin);		\
 		P0IF = 0;			\
+		PICTL |= PICTL_P0IENL;		\
 		IEN1 |= IEN1_P0IE;		\
 	} while (0)
 
 #define ao_exti_disable(port, pin) do {		\
 		IEN1 &= ~IEN1_P0IE;		\
+		PICTL &= ~PICTL_P0IENL;		\
 	} while (0)
 
 #endif /* _AO_EXTI_H_ */
-- 
cgit v1.2.3


From 4e3955a5b0ac125bd807920c467f959618449fbc Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 17:17:47 -0700
Subject: altos/cc1111: Wake up non-ADC sensor code each timer tick

Make sure the MS5607 code gets told to sample every tick

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

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index a64b5aba..54af9605 100644
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -39,6 +39,9 @@ void ao_timer_isr(void) __interrupt 9
 	if (++ao_adc_count == ao_adc_interval) {
 		ao_adc_count = 0;
 		ao_adc_poll();
+#if (AO_DATA_ALL & ~(AO_DATA_ADC))
+		ao_wakeup(DATA_TO_XDATA(&ao_adc_count));
+#endif
 	}
 #endif
 }
-- 
cgit v1.2.3


From 7e941695aa27e5eaf453ca1128b8d835472410a4 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 18:43:20 -0700
Subject: altos: Check for MS5607 MISO low before sleeping

If the MISO line goes low before we manage to configure the
interrupts, we'll miss it entirely unless we check the pin explicitly.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/attiny/ao_arch_funcs.h  | 2 ++
 src/cc1111/ao_arch_funcs.h  | 1 +
 src/drivers/ao_ms5607.c     | 3 ++-
 src/telemini-v2.0/ao_pins.h | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/cc1111')

diff --git a/src/attiny/ao_arch_funcs.h b/src/attiny/ao_arch_funcs.h
index 76dc7820..d4584a9f 100644
--- a/src/attiny/ao_arch_funcs.h
+++ b/src/attiny/ao_arch_funcs.h
@@ -41,6 +41,8 @@
 			PORTB &= ~(1 << bit);	\
 	} while (0)
 
+#define ao_gpio_get(port, bit, pin)	((PORTB >> (bit)) & 1)
+
 /*
  * The SPI mutex must be held to call either of these
  * functions -- this mutex covers the entire SPI operation,
diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index ae184108..ea340dfd 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -145,4 +145,5 @@ ao_spi_init(void);
 
 #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))
+#define ao_gpio_get(port, bit, pin) (pin)
 
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 8b2b6333..58ab9197 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -140,7 +140,8 @@ ao_ms5607_get_sample(uint8_t cmd) {
 	ao_spi_put(AO_MS5607_SPI_INDEX);
 #endif
 	ao_arch_block_interrupts();
-	while (!ao_ms5607_done)
+	while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN, AO_MS5607_MISO) &&
+	       !ao_ms5607_done)
 		ao_sleep((void *) &ao_ms5607_done);
 	ao_arch_release_interrupts();
 #if AO_MS5607_PRIVATE_PINS
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index c1a36f8c..264ad16d 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -74,6 +74,7 @@
 #define AO_MS5607_CS_MASK	(1 << AO_MS5607_CS_PIN)
 #define AO_MS5607_MISO_PORT	P0
 #define AO_MS5607_MISO_PIN	2
+#define AO_MS5607_MISO		P0_2
 #define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO_PIN)
 #define AO_MS5607_SPI_INDEX	0
 #define HAS_EXTI_0		1
-- 
cgit v1.2.3


From a73b02518fcbc9fc0807ed8e141d3a06e8ad8214 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 18:46:02 -0700
Subject: altos: Don't use ao_data on cc1111 projects

cc1111 ao_adc.c supplies the needed globals at this point, and linking
both into the program leads to two different versions of each at
different addresses (yay SDCC linker!)

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

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 97a39c4d..15429677 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -19,6 +19,9 @@
 
 volatile __xdata struct ao_data	ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t		ao_data_head;
+#if (AO_DATA_ALL & ~(AO_DATA_ADC))
+volatile __data uint8_t		ao_data_present;
+#endif
 
 #ifdef TELENANO_V_0_1
 # define AO_ADC_FIRST_PIN	1
diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
index 5550e172..40878778 100644
--- a/src/telemini-v2.0/Makefile
+++ b/src/telemini-v2.0/Makefile
@@ -24,7 +24,8 @@ INC = \
 	ao_product.h \
 	ao_int64.h \
 	ao_sample.h \
-	ao_exti.h
+	ao_exti.h \
+	ao_task.h
 
 CORE_SRC = \
 	ao_cmd.c \
@@ -58,7 +59,6 @@ CC1111_SRC = \
 	ao_spi.c \
 	ao_usb.c \
 	ao_convert_pa.c \
-	ao_data.c \
 	ao_beep.c \
 	ao_timer.c \
 	ao_exti.c \
-- 
cgit v1.2.3


From 6a1e398e590121458176758858bb4210f3eb5a55 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 8 Oct 2013 09:22:03 -0700
Subject: Add --with parameters to configure for compiler selection

This allows the user to specify which compiler to use for each target
CPU. Also checks to make sure the arm compiler supports -m0 and -m3
cpu type flags. The build now actually uses the specified compilers too.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 configure.ac                  | 155 +++++++++++++++++++++++++++++++++++++++---
 src/Makedefs.in               |  10 +++
 src/Makefile                  |  25 +++----
 src/avr-demo/Makefile         |  10 +--
 src/avr/Makefile.defs         |  16 +++++
 src/cc1111/Makefile.cc1111    |   3 +-
 src/lpc/Makefile-flash.defs   |  10 +--
 src/lpc/Makefile.defs         |  23 ++++---
 src/micropeak/Makefile        |  12 +---
 src/nanopeak-v0.1/Makefile    |  12 +---
 src/stm/Makefile-flash.defs   |  11 +--
 src/stm/Makefile.defs         |  15 ++--
 src/telepyro-v0.1/Makefile    |  10 +--
 src/telescience-pwm/Makefile  |  12 +---
 src/telescience-v0.1/Makefile |  12 +---
 15 files changed, 238 insertions(+), 98 deletions(-)
 create mode 100644 src/Makedefs.in
 create mode 100644 src/avr/Makefile.defs

(limited to 'src/cc1111')

diff --git a/configure.ac b/configure.ac
index e88109f9..729149da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,21 +180,151 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(WARN_CFLAGS)
 
-AC_CHECK_PROG([HAVE_SDCC], [sdcc], yes, no)
+#
+# Configure SDCC
+#
+
+AC_ARG_WITH([sdcc],
+	    [AS_HELP_STRING([--with-sdcc],
+	                    [Name of SDCC])],
+	    [],
+	    [with_sdcc=auto])
+
+if test "x$with_sdcc" != "xno"; then	    
+	if test "x$with_sdcc" = "xauto"; then
+		with_sdcc="sdcc"
+		AC_CHECK_PROG([HAVE_SDCC],[$with_sdcc], yes, no)
+	else
+		HAVE_SDCC=yes
+	fi
+else
+	HAVE_SDCC=no
+fi
+
 if test "x$HAVE_SDCC" = "xno"; then
-	AC_MSG_WARN([No sdcc found, cc1111 binaries will not be built])
+	AC_MSG_WARN([SDCC not found, cc1111 binaries will not be built])
+else
+	SDCC=$with_sdcc
+fi
+
+AC_SUBST(SDCC)
+AC_SUBST(HAVE_SDCC)
+
+#
+# Configure ARM compiler for STM32L and LPC11U14
+#
+
+AC_ARG_WITH([arm-cc],
+	    [AS_HELP_STRING([--with-arm-cc],
+	                    [Name of ARM C compiler])],
+	    [],
+	    [with_arm_cc=auto])
+
+if test "x$with_arm_cc" != "xno"; then	    
+	if test "x$with_arm_cc" = "xauto"; then
+		with_arm_cc="arm-none-eabi-gcc"
+		AC_CHECK_PROG([HAVE_ARM_CC],[$with_arm_cc], yes, no)
+	else
+		HAVE_ARM_CC=yes
+	fi
+else
+	HAVE_ARM_CC=no
 fi
 
-AC_CHECK_PROG([HAVE_ARM_GCC],[arm-none-eabi-gcc], yes, no,[/opt/cortex/bin])
-if test "x$HAVE_ARM_GCC" = "xno"; then
-	AC_MSG_WARN([No summon toolchain arm compiler found, STM32L binaries will not be built])
+if test "x$HAVE_ARM_CC" = "xno"; then
+	AC_MSG_WARN([Arm compiler not found, ARM binaries will not be built])
+else
+	ARM_CC=$with_arm_cc
+fi
+AC_SUBST(HAVE_ARM_CC)
+AC_SUBST(ARM_CC)
+
+if test "x$HAVE_ARM_CC" = "xyes"; then
+	save_CC="$CC"
+	save_CFLAGS="$CFLAGS"
+	CC="$ARM_CC"
+	CFLAGS="-mthumb -mcpu=cortex-m0"
+	AC_LANG_PUSH([C])
+
+	AC_MSG_CHECKING([if ]$ARM_CC[ supports cortex-m0])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int i;])],
+			  [HAVE_ARM_M0_CC=yes],
+			  [HAVE_ARM_M0_CC=no])
+        AC_MSG_RESULT([$HAVE_ARM_M0])
+	CFLAGS="-mthumb -mcpu=cortex-m3"
+	AC_MSG_CHECKING([if ]$ARM_CC[ supports cortex-m3])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int i;])],
+			  [HAVE_ARM_M3_CC=yes],
+			  [HAVE_ARM_M3_CC=no])
+        AC_MSG_RESULT([$HAVE_ARM_M3])
+	AC_LANG_POP([C])
+	CFLAGS="$save_CFLAGS"
+	CC="$save_CC"
+else
+	HAVE_ARM_M3_CC=no
+	HAVE_ARM_M0_CC=no
+fi
+AC_SUBST(HAVE_ARM_M3_CC)
+AC_SUBST(HAVE_ARM_M0_CC)
+	
+if test "x$HAVE_ARM_M3_CC" = "xno"; then
+	AC_MSG_WARN([No cortex-m3 arm compiler found, STM32L binaries will not be built])
 fi
 
-AC_CHECK_PROG([HAVE_ARM_M0_GCC], [arm-none-eabi-gcc], yes, no,[/usr/bin])
-if test "x$HAVE_ARM_M0_GCC" = "xno"; then
-	AC_MSG_WARN([No linaro toolchain arm cortex-m0 compiler found, LPC11U14 binaries will not be built])
+if test "x$HAVE_ARM_M0_CC" = "xno"; then
+	AC_MSG_WARN([No cortex-m0 arm compiler found, LPC11U14 binaries will not be built])
 fi
 
+#
+# Configure AVR compiler
+#
+
+AC_ARG_WITH([avr-cc],
+	    [AS_HELP_STRING([--with-avr-cc],
+	                    [Name of AVR C compiler])],
+	    [],
+	    [with_avr_cc=auto])
+
+if test "x$with_avr_cc" != "xno"; then	    
+	if test "x$with_avr_cc" = "xauto"; then
+		with_avr_cc="avr-gcc"
+		AC_CHECK_PROG([HAVE_AVR_CC],[$with_avr_cc], yes, no)
+	else
+		HAVE_AVR_CC=yes
+	fi
+else
+	HAVE_AVR_CC=no
+fi
+
+AC_ARG_WITH([avr-objcopy],
+	    [AS_HELP_STRING([--with-avr-objcopy],
+	                    [Name of AVR objcopy])],
+	    [],
+	    [with_avr_objcopy=auto])
+
+if test "x$with_avr_objcopy" != "xno"; then	    
+	if test "x$with_avr_objcopy" = "xauto"; then
+		with_avr_objcopy="avr-objcopy"
+		AC_CHECK_PROG([HAVE_AVR_OBJCOPY],[$with_avr_objcopy], yes, no)
+	else
+		HAVE_AVR_OBJCOPY=yes
+	fi
+else
+	HAVE_AVR_OBJCOPY=no
+fi
+
+if test "x$HAVE_AVR_CC" = "xno" -o "x$HAVE_AVR_OBJCOPY" = "xno"; then
+	AC_MSG_WARN([AVR compiler and objcopy not found, atmel binaries will not be built])
+	HAVE_AVR_CC=no
+else
+	AVR_CC=$with_avr_cc
+	AVR_OBJCOPY=$with_avr_objcopy
+fi
+
+AC_SUBST(AVR_CC)
+AC_SUBST(AVR_OBJCOPY)
+AC_SUBST(HAVE_AVR_CC)
+
 AC_CHECK_PROG([HAVE_NICKLE], [nickle], yes, no)
 if test "x$HAVE_NICKLE" = "xno"; then
 	AC_MSG_ERROR([Please install nickle to build AltOs])
@@ -213,6 +343,7 @@ AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK != xno])
 
 AC_OUTPUT([
 Makefile
+src/Makedefs
 altoslib/Makefile
 altosuilib/Makefile
 altosuilib/AltosUIVersion.java
@@ -248,9 +379,13 @@ echo ""
 echo "  Package: ${PACKAGE_NAME} ${PACKAGE_VERSION}"
 echo ""
 echo "  Configuration"
-echo "    STM32L support..............: ${HAVE_ARM_GCC}"
-echo "    LPC11U14 support............: ${HAVE_ARM_M0_GCC}"
+echo "    Arm compiler................: ${ARM_CC}"
+echo "    STM32L support..............: ${HAVE_ARM_M3_CC}"
+echo "    LPC11U14 support............: ${HAVE_ARM_M0_CC}"
+echo "    SDCC........................: ${SDCC}"
 echo "    CC1111 support..............: ${HAVE_SDCC}"
+echo "    AVR compiler................: ${AVR_CC} ${AVR_OBJCOPY}"
+echo "    AVR support.................: ${HAVE_AVR_CC}"
 echo "    Android support.............: ${HAVE_ANDROID_SDK}"
 echo "    STlink support..............: ${HAVE_STLINK}"
 echo ""
diff --git a/src/Makedefs.in b/src/Makedefs.in
new file mode 100644
index 00000000..6dc9ab0f
--- /dev/null
+++ b/src/Makedefs.in
@@ -0,0 +1,10 @@
+ARM_CC=@ARM_CC@
+HAVE_ARM_M3_CC=@HAVE_ARM_M3_CC@
+HAVE_ARM_M0_CC=@HAVE_ARM_M0_CC@
+
+SDCC=@SDCC@
+HAVE_SDCC=@HAVE_SDCC@
+
+AVR_CC=@AVR_CC@
+AVR_OBJCOPY=@AVR_OBJCOPY@
+HAVE_AVR_CC=@HAVE_AVR_CC@
diff --git a/src/Makefile b/src/Makefile
index 23cd2920..ae231c64 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,6 +13,7 @@ vpath load_csv.5c kalman
 vpath matrix.5c kalman
 
 include Version
+include Makedefs
 
 SDCCDIRS=\
 	telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \
@@ -23,10 +24,7 @@ SDCCDIRS=\
 	telefire-v0.1 telefire-v0.2 \
 	telemini-v2.0
 
-AVRDIRS=\
-	telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
-
-ARMDIRS=\
+ARMM3DIRS=\
 	telemega-v0.1 telemega-v0.1/flash-loader \
 	telemega-v0.3 telemega-v0.3/flash-loader \
 	megadongle-v0.1 megadongle-v0.1/flash-loader \
@@ -38,23 +36,26 @@ ARMDIRS=\
 ARMM0DIRS=\
 	easymini-v1.0 easymini-v1.0/flash-loader
 
-ifneq ($(shell which sdcc),)
+AVRDIRS=\
+	telescience-v0.1 telescience-pwm micropeak nanopeak-v0.1
+
+ifeq ($(strip $(HAVE_SDCC)),yes)
 	SUBDIRS += $(SDCCDIRS)
 endif
 
-ifneq ($(shell which avr-gcc),)
-	SUBDIRS += $(AVRDIRS)
+ifeq ($(strip ($HAVE_ARM_M3_CC)),yes)
+	SUBDIRS += $(ARMM3DIRS)
 endif
 
-ifneq ($(shell which /opt/cortex/bin/arm-none-eabi-gcc),)
-	SUBDIRS += $(ARMDIRS)
+ifneq ($(strip ($HAVE_ARM_M0_CC)),yes)
+	SUBDIRS += $(ARMM0DIRS)
 endif
 
-ifneq ($(shell which /usr/bin/arm-none-eabi-gcc),)
-	SUBDIRS += $(ARMM0DIRS)
+ifeq ($(strip $(HAVE_AVR_CC)),yes)
+	SUBDIRS += $(AVRDIRS)
 endif
 
-ALLDIRS=$(SDCCDIRS) $(AVRDIRS) $(ARMDIRS)
+ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)
 
 all: all-local all-recursive
 
diff --git a/src/avr-demo/Makefile b/src/avr-demo/Makefile
index 93295166..6d9bfea2 100644
--- a/src/avr-demo/Makefile
+++ b/src/avr-demo/Makefile
@@ -11,18 +11,12 @@ vpath load_csv.5c ../kalman
 vpath matrix.5c ../kalman
 vpath ao-make-product.5c ../util
 
+include ../avr/Makefile.defs
+
 MCU=atmega32u4
 DUDECPUTYPE=m32u4
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-ifndef VERSION
-include ../Version
-endif
 
 INC = \
 	ao.h \
diff --git a/src/avr/Makefile.defs b/src/avr/Makefile.defs
new file mode 100644
index 00000000..eeb9a881
--- /dev/null
+++ b/src/avr/Makefile.defs
@@ -0,0 +1,16 @@
+ifndef TOPDIR
+TOPDIR=..
+endif
+
+ifndef VERSION
+include $(TOPDIR)/Version
+endif
+
+include $(TOPDIR)/Makedefs
+
+CC=$(AVR_CC)
+OBJCOPY=$(AVR_OBJCOPY)
+LDSCRIPTS=/usr/lib/avr/lib/ldscripts
+
+PROGRAMMER=usbtiny
+LOADCMD=avrdude
diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index 0e19603b..78b653b3 100644
--- a/src/cc1111/Makefile.cc1111
+++ b/src/cc1111/Makefile.cc1111
@@ -1,4 +1,5 @@
-CC=sdcc
+include ../Makedefs
+CC=$(SDCC)
 
 CFLAGS=--model-small --debug --opt-code-speed -DCODESIZE=$(CODESIZE)
 
diff --git a/src/lpc/Makefile-flash.defs b/src/lpc/Makefile-flash.defs
index 6bdd204c..ab7181b9 100644
--- a/src/lpc/Makefile-flash.defs
+++ b/src/lpc/Makefile-flash.defs
@@ -6,14 +6,16 @@ vpath ao-make-product.5c $(TOPDIR)/util
 .elf.ihx:
 	objcopy -O ihex $*.elf $@
 
-CC=arm-none-eabi-gcc
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
-SAT_CFLAGS=-I$(SAT)/include
 
 ifndef VERSION
 include $(TOPDIR)/Version
 endif
+include $(TOPDIR)/Makedefs
+
+CC=$(ARM_CC)
+SAT=/opt/cortex
+SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
+SAT_CFLAGS=-I$(SAT)/include
 
 AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR)
 STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
diff --git a/src/lpc/Makefile.defs b/src/lpc/Makefile.defs
index 2873d5e8..d541230a 100644
--- a/src/lpc/Makefile.defs
+++ b/src/lpc/Makefile.defs
@@ -7,19 +7,24 @@ vpath load_csv.5c ../kalman
 vpath matrix.5c ../kalman
 vpath ao-make-product.5c ../util
 
-CC=arm-none-eabi-gcc
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
-SAT_CFLAGS=-I$(SAT)/include
+ifndef TOPDIR
+TOPDIR=..
+endif
 
 ifndef VERSION
-include ../Version
+include $(TOPDIR)/Version
 endif
+include $(TOPDIR)/Makedefs
+
+CC=$(ARM_CC)
+SAT=/opt/cortex
+SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
+SAT_CFLAGS=-I$(SAT)/include
 
-AO_CFLAGS=-I. -I../lpc -I../core -I../drivers -I..
+AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)
 LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
 
-LDFLAGS=$(LPC_CFLAGS) -L../stm -Wl,-Taltos.ld
+LDFLAGS=$(LPC_CFLAGS) -L$(TOPDIR)/stm -Wl,-Taltos.ld
 
 NICKLE=nickle
 
@@ -34,8 +39,8 @@ quiet ?= $($1)
 .c.o:
 	$(call quiet,CC) -c $(CFLAGS) $<
 
-ao_serial_lpc.h: ../lpc/baud_rate ao_pins.h
-	nickle ../lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@
+ao_serial_lpc.h: $(TOPDIR)/lpc/baud_rate ao_pins.h
+	nickle $(TOPDIR)/lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@
 
 ao_serial_lpc.o: ao_serial_lpc.h
 
diff --git a/src/micropeak/Makefile b/src/micropeak/Makefile
index e51b2847..35dfaab8 100644
--- a/src/micropeak/Makefile
+++ b/src/micropeak/Makefile
@@ -6,21 +6,15 @@ vpath % ../attiny:../drivers:../core:../product:..
 vpath ao-make-product.5c ../util
 vpath make-altitude-pa ../util
 
+include ../avr/Makefile.defs
+
 MCU=attiny85
 DUDECPUTYPE=t85
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADSLOW=-i 32 -B 32
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-LDFLAGS=-L/usr/lib/ldscripts -Tavr25.x
 
-ifndef VERSION
-include ../Version
-endif
+LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
 
 ALTOS_SRC = \
 	ao_micropeak.c \
diff --git a/src/nanopeak-v0.1/Makefile b/src/nanopeak-v0.1/Makefile
index cb468a06..154d78f6 100644
--- a/src/nanopeak-v0.1/Makefile
+++ b/src/nanopeak-v0.1/Makefile
@@ -6,21 +6,15 @@ vpath % ../attiny:../drivers:../core:../product:..
 vpath ao-make-product.5c ../util
 vpath make-altitude-pa ../util
 
+include ../avr/Makefile.defs
+
 MCU=attiny85
 DUDECPUTYPE=t85
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADSLOW=-i 32 -B 32
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-LDFLAGS=-L/usr/lib/ldscripts -Tavr25.x
 
-ifndef VERSION
-include ../Version
-endif
+LDFLAGS=-L$(LDSCRIPTS) -Tavr25.x
 
 ALTOS_SRC = \
 	ao_micropeak.c \
diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs
index 86f76d46..f429d9bd 100644
--- a/src/stm/Makefile-flash.defs
+++ b/src/stm/Makefile-flash.defs
@@ -6,14 +6,15 @@ vpath ao-make-product.5c $(TOPDIR)/util
 .elf.ihx:
 	objcopy -O ihex $*.elf $@
 
-CC=/opt/cortex/bin/arm-none-eabi-gcc
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
-SAT_CFLAGS=-I$(SAT)/include
-
 ifndef VERSION
 include $(TOPDIR)/Version
 endif
+include $(TOPDIR)/Makedefs
+
+CC=$(ARM_CC)
+SAT=/opt/cortex
+SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
+SAT_CFLAGS=-I$(SAT)/include
 
 AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR)
 STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index 8ef30521..ede75f80 100644
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -12,14 +12,19 @@ vpath ao-make-product.5c ../util
 .elf.ihx:
 	objcopy -O ihex $*.elf $@
 
-SAT=/opt/cortex
-CC=$(SAT)/bin/arm-none-eabi-gcc
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
-SAT_CFLAGS=-I$(SAT)/include
+ifndef TOPDIR
+TOPDIR=..
+endif
 
 ifndef VERSION
-include ../Version
+include $(TOPDIR)/Version
 endif
+include $(TOPDIR)/Makedefs
+
+CC=$(ARM_CC)
+SAT=/opt/cortex
+SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
+SAT_CFLAGS=-I$(SAT)/include
 
 AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I..
 STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
diff --git a/src/telepyro-v0.1/Makefile b/src/telepyro-v0.1/Makefile
index 6743ba66..025b324a 100644
--- a/src/telepyro-v0.1/Makefile
+++ b/src/telepyro-v0.1/Makefile
@@ -5,18 +5,12 @@
 vpath % .:..:../core:../product:../drivers:../avr
 vpath ao-make-product.5c ../util
 
+include ../avr/Makefile.defs
+
 MCU=atmega32u4
 DUDECPUTYPE=m32u4
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-ifndef VERSION
-include ../Version
-endif
 
 INC = \
 	ao.h \
diff --git a/src/telescience-pwm/Makefile b/src/telescience-pwm/Makefile
index ce2a8fde..7f39d3f1 100644
--- a/src/telescience-pwm/Makefile
+++ b/src/telescience-pwm/Makefile
@@ -5,20 +5,14 @@
 vpath % ..:../core:../product:../drivers:../avr
 vpath ao-make-product.5c ../util
 
+include ../avr/Makefile.defs
+
 MCU=atmega32u4
 DUDECPUTYPE=m32u4
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-LDFLAGS=-L/usr/lib/ldscripts -Tavr5.x
 
-ifndef VERSION
-include ../Version
-endif
+LDFLAGS=-L$(LDSCRIPTS) -Tavr5.x
 
 INC = \
 	ao.h \
diff --git a/src/telescience-v0.1/Makefile b/src/telescience-v0.1/Makefile
index 81054a75..a65b3ad0 100644
--- a/src/telescience-v0.1/Makefile
+++ b/src/telescience-v0.1/Makefile
@@ -5,20 +5,14 @@
 vpath % ..:../core:../product:../drivers:../avr
 vpath ao-make-product.5c ../util
 
+include ../avr/Makefile.defs
+
 MCU=atmega32u4
 DUDECPUTYPE=m32u4
 #PROGRAMMER=stk500v2 -P usb
-PROGRAMMER=usbtiny
-LOADCMD=avrdude
 LOADARG=-p $(DUDECPUTYPE) -c $(PROGRAMMER) -e -U flash:w:
-CC=avr-gcc
-OBJCOPY=avr-objcopy
-
-LDFLAGS=-L/usr/lib/ldscripts -Tavr5.x
 
-ifndef VERSION
-include ../Version
-endif
+LDFLAGS=-L$(LDSCRIPTS) -Tavr5.x
 
 INC = \
 	ao.h \
-- 
cgit v1.2.3


From de2e812b02a99a2f6d85f15a9600265931f6f6b0 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 7 Dec 2013 09:38:50 -0800
Subject: src/cc1111: Turn off RC osc after xtal is running

There's no reason to keep running the RC oscillator after we switch to
the crystal, so turn it off.

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

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index 54af9605..75cc4ce8 100644
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -95,6 +95,13 @@ ao_clock_init(void)
 	while (!(SLEEP & SLEEP_XOSC_STB))
 		;
 
+	/* Power down the unused HFRC oscillator */
+	SLEEP |= SLEEP_OSC_PD;
+
+	/* Wait for HFRC to power down */
+	while ((SLEEP & SLEEP_HFRC_STB) != 0)
+		;
+	
 	/* Crank up the timer tick and system clock speed */
 	CLKCON = ((CLKCON & ~(CLKCON_TICKSPD_MASK | CLKCON_CLKSPD_MASK)) |
 		  (CLKCON_TICKSPD_1 | CLKCON_CLKSPD_1));
-- 
cgit v1.2.3


From dd91a5d5069ff940e07b8817a934ee65d4e8e235 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 8 Dec 2013 21:08:36 -0800
Subject: altos: Oops. Was only filling out part of the TeleMetrum ADC record

Because it's missing a return, we'd end up filling out one element of
the ADC record per interrupt, and rotating through which one was set,
hitting all of the even offsets within the struct. Yikes!

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

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 15429677..1689ebef 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -85,6 +85,7 @@ ao_adc_isr(void) __interrupt 1
 		else
 #endif
 			ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
+		return;
 	}
 #endif
 
-- 
cgit v1.2.3