diff options
-rw-r--r-- | defines.mk | 10 | ||||
-rw-r--r-- | lib/led.c | 7 | ||||
-rw-r--r-- | lib/util.c | 9 | ||||
-rw-r--r-- | usb-led/Makefile | 2 | ||||
-rw-r--r-- | usb-serial/Makefile | 2 |
5 files changed, 20 insertions, 10 deletions
@@ -96,7 +96,7 @@ ifeq ($(BOARD_TYPE),culV3) PROG := DFU LUFA_BOARD = CULV3 endif -ifeq ($(BOARD_TYPE),slowpandongle) +ifeq ($(BOARD_TYPE),slowpandongle1) MCU := at90usb162 ARCH = AVR8 F_CPU := 16000000 @@ -104,6 +104,14 @@ ifeq ($(BOARD_TYPE),slowpandongle) PROG := DFU LUFA_BOARD = NONE endif +ifeq ($(BOARD_TYPE),slowpandongle2) + MCU := atmega32u4 + ARCH = AVR8 + F_CPU := 16000000 + F_USB = $(F_CPU) + PROG := DFU + LUFA_BOARD = NONE +endif ifeq ($(BOARD_TYPE),arduinoUno) MCU := atmega328p ARCH = AVR8 @@ -28,7 +28,8 @@ #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_rda1846dongle__) || defined(__BOARD_culV3__) || defined(__BOARD_slowpandongle__) + || defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) \ + || defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) #define NUM_LEDS 1 #else #define NUM_LEDS 0 @@ -56,13 +57,13 @@ #define LED2_PINNUM 6 #endif -#if defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) +#if defined(__BOARD_slowpandongle2__) || defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) #define LED_PORT PORTE #define LED_DDR DDRE #define LED_PINNUM 6 #endif -#if defined(__BOARD_slowpandongle__) +#if defined(__BOARD_slowpandongle1__) #define LED_PORT PORTC #define LED_DDR DDRC #define LED_PINNUM 2 @@ -51,7 +51,7 @@ void cpu_init(void) #define BOOTLOADER_VEC 0x3800 #elif defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) #define BOOTLOADER_VEC 0x3800 -#elif defined(__BOARD_slowpandongle__) +#elif defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) #define BOOTLOADER_VEC 0x3800 #else #define BOOTLOADER_VEC 0x0000 @@ -63,7 +63,8 @@ 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_rda1846dongle__) || defined(__BOARD_culV3__) || defined(__BOARD_slowpandongle__) || \ + defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \ + defined(__BOARD_slowpandongle1__) || defined(__BOARD_slowpandongle2__) || \ defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) cli(); // disable watchdog, if enabled @@ -92,7 +93,7 @@ void reset2bootloader(void) TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0; DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0; - #elif defined(__BOARD_minimus__) || defined(__BOARD_slowpandongle__) + #elif defined(__BOARD_minimus__) || defined(__BOARD_slowpandongle1__) EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0; DDRB = 0; DDRC = 0; DDRD = 0; @@ -102,7 +103,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__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) + #elif defined(__BOARD_hhd70dongle2__) || defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_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 d642743..542b007 100644 --- a/usb-led/Makefile +++ b/usb-led/Makefile @@ -21,7 +21,7 @@ ##
NAME := usb-led
-BOARD_TYPE := slowpandongle
+BOARD_TYPE := slowpandongle1
OBJ := $(NAME).o
LIBS := util led lufa-descriptor-usbserial usbio
EXTERNAL_LIBS := lufa
diff --git a/usb-serial/Makefile b/usb-serial/Makefile index 855646e..0a09c11 100644 --- a/usb-serial/Makefile +++ b/usb-serial/Makefile @@ -21,7 +21,7 @@ ##
NAME := usb-serial
-BOARD_TYPE := teensy2
+BOARD_TYPE := slowpandongle2
OBJ := $(NAME).o
LIBS := util led lufa-descriptor-usbserial
EXTERNAL_LIBS := lufa
|