diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-10 19:24:58 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-10 19:24:58 +0000 |
commit | 359fbfe14d00ab378f85a36664820ea9ba538c3f (patch) | |
tree | 0929d5663a3be4dc078dda0aba5ba798ebb627ab /LUFA/Drivers/Board/AVR8/STK525 | |
parent | e8570c4a37e41117e3fd1e989e0b41f1e9608f3c (diff) | |
download | lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.tar.gz lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.tar.bz2 lufa-359fbfe14d00ab378f85a36664820ea9ba538c3f.zip |
Add branch for the conversion of demos to use standard C header files for configuration, rather than makefile defined macros.
Diffstat (limited to 'LUFA/Drivers/Board/AVR8/STK525')
-rw-r--r-- | LUFA/Drivers/Board/AVR8/STK525/Buttons.h | 5 | ||||
-rw-r--r-- | LUFA/Drivers/Board/AVR8/STK525/Dataflash.h | 5 | ||||
-rw-r--r-- | LUFA/Drivers/Board/AVR8/STK525/Joystick.h | 7 | ||||
-rw-r--r-- | LUFA/Drivers/Board/AVR8/STK525/LEDs.h | 10 |
4 files changed, 25 insertions, 2 deletions
diff --git a/LUFA/Drivers/Board/AVR8/STK525/Buttons.h b/LUFA/Drivers/Board/AVR8/STK525/Buttons.h index 13abb8325..a08fa5df5 100644 --- a/LUFA/Drivers/Board/AVR8/STK525/Buttons.h +++ b/LUFA/Drivers/Board/AVR8/STK525/Buttons.h @@ -42,6 +42,11 @@ * * Board specific Buttons driver header for the Atmel STK525. * + * <table> + * <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr> + * <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr> + * </table> + * * @{ */ diff --git a/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h b/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h index 67742977c..60375f99a 100644 --- a/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h +++ b/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h @@ -42,6 +42,11 @@ * * Board specific Dataflash driver header for the Atmel STK525. * + * <table> + * <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr> + * <tr><td>DATAFLASH_CHIP1</td><td>AT45DB321C (4MB)</td><td>PORTB.4</td><td>SPI0</td></tr> + * </table> + * * @{ */ diff --git a/LUFA/Drivers/Board/AVR8/STK525/Joystick.h b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h index 8cc565351..fb6c857a9 100644 --- a/LUFA/Drivers/Board/AVR8/STK525/Joystick.h +++ b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h @@ -42,6 +42,11 @@ * * Board specific joystick driver header for the Atmel STK525. * + * <table> + * <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr> + * <tr><td>PORTB.6</td><td>PORTB.7</td><td>PORTE.4</td><td>PORTE.5</td><td>PORTB.5</td></tr> + * </table> + * * @{ */ @@ -76,7 +81,7 @@ #define JOY_LEFT (1 << 6) /** Mask for the joystick being pushed in the right direction. */ - #define JOY_RIGHT ((1 << 4) >> 1) + #define JOY_RIGHT ((1 << 4) >> JOY_PORTE_MASK_SHIFT) /** Mask for the joystick being pushed in the upward direction. */ #define JOY_UP (1 << 7) diff --git a/LUFA/Drivers/Board/AVR8/STK525/LEDs.h b/LUFA/Drivers/Board/AVR8/STK525/LEDs.h index c0111a263..04d566204 100644 --- a/LUFA/Drivers/Board/AVR8/STK525/LEDs.h +++ b/LUFA/Drivers/Board/AVR8/STK525/LEDs.h @@ -42,6 +42,14 @@ * * Board specific LED driver header for the Atmel STK525. * + * <table> + * <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr> + * <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.4</td></tr> + * <tr><td>LEDS_LED2</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.5</td></tr> + * <tr><td>LEDS_LED3</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.6</td></tr> + * <tr><td>LEDS_LED4</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.7</td></tr> + * </table> + * * @{ */ @@ -118,7 +126,7 @@ static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) { - PORTD ^= LEDMask; + PIND = LEDMask; } static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; |