Fixed Mouse and Keyboard device demos not acting in accordance with the HID specifica...

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

diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c
index 763d366..8998530 100644 (file)
--- a/Demos/Device/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
@@ -43,9 +43,7 @@ TASK_LIST
        { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
        #endif\r
        \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 +55,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


@@ -140,9 +138,7 @@ EVENT_HANDLER(USB_Reset)
 EVENT_HANDLER(USB_Disconnect)\r
 {\r
        /* Stop running mouse reporting and USB management tasks */\r
 EVENT_HANDLER(USB_Disconnect)\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
 \r
        #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r


@@ -162,18 +158,11 @@ EVENT_HANDLER(USB_ConfigurationChanged)
                                       ENDPOINT_DIR_IN, MOUSE_EPSIZE,\r
                                   ENDPOINT_BANK_SINGLE);\r
 \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
 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r


@@ -311,34 +300,36 @@ void CreateMouseReport(USB_MouseReport_Data_t* ReportData)
 }\r
 \r
 /** Sends the next HID report to the host, via the keyboard data endpoint. */\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


@@ -380,7 +371,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


@@ -391,8 +381,8 @@ TASK(USB_Mouse_Report)
                SendNextReport();\r
        }\r
 }\r
                SendNextReport();\r
        }\r
 }\r

-#endif\r

 \r
 \r

+#if defined(INTERRUPT_CONTROL_ENDPOINT)\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
 /** 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


@@ -401,36 +391,20 @@ TASK(USB_Mouse_Report)
  */\r
 ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
 {\r
  */\r
 ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
 {\r

-       #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
+       /* Save previously selected endpoint before selecting a new endpoint */\r
+       uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
+\r

        /* Check if the control endpoint has received a request */\r
        if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))\r
        {\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
                /* 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
 \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
+       /* Restore previously selected endpoint */\r
+       Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r

 }\r
 }\r

+#endif\r