Documentation improvements - put driver example code into its own section, fix incorr...

[pub/USBasp.git] / Demos / Device / LowLevel / KeyboardMouse / KeyboardMouse.c

diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
index 9b0c9ab..2986f6f 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
@@ -117,11 +117,11 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 

-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific
- *  control requests that are not handled internally by the USB library (including the HID commands, which are
- *  all issued via the control endpoint), so that they can be handled appropriately for the application.
+/** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to
+ *  the device from the USB host before passing along unhandled control requests to the library for processing
+ *  internally.

  */
  */

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

 {
        uint8_t* ReportData;
        uint8_t  ReportSize;
 {
        uint8_t* ReportData;
        uint8_t  ReportSize;


@@ -222,17 +222,17 @@ void Keyboard_HID_Task(void)
                KeyboardReportData.Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
 
                if (JoyStatus_LCL & JOY_UP)
                KeyboardReportData.Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
 
                if (JoyStatus_LCL & JOY_UP)

-                 KeyboardReportData.KeyCode[0] = 0x04; // A
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_A;

                else if (JoyStatus_LCL & JOY_DOWN)
                else if (JoyStatus_LCL & JOY_DOWN)

-                 KeyboardReportData.KeyCode[0] = 0x05; // B
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_B;

 
                if (JoyStatus_LCL & JOY_LEFT)
 
                if (JoyStatus_LCL & JOY_LEFT)

-                 KeyboardReportData.KeyCode[0] = 0x06; // C
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_C;

                else if (JoyStatus_LCL & JOY_RIGHT)
                else if (JoyStatus_LCL & JOY_RIGHT)

-                 KeyboardReportData.KeyCode[0] = 0x07; // D
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_D;

 
                if (JoyStatus_LCL & JOY_PRESS)
 
                if (JoyStatus_LCL & JOY_PRESS)

-                 KeyboardReportData.KeyCode[0] = 0x08; // E
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_E;

        }
 
        /* Select the Keyboard Report Endpoint */
        }
 
        /* Select the Keyboard Report Endpoint */