diff options
Diffstat (limited to 'LUFA/Drivers/Board/USBKEY/Joystick.h')
| -rw-r--r-- | LUFA/Drivers/Board/USBKEY/Joystick.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h index 8ca5bc45f..b8ae7bc3e 100644 --- a/LUFA/Drivers/Board/USBKEY/Joystick.h +++ b/LUFA/Drivers/Board/USBKEY/Joystick.h @@ -66,6 +66,8 @@ /* Macros: */ #define JOY_BMASK ((1 << 5) | (1 << 6) | (1 << 7)) #define JOY_EMASK ((1 << 4) | (1 << 5)) + + #define JOY_PORTE_MASK_SHIFT 1 #endif /* Public Interface - May be used in end-application: */ @@ -74,13 +76,13 @@ #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) /** Mask for the joystick being pushed in the downward direction. */ - #define JOY_DOWN ((1 << 5) >> 1) + #define JOY_DOWN ((1 << 5) >> JOY_PORTE_MASK_SHIFT) /** Mask for the joystick being pushed inward. */ #define JOY_PRESS (1 << 5) @@ -99,7 +101,7 @@ static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Joystick_GetStatus(void) { - return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1)); + return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> JOY_PORTE_MASK_SHIFT)); } #endif |