AppConfigHeaders: Merge in latest trunk.

[pub/USBasp.git] / Demos / Device / ClassDriver / Joystick / Joystick.h

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.h b/Demos/Device/ClassDriver/Joystick/Joystick.h
index 0742ca8..8c51ae6 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Joystick.h
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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

-  Copyright 2010  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


@@ -45,7 +45,6 @@
 
                #include "Descriptors.h"
 
 
                #include "Descriptors.h"
 

-               #include <LUFA/Version.h>

                #include <LUFA/Drivers/Board/Joystick.h>
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Buttons.h>
                #include <LUFA/Drivers/Board/Joystick.h>
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Buttons.h>


@@ -59,6 +58,7 @@
                {
                        int8_t  X; /**< Current absolute joystick X position, as a signed 8-bit integer */
                        int8_t  Y; /**< Current absolute joystick Y position, as a signed 8-bit integer */
                {
                        int8_t  X; /**< Current absolute joystick X position, as a signed 8-bit integer */
                        int8_t  Y; /**< Current absolute joystick Y position, as a signed 8-bit integer */

+                       int8_t  Z; /**< Current absolute joystick Z position, as a signed 8-bit integer */

                        uint8_t Button; /**< Bit mask of the currently pressed joystick buttons */
                } USB_JoystickReport_Data_t;
 
                        uint8_t Button; /**< Bit mask of the currently pressed joystick buttons */
                } USB_JoystickReport_Data_t;
 


@@ -81,7 +81,7 @@
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);

-               void EVENT_USB_Device_UnhandledControlRequest(void);
+               void EVENT_USB_Device_ControlRequest(void);

                void EVENT_USB_Device_StartOfFrame(void);
 
                bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
                void EVENT_USB_Device_StartOfFrame(void);
 
                bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,