projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "grep: Version.h: No such file or directory" error when including the core LUFA...
[pub/USBasp.git]
/
LUFA
/
Drivers
/
Board
/
AVR8
/
OLIMEX32U4
/
LEDs.h
diff --git
a/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
b/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
index
574b65a
..
c6f2442
100644
(file)
--- a/
LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
+++ b/
LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
@@
-78,7
+78,7
@@
#define LEDS_PORTD_MASK_SHIFT 1
#endif
#define LEDS_PORTD_MASK_SHIFT 1
#endif
-
+
/* Public Interface - May be used in end-application: */
/* Macros: */
/** LED mask for the first LED on the board. */
/* Public Interface - May be used in end-application: */
/* Macros: */
/** LED mask for the first LED on the board. */
@@
-86,13
+86,13
@@
/** LED mask for the second LED on the board. */
#define LEDS_LED2 (1 << 0)
/** LED mask for the second LED on the board. */
#define LEDS_LED2 (1 << 0)
-
+
/** LED mask for the third LED on the board. */
/** LED mask for the third LED on the board. */
- #define LEDS_LED3 (1 <<
5
)
+ #define LEDS_LED3 (1 <<
6
)
/** LED mask for the fourth LED on the board. */
/** LED mask for the fourth LED on the board. */
- #define LEDS_LED4 (1 <<
6
)
-
+ #define LEDS_LED4 (1 <<
5
)
+
/** LED mask for all the LEDs on the board. */
#define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
/** LED mask for all the LEDs on the board. */
#define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
@@
-162,7
+162,7
@@
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void)
{
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void)
{
- return ((PORTB & LEDS_PORTB_LEDS) |
+ return ((PORTB & LEDS_PORTB_LEDS) |
((PORTD & (LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT)) >> LEDS_PORTD_MASK_SHIFT) |
(PORTE & LEDS_PORTE_LEDS));
}
((PORTD & (LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT)) >> LEDS_PORTD_MASK_SHIFT) |
(PORTE & LEDS_PORTE_LEDS));
}