/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Denver Gingerich (denver [at] ossguy [dot] com)\r
- Based on code by Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+ Copyright 2010 Denver Gingerich (denver [at] ossguy [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
\r
#include "Keyboard.h"\r
\r
-/* Global Variables */\r
/** Indicates what report mode the host has requested, true for normal HID reporting mode, false for special boot\r
* protocol reporting mode.\r
*/\r
\r
\r
/** Main program entry point. This routine configures the hardware required by the application, then\r
- * starts the scheduler to run the USB management task.\r
+ * enters a loop to run the application tasks in sequence.\r
*/\r
int main(void)\r
{\r
SetupHardware();\r
\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+ sei();\r
\r
for (;;)\r
{\r
Joystick_Init();\r
LEDs_Init();\r
USB_Init();\r
- \r
- /* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */\r
- OCR0A = 0x7D;\r
- TCCR0A = (1 << WGM01);\r
- TCCR0B = ((1 << CS01) | (1 << CS00));\r
- TIMSK0 = (1 << OCIE0A);\r
+ Buttons_Init();\r
}\r
\r
/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
{\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
}\r
+ \r
+ USB_Device_EnableSOFEvents();\r
}\r
\r
/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\r
}\r
}\r
\r
-/** ISR for the timer 0 compare vector. This ISR fires once each millisecond, and increments the\r
- * scheduler elapsed idle period counter when the host has set an idle period.\r
- */\r
-ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
+/** Event handler for the USB device Start Of Frame event. */\r
+void EVENT_USB_Device_StartOfFrame(void)\r
{\r
/* One millisecond has elapsed, decrement the idle time remaining counter if it has not already elapsed */\r
if (IdleMSRemaining)\r
*/\r
void CreateKeyboardReport(USB_KeyboardReport_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
+ uint8_t UsedKeyCodes = 0;\r
\r
/* Clear the report contents */\r
memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));\r
-\r
+ \r
+ /* Make sent key uppercase by indicating that the left shift key is pressed */\r
+ ReportData->Modifier = KEYBOARD_MODIFER_LEFTSHIFT;\r
+ \r
if (JoyStatus_LCL & JOY_UP)\r
- ReportData->KeyCode[0] = 0x04; // A\r
+ ReportData->KeyCode[UsedKeyCodes++] = 0x04; // A\r
else if (JoyStatus_LCL & JOY_DOWN)\r
- ReportData->KeyCode[0] = 0x05; // B\r
+ ReportData->KeyCode[UsedKeyCodes++] = 0x05; // B\r
\r
if (JoyStatus_LCL & JOY_LEFT)\r
- ReportData->KeyCode[0] = 0x06; // C\r
+ ReportData->KeyCode[UsedKeyCodes++] = 0x06; // C\r
else if (JoyStatus_LCL & JOY_RIGHT)\r
- ReportData->KeyCode[0] = 0x07; // D\r
+ ReportData->KeyCode[UsedKeyCodes++] = 0x07; // D\r
\r
if (JoyStatus_LCL & JOY_PRESS)\r
- ReportData->KeyCode[0] = 0x08; // E\r
+ ReportData->KeyCode[UsedKeyCodes++] = 0x08; // E\r
+ \r
+ if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r
+ ReportData->KeyCode[UsedKeyCodes++] = 0x09; // F\r
}\r
\r
/** Processes a received LED report, and updates the board LEDs states to match.\r
{\r
uint8_t LEDMask = LEDS_LED2;\r
\r
- if (LEDReport & 0x01) // NUM Lock\r
+ if (LEDReport & KEYBOARD_LED_NUMLOCK)\r
LEDMask |= LEDS_LED1;\r
\r
- if (LEDReport & 0x02) // CAPS Lock\r
+ if (LEDReport & KEYBOARD_LED_CAPSLOCK)\r
LEDMask |= LEDS_LED3;\r
\r
- if (LEDReport & 0x04) // SCROLL Lock\r
+ if (LEDReport & KEYBOARD_LED_SCROLLLOCK)\r
LEDMask |= LEDS_LED4;\r
\r
/* Set the status LEDs to the current Keyboard LED status */\r
/* Check to see if the report data has changed - if so a report MUST be sent */\r
SendReport = (memcmp(&PrevKeyboardReportData, &KeyboardReportData, sizeof(USB_KeyboardReport_Data_t)) != 0);\r
\r
- /* Save the current report data for later comparison to check for changes */\r
- PrevKeyboardReportData = KeyboardReportData;\r
- \r
/* Check if the idle period is set and has elapsed */\r
if ((IdleCount != HID_IDLE_CHANGESONLY) && (!(IdleMSRemaining)))\r
{\r
/* Check if Keyboard Endpoint Ready for Read/Write and if we should send a new report */\r
if (Endpoint_IsReadWriteAllowed() && SendReport)\r
{\r
+ /* Save the current report data for later comparison to check for changes */\r
+ PrevKeyboardReportData = KeyboardReportData;\r
+ \r
/* Write Keyboard Report Data */\r
Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));\r
\r
projects / pub / USBasp.git / blobdiff