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
7a3838b
..
c6f2442
100644
(file)
--- a/
LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
+++ b/
LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
@@
-1,13
+1,13
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
2
.
+ Copyright (C) Dean Camera, 201
3
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
*/
/*
- Copyright 201
2
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
3
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-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));
}