summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-05-19 23:56:59 -0700
committerKeith Packard <keithp@keithp.com>2011-05-19 23:56:59 -0700
commit92fcfc2e8e5a9cb789c8d4be36d38c1a73ddd413 (patch)
treee6d053eb8db25e6302c05f64dc47e90474c4bb96
parent8fcd9ccf458abf4f85729a48ae789f38cdc1b9ca (diff)
src-avr: Add SPI modules to telescience
And it works too! Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src-avr/ao_telescience.c4
-rw-r--r--src-avr/telescience/Makefile5
2 files changed, 5 insertions, 4 deletions
diff --git a/src-avr/ao_telescience.c b/src-avr/ao_telescience.c
index 4bbe14cc..26e50ab3 100644
--- a/src-avr/ao_telescience.c
+++ b/src-avr/ao_telescience.c
@@ -28,8 +28,8 @@ main(void)
ao_stdio_init();
ao_timer_init();
ao_cmd_init();
-// ao_spi_init();
-// ao_storage_init();
+ ao_spi_init();
+ ao_storage_init();
ao_usb_init();
/* Turn on the LED until the system is stable */
diff --git a/src-avr/telescience/Makefile b/src-avr/telescience/Makefile
index a5bea67a..2114b43d 100644
--- a/src-avr/telescience/Makefile
+++ b/src-avr/telescience/Makefile
@@ -49,7 +49,8 @@ ALTOS_SRC = \
ao_task.c \
ao_timer.c \
ao_led.c \
- ao_usb_avr.c
+ ao_usb_avr.c \
+ $(TELESCIENCE_STORAGE)
PRODUCT=TeleScience-v0.1
MCU=atmega32u4
@@ -104,4 +105,4 @@ install:
uninstall:
-$(OBJ): ao.h ao_product.h \ No newline at end of file
+$(OBJ): ao.h ao_product.h ao_usb.h