Commit of new class abstraction APIs for all device demos other than the MIDI demo...
[pub/USBasp.git] / Demos / Device / Joystick / Joystick.c
index 8c50a2c..e073a87 100644 (file)
   this software.\r
 */\r
 \r
-/** \file\r
- *\r
- *  Main source file for the Joystick demo. This file contains the main tasks of the demo and\r
- *  is responsible for the initial application hardware configuration.\r
- */\r
-\r
 #include "Joystick.h"\r
 \r
-/* Scheduler Task List */\r
-TASK_LIST\r
-{\r
-       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
-       { .Task = USB_Joystick_Report  , .TaskStatus = TASK_STOP },\r
-};\r
+USB_ClassInfo_HID_t Joystick_HID_Interface =\r
+       {\r
+               .InterfaceNumber         = 0,\r
+\r
+               .ReportINEndpointNumber  = JOYSTICK_EPNUM,\r
+               .ReportINEndpointSize    = JOYSTICK_EPSIZE,\r
+               \r
+               .ReportBufferSize        = sizeof(USB_JoystickReport_Data_t),\r
+\r
+               .UsingReportProtocol     = true,\r
+       };\r
 \r
-/** Main program entry point. This routine configures the hardware required by the application, then\r
- *  starts the scheduler to run the application tasks.\r
- */\r
 int main(void)\r
 {\r
+       SetupHardware();\r
+       \r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+       \r
+       for (;;)\r
+       {\r
+               USB_HID_USBTask(&Joystick_HID_Interface);\r
+               USB_USBTask();\r
+       }\r
+}\r
+\r
+void SetupHardware(void)\r
+{\r
        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
@@ -59,188 +68,64 @@ int main(void)
        Joystick_Init();\r
        LEDs_Init();\r
        Buttons_Init();\r
-       \r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
-       \r
-       /* Initialize Scheduler so that it can be used */\r
-       Scheduler_Init();\r
-\r
-       /* Initialize USB Subsystem */\r
        USB_Init();\r
-\r
-       /* Scheduling - routine never returns, so put this last in the main function */\r
-       Scheduler_Start();\r
 }\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
 void EVENT_USB_Connect(void)\r
 {\r
-       /* Start USB management task */\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
-\r
-       /* Indicate USB enumerating */\r
-       UpdateStatus(Status_USBEnumerating);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\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 joystick reporting tasks.\r
- */\r
 void EVENT_USB_Disconnect(void)\r
 {\r
-       /* Stop running joystick reporting and USB management tasks */\r
-       Scheduler_SetTaskMode(USB_Joystick_Report, TASK_STOP);\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
-\r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
-/** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
- *  of the USB device after enumeration - the device endpoints are configured and the joystick reporting task started.\r
- */ \r
 void EVENT_USB_ConfigurationChanged(void)\r
 {\r
-       /* Setup Joystick Report Endpoint */\r
-       Endpoint_ConfigureEndpoint(JOYSTICK_EPNUM, EP_TYPE_INTERRUPT,\r
-                                      ENDPOINT_DIR_IN, JOYSTICK_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
-       /* Indicate USB connected and ready */\r
-       UpdateStatus(Status_USBReady);\r
-\r
-       /* Start joystick reporting task */\r
-       Scheduler_SetTaskMode(USB_Joystick_Report, TASK_RUN);\r
+       if (!(USB_HID_ConfigureEndpoints(&Joystick_HID_Interface)))\r
+         LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\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
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
-       /* Handle HID Class specific requests */\r
-       switch (USB_ControlRequest.bRequest)\r
-       {\r
-               case REQ_GetReport:\r
-                       if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
-                       {\r
-                               USB_JoystickReport_Data_t JoystickReportData;\r
-                               \r
-                               Endpoint_ClearSETUP();\r
-\r
-                               /* Create the next HID report to send to the host */                            \r
-                               GetNextReport(&JoystickReportData);\r
-                                       \r
-                               /* Write the report data to the control endpoint */\r
-                               Endpoint_Write_Control_Stream_LE(&JoystickReportData, sizeof(JoystickReportData));\r
-                               \r
-                               /* Finalize the stream transfer to send the last packet or clear the host abort */\r
-                               Endpoint_ClearOUT();\r
-                       }\r
-               \r
-                       break;\r
-       }\r
+       USB_HID_ProcessControlPacket(&Joystick_HID_Interface);\r
 }\r
 \r
-/** Fills the given HID report data structure with the next HID report to send to the host.\r
- *\r
- *  \param ReportData  Pointer to a HID report data structure to be filled\r
- *\r
- *  \return Boolean true if the new report differs from the last report, false otherwise\r
- */\r
-bool GetNextReport(USB_JoystickReport_Data_t* ReportData)\r
+void EVENT_USB_StartOfFrame(void)\r
 {\r
-       static uint8_t PrevJoyStatus    = 0;\r
-       static uint8_t PrevButtonStatus = 0;\r
-       uint8_t        JoyStatus_LCL    = Joystick_GetStatus();\r
-       uint8_t        ButtonStatus_LCL = Buttons_GetStatus();\r
-       bool           InputChanged     = false;\r
+       USB_HID_RegisterStartOfFrame(&Joystick_HID_Interface);\r
+}\r
 \r
-       /* Clear the report contents */\r
-       memset(ReportData, 0, sizeof(USB_JoystickReport_Data_t));\r
+uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)\r
+{\r
+       USB_JoystickReport_Data_t* JoystickReport = (USB_JoystickReport_Data_t*)ReportData;\r
+       \r
+       uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
+       uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
 \r
        if (JoyStatus_LCL & JOY_UP)\r
-         ReportData->Y = -100;\r
+         JoystickReport->Y = -100;\r
        else if (JoyStatus_LCL & JOY_DOWN)\r
-         ReportData->Y =  100;\r
+         JoystickReport->Y =  100;\r
 \r
        if (JoyStatus_LCL & JOY_RIGHT)\r
-         ReportData->X =  100;\r
+         JoystickReport->X =  100;\r
        else if (JoyStatus_LCL & JOY_LEFT)\r
-         ReportData->X = -100;\r
+         JoystickReport->X = -100;\r
 \r
        if (JoyStatus_LCL & JOY_PRESS)\r
-         ReportData->Button  = (1 << 1);\r
+         JoystickReport->Button  = (1 << 1);\r
          \r
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r
-         ReportData->Button |= (1 << 0);\r
+         JoystickReport->Button |= (1 << 0);\r
          \r
-       /* Check if the new report is different to the previous report */\r
-       InputChanged = (uint8_t)(PrevJoyStatus ^ JoyStatus_LCL) | (uint8_t)(PrevButtonStatus ^ ButtonStatus_LCL);\r
-\r
-       /* Save the current joystick status for later comparison */\r
-       PrevJoyStatus    = JoyStatus_LCL;\r
-       PrevButtonStatus = ButtonStatus_LCL;\r
-\r
-       /* Return whether the new report is different to the previous report or not */\r
-       return InputChanged;\r
+       return sizeof(USB_JoystickReport_Data_t);\r
 }\r
 \r
-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r
- *  log to a serial port, or anything else that is suitable for status updates.\r
- *\r
- *  \param CurrentStatus  Current status of the system, from the Joystick_StatusCodes_t enum\r
- */\r
-void UpdateStatus(uint8_t CurrentStatus)\r
+void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData, uint16_t ReportSize)\r
 {\r
-       uint8_t LEDMask = LEDS_NO_LEDS;\r
-       \r
-       /* Set the LED mask to the appropriate LED mask based on the given status code */\r
-       switch (CurrentStatus)\r
-       {\r
-               case Status_USBNotReady:\r
-                       LEDMask = (LEDS_LED1);\r
-                       break;\r
-               case Status_USBEnumerating:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-                       break;\r
-               case Status_USBReady:\r
-                       LEDMask = (LEDS_LED2 | LEDS_LED4);\r
-                       break;\r
-       }\r
-       \r
-       /* Set the board LEDs to the new LED mask */\r
-       LEDs_SetAllLEDs(LEDMask);\r
-}\r
-\r
-/** Function to manage HID report generation and transmission to the host. */\r
-TASK(USB_Joystick_Report)\r
-{\r
-       /* Check if the USB System is connected to a Host */\r
-       if (USB_IsConnected)\r
-       {\r
-               /* Select the Joystick Report Endpoint */\r
-               Endpoint_SelectEndpoint(JOYSTICK_EPNUM);\r
-\r
-               /* Check to see if the host is ready for another packet */\r
-               if (Endpoint_IsINReady())\r
-               {\r
-                       USB_JoystickReport_Data_t JoystickReportData;\r
-                       \r
-                       /* Create the next HID report to send to the host */\r
-                       GetNextReport(&JoystickReportData);\r
-               \r
-                       /* Write Joystick Report Data */\r
-                       Endpoint_Write_Stream_LE(&JoystickReportData, sizeof(JoystickReportData));\r
-\r
-                       /* Finalize the stream transfer to send the last packet */\r
-                       Endpoint_ClearIN();\r
-                       \r
-                       /* Clear the report data afterwards */\r
-                       memset(&JoystickReportData, 0, sizeof(JoystickReportData));\r
-               }\r
-       }\r
+       // Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports\r
 }\r