diff options
Diffstat (limited to 'blink')
-rw-r--r-- | blink/Makefile | 5 | ||||
-rw-r--r-- | blink/blink.c | 2 | ||||
-rw-r--r-- | blink/led.c | 91 | ||||
-rw-r--r-- | blink/led.h | 31 | ||||
-rw-r--r-- | blink/util.c | 35 | ||||
-rw-r--r-- | blink/util.h | 28 |
6 files changed, 4 insertions, 188 deletions
diff --git a/blink/Makefile b/blink/Makefile index 4f20366..86e960e 100644 --- a/blink/Makefile +++ b/blink/Makefile @@ -21,7 +21,8 @@ ##
NAME := blink
-OBJ := blink.o util.o led.o
-BOARD_TYPE := AvrNetIo
+OBJ := blink.o
+LIBS := util led
+BOARD_TYPE := teensy2
include ../include.mk
diff --git a/blink/blink.c b/blink/blink.c index ef1ebb0..726cc83 100644 --- a/blink/blink.c +++ b/blink/blink.c @@ -32,7 +32,7 @@ int main(void) led_init();
for(;;) {
- _delay_ms(200);
+ _delay_ms(50);
led_toggle();
}
}
diff --git a/blink/led.c b/blink/led.c deleted file mode 100644 index 60436e2..0000000 --- a/blink/led.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org> - * - * This file is part of spreadspace avr utils. - * - * spreadspace avr utils is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * spreadspace avr utils is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "avr/io.h" -#include "led.h" - -#if defined(__BOARD_arduinoUno__) || defined(__BOARD_AvrNetIo__) -#define HAS_LED 0 -#else -#define HAS_LED 1 -#endif - -#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) -#define LED_DIR 0 -#else -#define LED_DIR 1 -#endif - -#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__) -#define LED_PORT PORTD -#define LED_DDR DDRD -#define LED_PINNUM 6 -#endif - -#if defined(__BOARD_hhd70dongle__) -#define LED_PORT PORTE -#define LED_DDR DDRE -#define LED_PINNUM 6 -#endif - -#if defined(__BOARD_arduino2009v2__) || defined(__BOARD_arduino2009__) || defined(__BOARD_arduino10000__) || defined(__BOARD_arduinoNG__) -#define LED_PORT PORTB -#define LED_DDR DDRB -#define LED_PINNUM 5 -#endif - -void led_init(void) -{ -#if HAS_LED == 1 - led_off(); - LED_DDR = 1<<LED_PINNUM; -#endif -} - -void led_on(void) -{ -#if HAS_LED == 1 -#if LED_DIR == 1 - LED_PORT |= 1<<LED_PINNUM; -#else - LED_PORT &= ~(1<<LED_PINNUM); -#endif -#endif -} - -void led_off(void) -{ -#if HAS_LED == 1 -#if LED_DIR == 1 - LED_PORT &= ~(1<<LED_PINNUM); -#else - LED_PORT |= 1<<LED_PINNUM; -#endif -#endif -} - -void led_toggle(void) -{ -#if HAS_LED == 1 - LED_PORT ^= 1<<LED_PINNUM; -#endif -} diff --git a/blink/led.h b/blink/led.h deleted file mode 100644 index 12f00a8..0000000 --- a/blink/led.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org> - * - * This file is part of spreadspace avr utils. - * - * spreadspace avr utils is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * spreadspace avr utils is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef SPREADSPACE_led_h_INCLUDED -#define SPREADSPACE_led_h_INCLUDED - -void led_init(void); -void led_on(void); -void led_off(void); -void led_toggle(void); - -#endif diff --git a/blink/util.c b/blink/util.c deleted file mode 100644 index 3bf17b1..0000000 --- a/blink/util.c +++ /dev/null @@ -1,35 +0,0 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org> - * - * This file is part of spreadspace avr utils. - * - * spreadspace avr utils is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * spreadspace avr utils is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "avr/io.h" -#include "util.h" - -#if defined(CLKPR) -#define CPU_PRESCALE(n) do { CLKPR = 0x80; CLKPR = (n); } while(0) -#else -#define CPU_PRESCALE(n) -#endif - -void cpu_init(void) -{ - CPU_PRESCALE(0); -} diff --git a/blink/util.h b/blink/util.h deleted file mode 100644 index 15204b1..0000000 --- a/blink/util.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * spreadspace avr utils - * - * - * Copyright (C) 2012 Christian Pointner <equinox@spreadspace.org> - * - * This file is part of spreadspace avr utils. - * - * spreadspace avr utils is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * spreadspace avr utils is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef SPREADSPACE_util_h_INCLUDED -#define SPREADSPACE_util_h_INCLUDED - -void cpu_init(void); - -#endif |