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

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

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index 755c25a..832d16f 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -67,7 +67,7 @@ int main(void)
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();

-       
+

        for (;;)
        {
                HID_Device_USBTask(&Keyboard_HID_Interface);
        for (;;)
        {
                HID_Device_USBTask(&Keyboard_HID_Interface);


@@ -116,8 +116,8 @@ 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 library USB Unhandled Control Request event. */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)

 {
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
 }
 {
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
 }


@@ -142,27 +142,27 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
                                          const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize)
 {
        USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;
                                          const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize)
 {
        USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;

-       
+

        uint8_t JoyStatus_LCL    = Joystick_GetStatus();
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();
 
        uint8_t UsedKeyCodes = 0;
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();
 
        uint8_t UsedKeyCodes = 0;

-               
+

        if (JoyStatus_LCL & JOY_UP)
        if (JoyStatus_LCL & JOY_UP)

-         KeyboardReport->KeyCode[UsedKeyCodes++] = 0x04; // A
+         KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_A;

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

-         KeyboardReport->KeyCode[UsedKeyCodes++] = 0x05; // B
+         KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_B;

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

-         KeyboardReport->KeyCode[UsedKeyCodes++] = 0x06; // C
+         KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_C;

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

-         KeyboardReport->KeyCode[UsedKeyCodes++] = 0x07; // D
+         KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_D;

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

-         KeyboardReport->KeyCode[UsedKeyCodes++] = 0x08; // E
-         
+         KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_E;
+

        if (ButtonStatus_LCL & BUTTONS_BUTTON1)
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)

-         KeyboardReport->KeyCode[UsedKeyCodes++] = 0x09; // F
+         KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_F;

 
        if (UsedKeyCodes)
          KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
 
        if (UsedKeyCodes)
          KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;


@@ -190,12 +190,13 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
 
        if (*LEDReport & HID_KEYBOARD_LED_NUMLOCK)
          LEDMask |= LEDS_LED1;
 
        if (*LEDReport & HID_KEYBOARD_LED_NUMLOCK)
          LEDMask |= LEDS_LED1;

-       
+

        if (*LEDReport & HID_KEYBOARD_LED_CAPSLOCK)
          LEDMask |= LEDS_LED3;
 
        if (*LEDReport & HID_KEYBOARD_LED_SCROLLLOCK)
          LEDMask |= LEDS_LED4;
        if (*LEDReport & HID_KEYBOARD_LED_CAPSLOCK)
          LEDMask |= LEDS_LED3;
 
        if (*LEDReport & HID_KEYBOARD_LED_SCROLLLOCK)
          LEDMask |= LEDS_LED4;

-         
+

        LEDs_SetAllLEDs(LEDMask);
 }
        LEDs_SetAllLEDs(LEDMask);
 }

+