Mark build test makefiles as being incompatible with parallel make builds, as they...

[pub/USBasp.git] / LUFA / Drivers / Board / AVR8 / STK525 / Joystick.h

diff --git a/LUFA/Drivers/Board/AVR8/STK525/Joystick.h b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
index dcf7f2e..fb6c857 100644 (file)
--- a/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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


@@ -42,6 +42,11 @@
  *
  *  Board specific joystick driver header for the Atmel STK525.
  *
  *
  *  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_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 upward direction. */
                        #define JOY_UP                    (1 << 7)


@@ -91,11 +96,20 @@
                #if !defined(__DOXYGEN__)
                        static inline void Joystick_Init(void)
                        {
                #if !defined(__DOXYGEN__)
                        static inline void Joystick_Init(void)
                        {

-                               DDRB  &= ~(JOY_BMASK);
-                               DDRE  &= ~(JOY_EMASK);
+                               DDRB  &= ~JOY_BMASK;
+                               DDRE  &= ~JOY_EMASK;
+
+                               PORTB |=  JOY_BMASK;
+                               PORTE |=  JOY_EMASK;
+                       }
+
+                       static inline void Joystick_Disable(void)
+                       {
+                               DDRB  &= ~JOY_BMASK;
+                               DDRE  &= ~JOY_EMASK;

 
 

-                               PORTB |= JOY_BMASK;
-                               PORTE |= JOY_EMASK;
+                               PORTB &= ~JOY_BMASK;
+                               PORTE &= ~JOY_EMASK;

                        }
 
                        static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
                        }
 
                        static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;