diff options
author | Christian Pointner <equinox@spreadspace.org> | 2013-02-12 18:00:23 +0000 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2013-02-12 18:00:23 +0000 |
commit | 68b692649534fb7a6f2a03bec6ada1798411ce9b (patch) | |
tree | 7fc2f25db2bf9f89a8f11cb197cbbeeca284ae20 | |
parent | small cleanup (diff) |
added busware c1101 board (culV3)
git-svn-id: https://svn.spreadspace.org/avr/trunk@187 aa12f405-d877-488e-9caf-2d797e2a1cc7
-rw-r--r-- | blink/Makefile | 2 | ||||
-rw-r--r-- | defines.mk | 7 | ||||
-rw-r--r-- | lib/led.c | 4 | ||||
-rw-r--r-- | lib/util.c | 6 | ||||
-rw-r--r-- | usb-led/Makefile | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/blink/Makefile b/blink/Makefile index 3f6b533..58cc052 100644 --- a/blink/Makefile +++ b/blink/Makefile @@ -23,6 +23,6 @@ NAME := blink
OBJ := $(NAME).o
LIBS := util led
-BOARD_TYPE := teensy2
+BOARD_TYPE := culV3
include ../include.mk
@@ -79,6 +79,13 @@ ifeq ($(BOARD_TYPE),hhd70dongle) F_USB = $(F_CPU) PROG := DFU endif +ifeq ($(BOARD_TYPE),culV3) + MCU := atmega32u4 + ARCH = AVR8 + F_CPU := 8000000 + F_USB = $(F_CPU) + PROG := DFU +endif ifeq ($(BOARD_TYPE),arduinoUno) MCU := atmega328p ARCH = AVR8 @@ -28,7 +28,7 @@ #define NUM_LEDS 2 #elif defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) \ || defined(__BOARD_arduinoNG__) || defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) \ - || defined(__BOARD_hhd70dongle__) + || defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__) #define NUM_LEDS 1 #else #define NUM_LEDS 0 @@ -56,7 +56,7 @@ #define LED2_PINNUM 6 #endif -#if defined(__BOARD_hhd70dongle__) +#if defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__) #define LED_PORT PORTE #define LED_DDR DDRE #define LED_PINNUM 6 @@ -49,7 +49,7 @@ void cpu_init(void) #define BOOTLOADER_VEC 0x3000 #elif defined(__BOARD_minimus32__) #define BOOTLOADER_VEC 0x3800 -#elif defined(__BOARD_hhd70dongle__) +#elif defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__) #define BOOTLOADER_VEC 0x3800 #else #define BOOTLOADER_VEC 0x0000 @@ -61,7 +61,7 @@ f_ptr_type start_bootloader = (f_ptr_type)BOOTLOADER_VEC; void reset2bootloader(void) { #if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) || \ - defined(__BOARD_hhd70dongle__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) + defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) cli(); // disable watchdog, if enabled // disable all peripherals @@ -99,7 +99,7 @@ void reset2bootloader(void) TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0; DDRB = 0; DDRC = 0; DDRD = 0; PORTB = 0; PORTC = 0; PORTD = 0; - #elif defined(__BOARD_hhd70dongle__) + #elif defined(__BOARD_hhd70dongle__) || defined(__culV3__) EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0; TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0; diff --git a/usb-led/Makefile b/usb-led/Makefile index a8530b5..945ef4d 100644 --- a/usb-led/Makefile +++ b/usb-led/Makefile @@ -21,7 +21,7 @@ ##
NAME := usb-led
-BOARD_TYPE := teensy2
+BOARD_TYPE := culV3
OBJ := $(NAME).o
LIBS := util led lufa-descriptor-usbserial
EXTERNAL_LIBS := lufa
|