Deleted StdDescriptors.c, renamed USB_GetDescriptor() to CALLBACK_USB_GetDescriptor...

[pub/USBasp.git] / Demos / Device / Mouse / Mouse.c

diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c
index 0959a4a..32b12fc 100644 (file)
--- a/Demos/Device/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
@@ -39,13 +39,8 @@
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r

-       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r

        { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
        { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r

-       #endif\r
-       \r
-       #if !defined(INTERRUPT_DATA_ENDPOINT)\r

        { .Task = USB_Mouse_Report     , .TaskStatus = TASK_STOP },\r
        { .Task = USB_Mouse_Report     , .TaskStatus = TASK_STOP },\r

-       #endif\r

 };\r
 \r
 /* Global Variables */\r
 };\r
 \r
 /* Global Variables */\r


@@ -57,7 +52,7 @@ bool UsingReportProtocol = true;
 /** Current Idle period. This is set by the host via a Set Idle HID class request to silence the device's reports\r
  *  for either the entire idle duration, or until the report status changes (e.g. the user moves the mouse).\r
  */\r
 /** Current Idle period. This is set by the host via a Set Idle HID class request to silence the device's reports\r
  *  for either the entire idle duration, or until the report status changes (e.g. the user moves the mouse).\r
  */\r

-uint8_t IdleCount = 0;\r
+uint16_t IdleCount = HID_IDLE_CHANGESONLY;\r

 \r
 /** Current Idle period remaining. When the IdleCount value is set, this tracks the remaining number of idle\r
  *  milliseconds. This is separate to the IdleCount timer and is incremented and compared as the host may request \r
 \r
 /** Current Idle period remaining. When the IdleCount value is set, this tracks the remaining number of idle\r
  *  milliseconds. This is separate to the IdleCount timer and is incremented and compared as the host may request \r


@@ -81,7 +76,7 @@ int main(void)
        /* Hardware Initialization */\r
        Joystick_Init();\r
        LEDs_Init();\r
        /* Hardware Initialization */\r
        Joystick_Init();\r
        LEDs_Init();\r

-       HWB_Init();\r
+       Buttons_Init();\r

        \r
        /* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */\r
        OCR0A  = 0x7D;\r
        \r
        /* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */\r
        OCR0A  = 0x7D;\r


@@ -105,12 +100,10 @@ int main(void)
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r

-EVENT_HANDLER(USB_Connect)\r
+void EVENT_USB_Connect(void)\r

 {\r
 {\r

-       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r

        /* Start USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
        /* Start USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r

-       #endif\r

        \r
        /* Indicate USB enumerating */\r
        UpdateStatus(Status_USBEnumerating);\r
        \r
        /* Indicate USB enumerating */\r
        UpdateStatus(Status_USBEnumerating);\r


@@ -119,34 +112,14 @@ EVENT_HANDLER(USB_Connect)
        UsingReportProtocol = true;\r
 }\r
 \r
        UsingReportProtocol = true;\r
 }\r
 \r

-/** Event handler for the USB_Reset event. This fires when the USB interface is reset by the USB host, before the\r
- *  enumeration process begins, and enables the control endpoint interrupt so that control requests can be handled\r
- *  asynchronously when they arrive rather than when the control endpoint is polled manually.\r
- */\r
-EVENT_HANDLER(USB_Reset)\r
-{\r
-       #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
-       /* Select the control endpoint */\r
-       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
-\r
-       /* Enable the endpoint SETUP interrupt ISR for the control endpoint */\r
-       USB_INT_Enable(ENDPOINT_INT_SETUP);\r
-       #endif\r
-}\r
-\r

 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs and stops the USB management and Mouse reporting tasks.\r
  */\r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs and stops the USB management and Mouse reporting tasks.\r
  */\r

