diff options
| author | Christian Pointner <equinox@mur.at> | 2013-02-27 14:42:10 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2013-02-27 14:42:10 +0000 |
| commit | 4cd9b12c1868611d9f129983145ba276b09160f3 (patch) | |
| tree | 74efc58c72728e578a053381e3a74af2e53e2248 /software | |
| parent | rda1846dongle: finished gnd vias (diff) | |
merged fixes and new Boards from avr utils
git-svn-id: https://svn.spreadspace.org/mur.sat@681 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software')
| -rw-r--r-- | software/avr.defines.mk | 7 | ||||
| -rw-r--r-- | software/avr.lib/led.c | 4 | ||||
| -rw-r--r-- | software/avr.lib/util.c | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/software/avr.defines.mk b/software/avr.defines.mk index a446ac5..e621cad 100644 --- a/software/avr.defines.mk +++ b/software/avr.defines.mk @@ -79,6 +79,13 @@ ifeq ($(BOARD_TYPE),hhd70dongle) F_USB = $(F_CPU) PROG := DFU endif +ifeq ($(BOARD_TYPE),rda1846dongle) + MCU := atmega32u4 + ARCH = AVR8 + F_CPU := 16000000 + F_USB = $(F_CPU) + PROG := DFU +endif ifeq ($(BOARD_TYPE),culV3) MCU := atmega32u4 ARCH = AVR8 diff --git a/software/avr.lib/led.c b/software/avr.lib/led.c index 7305c00..4e08d6f 100644 --- a/software/avr.lib/led.c +++ b/software/avr.lib/led.c @@ -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_culV3__) + || defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || 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__) || defined(__BOARD_culV3__) +#if defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) #define LED_PORT PORTE #define LED_DDR DDRE #define LED_PINNUM 6 diff --git a/software/avr.lib/util.c b/software/avr.lib/util.c index 3de042e..3aa1a37 100644 --- a/software/avr.lib/util.c +++ b/software/avr.lib/util.c @@ -49,7 +49,7 @@ void cpu_init(void) #define BOOTLOADER_VEC 0x3000 #elif defined(__BOARD_minimus32__) #define BOOTLOADER_VEC 0x3800 -#elif defined(__BOARD_hhd70dongle__) || defined(__BOARD_culV3__) +#elif defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) #define BOOTLOADER_VEC 0x3800 #else #define BOOTLOADER_VEC 0x0000 @@ -61,7 +61,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_culV3__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) + defined(__BOARD_hhd70dongle__) || defined(__BOARD_rda1846dongle__) || defined(__BOARD_culV3__) || \ + defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) cli(); // disable watchdog, if enabled // disable all peripherals @@ -99,7 +100,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(__culV3__) + #elif 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; |