projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed incorrect values for REPORT_ITEM_TYPE_* enum values causing corrupt data in...
[pub/USBasp.git]
/
Demos
/
Device
/
LowLevel
/
Keyboard
/
Keyboard.c
diff --git
a/Demos/Device/LowLevel/Keyboard/Keyboard.c
b/Demos/Device/LowLevel/Keyboard/Keyboard.c
index
2527148
..
4e7921f
100644
(file)
--- a/
Demos/Device/LowLevel/Keyboard/Keyboard.c
+++ b/
Demos/Device/LowLevel/Keyboard/Keyboard.c
@@
-37,7
+37,6
@@
\r
#include "Keyboard.h"
\r
\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
/** Indicates what report mode the host has requested, true for normal HID reporting mode, false for special boot
\r
* protocol reporting mode.
\r
*/
\r
@@
-56,7
+55,7
@@
uint16_t IdleMSRemaining = 0;
\r
\r
/** Main program entry point. This routine configures the hardware required by the application, then
\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
*/
\r
int main(void)
\r
{
\r
@@
-85,18
+84,13
@@
void SetupHardware(void)
Joystick_Init();
\r
LEDs_Init();
\r
USB_Init();
\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
* starts the library USB task to begin the enumeration and USB management process.
\r
*/
\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
+void EVENT_USB_
Device_
Connect(void)
\r
{
\r
/* Indicate USB enumerating */
\r
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
\r
{
\r
/* Indicate USB enumerating */
\r
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
\r
@@
-108,7
+102,7
@@
void EVENT_USB_Connect(void)
/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
\r
* the status LEDs.
\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.
\r
*/
\r
-void EVENT_USB_Disconnect(void)
\r
+void EVENT_USB_D
evice_D
isconnect(void)
\r
{
\r
/* Indicate USB not ready */
\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
\r
{
\r
/* Indicate USB not ready */
\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
\r
@@
-117,7
+111,7
@@
void EVENT_USB_Disconnect(void)
/** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration
\r
* of the USB device after enumeration, and configures the keyboard device endpoints.
\r
*/
\r
/** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration
\r
* of the USB device after enumeration, and configures the keyboard device endpoints.
\r
*/
\r
-void EVENT_USB_ConfigurationChanged(void)
\r
+void EVENT_USB_
Device_
ConfigurationChanged(void)
\r
{
\r
/* Indicate USB connected and ready */
\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);
\r
{
\r
/* Indicate USB connected and ready */
\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);
\r
@@
-137,13
+131,15
@@
void EVENT_USB_ConfigurationChanged(void)
{
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
}
\r
{
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
}
\r
+
\r
+ USB_Device_EnableSOFEvents();
\r
}
\r
\r
}
\r
\r
-/** Event handler for the USB_UnhandledControl
Packe
t event. This is used to catch standard and class specific
\r
+/** Event handler for the USB_UnhandledControl
Reques
t 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
* 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_
UnhandledControlPacke
t(void)
\r
+void EVENT_USB_
Device_UnhandledControlReques
t(void)
\r
{
\r
/* Handle HID Class specific requests */
\r
switch (USB_ControlRequest.bRequest)
\r
{
\r
/* Handle HID Class specific requests */
\r
switch (USB_ControlRequest.bRequest)
\r
@@
-172,7
+168,11
@@
void EVENT_USB_UnhandledControlPacket(void)
Endpoint_ClearSETUP();
\r
\r
/* Wait until the LED report has been sent by the host */
\r
Endpoint_ClearSETUP();
\r
\r
/* Wait until the LED report has been sent by the host */
\r
- while (!(Endpoint_IsOUTReceived()));
\r
+ while (!(Endpoint_IsOUTReceived()))
\r
+ {
\r
+ if (USB_DeviceState == DEVICE_STATE_Unattached)
\r
+ return;
\r
+ }
\r
\r
/* Read in the LED report from the host */
\r
uint8_t LEDStatus = Endpoint_Read_Byte();
\r
\r
/* Read in the LED report from the host */
\r
uint8_t LEDStatus = Endpoint_Read_Byte();
\r
@@
-183,9
+183,7
@@
void EVENT_USB_UnhandledControlPacket(void)
/* Clear the endpoint data */
\r
Endpoint_ClearOUT();
\r
\r
/* Clear the endpoint data */
\r
Endpoint_ClearOUT();
\r
\r
- /* Acknowledge status stage */
\r
- while (!(Endpoint_IsINReady()));
\r
- Endpoint_ClearIN();
\r
+ Endpoint_ClearStatusStage();
\r
}
\r
\r
break;
\r
}
\r
\r
break;
\r
@@
-200,9
+198,7
@@
void EVENT_USB_UnhandledControlPacket(void)
/* Send the flag to the host */
\r
Endpoint_ClearIN();
\r
\r
/* Send the flag to the host */
\r
Endpoint_ClearIN();
\r
\r
- /* Acknowledge status stage */
\r
- while (!(Endpoint_IsOUTReceived()));
\r
- Endpoint_ClearOUT();
\r
+ Endpoint_ClearStatusStage();
\r
}
\r
\r
break;
\r
}
\r
\r
break;
\r
@@
-214,9
+210,7
@@
void EVENT_USB_UnhandledControlPacket(void)
/* Set or clear the flag depending on what the host indicates that the current Protocol should be */
\r
UsingReportProtocol = (USB_ControlRequest.wValue != 0);
\r
\r
/* Set or clear the flag depending on what the host indicates that the current Protocol should be */
\r
UsingReportProtocol = (USB_ControlRequest.wValue != 0);
\r
\r
- /* Acknowledge status stage */
\r
- while (!(Endpoint_IsINReady()));
\r
- Endpoint_ClearIN();
\r
+ Endpoint_ClearStatusStage();
\r
}
\r
\r
break;
\r
}
\r
\r
break;
\r
@@
-228,9
+222,7
@@
void EVENT_USB_UnhandledControlPacket(void)
/* Get idle period in MSB, IdleCount must be multiplied by 4 to get number of milliseconds */
\r
IdleCount = ((USB_ControlRequest.wValue & 0xFF00) >> 6);
\r
\r
/* Get idle period in MSB, IdleCount must be multiplied by 4 to get number of milliseconds */
\r
IdleCount = ((USB_ControlRequest.wValue & 0xFF00) >> 6);
\r
\r
- /* Acknowledge status stage */
\r
- while (!(Endpoint_IsINReady()));
\r
- Endpoint_ClearIN();
\r
+ Endpoint_ClearStatusStage();
\r
}
\r
\r
break;
\r
}
\r
\r
break;
\r
@@
-245,19
+237,15
@@
void EVENT_USB_UnhandledControlPacket(void)
/* Send the flag to the host */
\r
Endpoint_ClearIN();
\r
\r
/* Send the flag to the host */
\r
Endpoint_ClearIN();
\r
\r
- /* Acknowledge status stage */
\r
- while (!(Endpoint_IsOUTReceived()));
\r
- Endpoint_ClearOUT();
\r
+ Endpoint_ClearStatusStage();
\r
}
\r
\r
break;
\r
}
\r
}
\r
\r
}
\r
\r
break;
\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
/* One millisecond has elapsed, decrement the idle time remaining counter if it has not already elapsed */
\r
if (IdleMSRemaining)
\r
@@
-270,23
+258,29
@@
ISR(TIMER0_COMPA_vect, ISR_BLOCK)
*/
\r
void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData)
\r
{
\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
/* Clear the report contents */
\r
memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));
\r
-
\r
+
\r
if (JoyStatus_LCL & JOY_UP)
\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
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
\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
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
\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
\r
/** Processes a received LED report, and updates the board LEDs states to match.
\r
@@
-323,9
+317,6
@@
void SendNextReport(void)
/* 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
/* 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 the idle period is set and has elapsed */
\r
if ((IdleCount != HID_IDLE_CHANGESONLY) && (!(IdleMSRemaining)))
\r
{
\r
@@
-342,6
+333,9
@@
void SendNextReport(void)
/* Check if Keyboard Endpoint Ready for Read/Write and if we should send a new report */
\r
if (Endpoint_IsReadWriteAllowed() && SendReport)
\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
/* Write Keyboard Report Data */
\r
Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));
\r
\r
@@
-377,13
+371,13
@@
void ReceiveNextReport(void)
/** Function to manage HID report generation and transmission to the host, when in report mode. */
\r
void HID_Task(void)
\r
{
\r
/** Function to manage HID report generation and transmission to the host, when in report mode. */
\r
void HID_Task(void)
\r
{
\r
- /* Check if the USB system is connected to a host */
\r
- if (USB_IsConnected)
\r
- {
\r
- /* Send the next keypress report to the host */
\r
- SendNextReport();
\r
+ /* Device must be connected and configured for the task to run */
\r
+ if (USB_DeviceState != DEVICE_STATE_Configured)
\r
+ return;
\r
+
\r
+ /* Send the next keypress report to the host */
\r
+ SendNextReport();
\r
\r
\r
- /* Process the LED report sent from the host */
\r
- ReceiveNextReport();
\r
- }
\r
+ /* Process the LED report sent from the host */
\r
+ ReceiveNextReport();
\r
}
\r
}
\r
projects / pub / USBasp.git / blobdiff