-EVENT_HANDLER(USB_Disconnect)\r
+void EVENT_USB_Disconnect(void)\r

 {\r
        /* Stop running mouse reporting and USB management tasks */\r
 {\r
        /* Stop running mouse reporting and USB management tasks */\r

-       #if !defined(INTERRUPT_DATA_ENDPOINT)\r

        Scheduler_SetTaskMode(USB_Mouse_Report, TASK_STOP);\r
        Scheduler_SetTaskMode(USB_Mouse_Report, TASK_STOP);\r

-       #endif\r
-\r
-       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r

        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r

-       #endif\r

 \r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
 \r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r


@@ -155,61 +128,41 @@ EVENT_HANDLER(USB_Disconnect)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration\r
  *  of the USB device after enumeration - the device endpoints are configured and the mouse reporting task started.\r
  */ \r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration\r
  *  of the USB device after enumeration - the device endpoints are configured and the mouse reporting task started.\r
  */ \r

-EVENT_HANDLER(USB_ConfigurationChanged)\r
+void EVENT_USB_ConfigurationChanged(void)\r

 {\r
        /* Setup Mouse Report Endpoint */\r
        Endpoint_ConfigureEndpoint(MOUSE_EPNUM, EP_TYPE_INTERRUPT,\r
                                       ENDPOINT_DIR_IN, MOUSE_EPSIZE,\r
                                   ENDPOINT_BANK_SINGLE);\r
 \r
 {\r
        /* Setup Mouse Report Endpoint */\r
        Endpoint_ConfigureEndpoint(MOUSE_EPNUM, EP_TYPE_INTERRUPT,\r
                                       ENDPOINT_DIR_IN, MOUSE_EPSIZE,\r
                                   ENDPOINT_BANK_SINGLE);\r
 \r

-       #if defined(INTERRUPT_DATA_ENDPOINT)\r
-       /* Enable the endpoint IN interrupt ISR for the report endpoint */\r
-       USB_INT_Enable(ENDPOINT_INT_IN);\r
-       #endif\r
-\r

        /* Indicate USB connected and ready */\r
        UpdateStatus(Status_USBReady);\r
 \r
        /* Indicate USB connected and ready */\r
        UpdateStatus(Status_USBReady);\r
 \r

-       #if !defined(INTERRUPT_DATA_ENDPOINT)\r

        /* Start running mouse reporting task */\r
        Scheduler_SetTaskMode(USB_Mouse_Report, TASK_RUN);\r
        /* Start running mouse reporting task */\r
        Scheduler_SetTaskMode(USB_Mouse_Report, TASK_RUN);\r

-       #endif\r

 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
  *  control requests that are not handled internally by the USB library (including the HID commands, which are\r
  *  all issued via the control endpoint), so that they can be handled appropriately for the application.\r
  */\r
 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
  *  control requests that are not handled internally by the USB library (including the HID commands, which are\r
  *  all issued via the control endpoint), so that they can be handled appropriately for the application.\r
  */\r

-EVENT_HANDLER(USB_UnhandledControlPacket)\r
+void EVENT_USB_UnhandledControlPacket(void)\r

 {\r
        /* Handle HID Class specific requests */\r
 {\r
        /* Handle HID Class specific requests */\r

-       switch (bRequest)\r
+       switch (USB_ControlRequest.bRequest)\r

        {\r
                case REQ_GetReport:\r
        {\r
                case REQ_GetReport:\r

-                       if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {\r
                                USB_MouseReport_Data_t MouseReportData;\r
 \r
                        {\r
                                USB_MouseReport_Data_t MouseReportData;\r
 \r

+                               Endpoint_ClearSETUP();\r
+\r

                                /* Create the next mouse report for transmission to the host */\r
                                CreateMouseReport(&MouseReportData);\r
                                /* Create the next mouse report for transmission to the host */\r
                                CreateMouseReport(&MouseReportData);\r

-\r
-                               /* Ignore report type and ID number value */\r
-                               Endpoint_Discard_Word();\r
-                               \r
-                               /* Ignore unused Interface number value */\r
-                               Endpoint_Discard_Word();\r
-\r
-                               /* Read in the number of bytes in the report to send to the host */\r
-                               uint16_t wLength = Endpoint_Read_Word_LE();\r
-                               \r
-                               /* If trying to send more bytes than exist to the host, clamp the value at the report size */\r
-                               if (wLength > sizeof(MouseReportData))\r
-                                 wLength = sizeof(MouseReportData);\r
-\r
-                               Endpoint_ClearSETUP();\r

        \r
                                /* Write the report data to the control endpoint */\r
        \r
                                /* Write the report data to the control endpoint */\r

-                               Endpoint_Write_Control_Stream_LE(&MouseReportData, wLength);\r
+                               Endpoint_Write_Control_Stream_LE(&MouseReportData, sizeof(MouseReportData));\r

                                \r
                                /* Clear the report data afterwards */\r
                                memset(&MouseReportData, 0, sizeof(MouseReportData));\r
                                \r
                                /* Clear the report data afterwards */\r
                                memset(&MouseReportData, 0, sizeof(MouseReportData));\r


@@ -220,7 +173,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                \r
                        break;\r
                case REQ_GetProtocol:\r
                \r
                        break;\r
                case REQ_GetProtocol:\r

-                       if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {\r
                                Endpoint_ClearSETUP();\r
                                \r
                        {\r
                                Endpoint_ClearSETUP();\r
                                \r


@@ -237,15 +190,12 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        \r
                        break;\r
                case REQ_SetProtocol:\r
                        \r
                        break;\r
                case REQ_SetProtocol:\r

-                       if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {\r
                        {\r

-                               /* Read in the wValue parameter containing the new protocol mode */\r
-                               uint16_t wValue = Endpoint_Read_Word_LE();\r
-                               \r

                                Endpoint_ClearSETUP();\r
                                \r
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Set or clear the flag depending on what the host indicates that the current Protocol should be */\r

-                               UsingReportProtocol = (wValue != 0x0000);\r
+                               UsingReportProtocol = (USB_ControlRequest.wValue != 0);\r

                                \r
                                /* Acknowledge status stage */\r
                                while (!(Endpoint_IsINReady()));\r
                                \r
                                /* Acknowledge status stage */\r
                                while (!(Endpoint_IsINReady()));\r


@@ -254,15 +204,12 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        \r
                        break;\r
                case REQ_SetIdle:\r
                        \r
                        break;\r
                case REQ_SetIdle:\r

-                       if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {\r
                        {\r

-                               /* Read in the wValue parameter containing the idle period */\r
-                               uint16_t wValue = Endpoint_Read_Word_LE();\r
-                               \r

                                Endpoint_ClearSETUP();\r
                                \r
                                /* Get idle period in MSB */\r
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Get idle period in MSB */\r

-                               IdleCount = (wValue >> 8);\r
+                               IdleCount = (USB_ControlRequest.wValue >> 8);\r

                                \r
                                /* Acknowledge status stage */\r
                                while (!(Endpoint_IsINReady()));\r
                                \r
                                /* Acknowledge status stage */\r
                                while (!(Endpoint_IsINReady()));\r


@@ -271,7 +218,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        \r
                        break;\r
                case REQ_GetIdle:\r
                        \r
                        break;\r
                case REQ_GetIdle:\r

-                       if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {               \r
                                Endpoint_ClearSETUP();\r
                                \r
                        {               \r
                                Endpoint_ClearSETUP();\r
                                \r


@@ -306,7 +253,8 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  */\r
 void CreateMouseReport(USB_MouseReport_Data_t* ReportData)\r
 {\r
  */\r
 void CreateMouseReport(USB_MouseReport_Data_t* ReportData)\r
 {\r

-       uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
+       uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
+       uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r

        \r
        /* Clear the report contents */\r
        memset(ReportData, 0, sizeof(USB_MouseReport_Data_t));\r
        \r
        /* Clear the report contents */\r
        memset(ReportData, 0, sizeof(USB_MouseReport_Data_t));\r


@@ -324,39 +272,41 @@ void CreateMouseReport(USB_MouseReport_Data_t* ReportData)
        if (JoyStatus_LCL & JOY_PRESS)\r
          ReportData->Button  = (1 << 0);\r
          \r
        if (JoyStatus_LCL & JOY_PRESS)\r
          ReportData->Button  = (1 << 0);\r
          \r

-       if (HWB_GetStatus())\r
+       if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r

          ReportData->Button |= (1 << 1);\r
 }\r
 \r
 /** Sends the next HID report to the host, via the keyboard data endpoint. */\r
          ReportData->Button |= (1 << 1);\r
 }\r
 \r
 /** Sends the next HID report to the host, via the keyboard data endpoint. */\r

-static inline void SendNextReport(void)\r
+void SendNextReport(void)\r

 {\r
        static USB_MouseReport_Data_t PrevMouseReportData;\r
        USB_MouseReport_Data_t        MouseReportData;\r
 {\r
        static USB_MouseReport_Data_t PrevMouseReportData;\r
        USB_MouseReport_Data_t        MouseReportData;\r

-       bool                          SendReport = true;\r
+       bool                          SendReport;\r

        \r
        /* Create the next mouse report for transmission to the host */\r
        CreateMouseReport(&MouseReportData);\r
        \r
        \r
        /* Create the next mouse report for transmission to the host */\r
        CreateMouseReport(&MouseReportData);\r
        \r

-       /* Check if the idle period is set*/\r
-       if (IdleCount)\r
-       {\r
-               /* Determine if the idle period has elapsed */\r
-               if (!(IdleMSRemaining))\r
-               {\r
-                       /* Reset the idle time remaining counter, must multiply by 4 to get the duration in milliseconds */\r
-                       IdleMSRemaining = (IdleCount << 2);             \r
-               }\r
-               else\r
-               {\r
-                       /* Idle period not elapsed, indicate that a report must not be sent unless the report has changed */\r
-                       SendReport = (memcmp(&PrevMouseReportData, &MouseReportData, sizeof(USB_MouseReport_Data_t)) != 0);\r
-               }\r
-       }\r
-\r
+       /* Check to see if the report data has changed - if so a report MUST be sent */\r
+       SendReport = (memcmp(&PrevMouseReportData, &MouseReportData, sizeof(USB_MouseReport_Data_t)) != 0);\r
+       \r
+       /* Override the check if the Y or X values are non-zero - we want continuous movement while the joystick\r
+        * is being held down (via continuous reports), otherwise the cursor will only move once per joystick toggle */\r
+       if ((MouseReportData.Y != 0) || (MouseReportData.X != 0))\r
+         SendReport = true;\r
+       \r

        /* Save the current report data for later comparison to check for changes */\r
        PrevMouseReportData = MouseReportData;\r
        \r
        /* Save the current report data for later comparison to check for changes */\r
        PrevMouseReportData = MouseReportData;\r
        \r

+       /* Check if the idle period is set and has elapsed */\r
+       if ((IdleCount != HID_IDLE_CHANGESONLY) && (!(IdleMSRemaining)))\r
+       {\r
+               /* Reset the idle time remaining counter, must multiply by 4 to get the duration in milliseconds */\r
+               IdleMSRemaining = (IdleCount << 2);\r
+               \r
+               /* Idle period is set and has elapsed, must send a report to the host */\r
+               SendReport = true;\r
+       }\r
+       \r

        /* Select the Mouse Report Endpoint */\r
        Endpoint_SelectEndpoint(MOUSE_EPNUM);\r
 \r
        /* Select the Mouse Report Endpoint */\r
        Endpoint_SelectEndpoint(MOUSE_EPNUM);\r
 \r


@@ -398,7 +348,6 @@ void UpdateStatus(uint8_t CurrentStatus)
        LEDs_SetAllLEDs(LEDMask);\r
 }\r
 \r
        LEDs_SetAllLEDs(LEDMask);\r
 }\r
 \r

-#if !defined(INTERRUPT_DATA_ENDPOINT)\r

 /** Task to manage HID report generation and transmission to the host, when in report mode. */\r
 TASK(USB_Mouse_Report)\r
 {\r
 /** Task to manage HID report generation and transmission to the host, when in report mode. */\r
 TASK(USB_Mouse_Report)\r
 {\r


@@ -409,46 +358,3 @@ TASK(USB_Mouse_Report)
                SendNextReport();\r
        }\r
 }\r
                SendNextReport();\r
        }\r
 }\r

-#endif\r
-\r
-/** ISR for the general Pipe/Endpoint interrupt vector. This ISR fires when an endpoint's status changes (such as\r
- *  a packet has been received) on an endpoint with its corresponding ISR enabling bits set. This is used to send\r
- *  HID packets to the host each time the HID interrupt endpoints polling period elapses, as managed by the USB\r
- *  controller. It is also used to respond to standard and class specific requests send to the device on the control\r
- *  endpoint, by handing them off to the LUFA library when they are received.\r
- */\r
-ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
-{\r
-       #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
-       /* Check if the control endpoint has received a request */\r
-       if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))\r
-       {\r
-               /* Clear the endpoint interrupt */\r
-               Endpoint_ClearEndpointInterrupt(ENDPOINT_CONTROLEP);\r
-\r
-               /* Process the control request */\r
-               USB_USBTask();\r
-\r
-               /* Handshake the endpoint setup interrupt - must be after the call to USB_USBTask() */\r
-               USB_INT_Clear(ENDPOINT_INT_SETUP);\r
-       }\r
-       #endif\r
-       \r
-       #if defined(INTERRUPT_DATA_ENDPOINT)\r
-       /* Check if mouse endpoint has interrupted */\r
-       if (Endpoint_HasEndpointInterrupted(MOUSE_EPNUM))\r
-       {\r
-               /* Select the Mouse Report Endpoint */\r
-               Endpoint_SelectEndpoint(MOUSE_EPNUM);\r
-\r
-               /* Clear the endpoint IN interrupt flag */\r
-               USB_INT_Clear(ENDPOINT_INT_IN);\r
-\r
-               /* Clear the Mouse Report endpoint interrupt and select the endpoint */\r
-               Endpoint_ClearEndpointInterrupt(MOUSE_EPNUM);\r
-\r
-               /* Send the next mouse report to the host */\r
-               SendNextReport();\r
-       }\r
-       #endif\r
-}\r