From ec00d4ab268624e8f4a81e78304864f8bf361dc5 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 27 Jan 2013 17:47:24 +0000 Subject: upgraded avr utils from spreadspace git-svn-id: https://svn.spreadspace.org/mur.sat@662 7de4ea59-55d0-425e-a1af-a3118ea81d4c --- software/avr.lib/led.c | 63 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 8 deletions(-) (limited to 'software/avr.lib/led.c') diff --git a/software/avr.lib/led.c b/software/avr.lib/led.c index ea5bcc3..d567cef 100644 --- a/software/avr.lib/led.c +++ b/software/avr.lib/led.c @@ -24,13 +24,17 @@ #include "led.h" -#if defined(__BOARD_arduinoUno__) || defined(__BOARD_AvrNetIo__) -#define HAS_LED 0 +#if defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) +#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__) +#define NUM_LEDS 1 #else -#define HAS_LED 1 +#define NUM_LEDS 0 #endif -#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) +#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) #define LED_DIR 0 #else #define LED_DIR 1 @@ -42,6 +46,16 @@ #define LED_PINNUM 6 #endif +#if defined(__BOARD_minimus__) || defined(__BOARD_minimus32__) +#define LED_PORT PORTD +#define LED_DDR DDRD +#define LED_PINNUM 5 + +#define LED2_PORT PORTD +#define LED2_DDR DDRD +#define LED2_PINNUM 6 +#endif + #if defined(__BOARD_hhd70dongle__) #define LED_PORT PORTE #define LED_DDR DDRE @@ -56,15 +70,18 @@ void led_init(void) { -#if HAS_LED == 1 +#if NUM_LEDS >= 1 led_off(); LED_DDR = 1<= 2 + LED2_DDR |= 1<= 1 #if LED_DIR == 1 LED_PORT |= 1<= 1 #if LED_DIR == 1 LED_PORT &= ~(1<= 1 LED_PORT ^= 1<= 2 +#if LED_DIR == 1 + LED2_PORT |= 1<= 2 +#if LED_DIR == 1 + LED2_PORT &= ~(1<= 2 + LED2_PORT ^= 1<