Fixed broken USB_GetNextDescriptor() function causing the descriptor to jump ahead...

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

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.c b/Demos/Device/ClassDriver/Joystick/Joystick.c
index b18b7eb..987fe10 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Joystick.c
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.c
@@ -47,13 +47,14 @@ USB_ClassInfo_HID_Device_t Joystick_HID_Interface =
        {\r
                .Config =\r
                        {\r
        {\r
                .Config =\r
                        {\r

-                               .InterfaceNumber         = 0,\r
+                               .InterfaceNumber              = 0,\r

 \r
 \r

-                               .ReportINEndpointNumber  = JOYSTICK_EPNUM,\r
-                               .ReportINEndpointSize    = JOYSTICK_EPSIZE,\r
+                               .ReportINEndpointNumber       = JOYSTICK_EPNUM,\r
+                               .ReportINEndpointSize         = JOYSTICK_EPSIZE,\r
+                               .ReportINEndpointDoubleBank   = false,\r

 \r
 \r

-                               .PrevReportINBuffer      = PrevJoystickHIDReportBuffer,\r
-                               .PrevReportINBufferSize  = sizeof(PrevJoystickHIDReportBuffer),\r
+                               .PrevReportINBuffer           = PrevJoystickHIDReportBuffer,\r
+                               .PrevReportINBufferSize       = sizeof(PrevJoystickHIDReportBuffer),\r

                        },\r
        };\r
 \r
                        },\r
        };\r
 \r


@@ -135,7 +136,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent\r
  */\r
 bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent\r
  */\r
 bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r

-                                         void* ReportData, uint16_t* ReportSize)\r
+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)\r

 {\r
        USB_JoystickReport_Data_t* JoystickReport = (USB_JoystickReport_Data_t*)ReportData;\r
        \r
 {\r
        USB_JoystickReport_Data_t* JoystickReport = (USB_JoystickReport_Data_t*)ReportData;\r
        \r


@@ -147,10 +148,10 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
        else if (JoyStatus_LCL & JOY_DOWN)\r
          JoystickReport->Y =  100;\r
 \r
        else if (JoyStatus_LCL & JOY_DOWN)\r
          JoystickReport->Y =  100;\r
 \r

-       if (JoyStatus_LCL & JOY_RIGHT)\r
-         JoystickReport->X =  100;\r
-       else if (JoyStatus_LCL & JOY_LEFT)\r
+       if (JoyStatus_LCL & JOY_LEFT)\r

          JoystickReport->X = -100;\r
          JoystickReport->X = -100;\r

+       else if (JoyStatus_LCL & JOY_RIGHT)\r
+         JoystickReport->X =  100;\r

 \r
        if (JoyStatus_LCL & JOY_PRESS)\r
          JoystickReport->Button  = (1 << 1);\r
 \r
        if (JoyStatus_LCL & JOY_PRESS)\r
          JoystickReport->Button  = (1 << 1);\r