Added keyboard modifier masks (HID_KEYBOARD_MODIFER_*) to the HID class driver and Keyboard demos.

8 files changed, 92 insertions, 32 deletions

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index 4b295a2a8..7e5834868 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -147,6 +147,8 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
 

 	uint8_t UsedKeyCodes = 0;

 	

+	KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;

+	

 	if (JoyStatus_LCL & JOY_UP)

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

 	else if (JoyStatus_LCL & JOY_DOWN)

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index dcdf88682..8e91d1229 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -180,6 +180,8 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
 		if (!(ButtonStatus_LCL & BUTTONS_BUTTON1))

 		  return 0;

 		

+		KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;

+

 		if (JoyStatus_LCL & JOY_UP)

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

 		else if (JoyStatus_LCL & JOY_DOWN)

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
index 683ab66f7..0f0d62469 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
@@ -192,6 +192,8 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
 	uint8_t JoyStatus_LCL    = Joystick_GetStatus();

 	uint8_t ButtonStatus_LCL = Buttons_GetStatus();

 

+	KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;

+

 	if (JoyStatus_LCL & JOY_UP)

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

 	else if (JoyStatus_LCL & JOY_DOWN)

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c
index 28a3d407b..1d8b8ff54 100644
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.c
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.c
@@ -266,6 +266,9 @@ void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData)
 	/* Clear the report contents */

 	memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));

 	

+	/* Make sent key uppercase by indicating that the left shift key is pressed */

+	ReportData->Modifier = KEYBOARD_MODIFER_LEFTSHIFT;

+	

 	if (JoyStatus_LCL & JOY_UP)

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

 	else if (JoyStatus_LCL & JOY_DOWN)

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.h b/Demos/Device/LowLevel/Keyboard/Keyboard.h
index 0613a6662..6b29be8c1 100644
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.h
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.h
@@ -54,37 +54,61 @@
 

 	/* Macros: */

 		/** Idle period indicating that reports should be sent only when the inputs have changed */

-		#define HID_IDLE_CHANGESONLY      0

+		#define HID_IDLE_CHANGESONLY        0

 

 		/** HID Class specific request to get the next HID report from the device. */

-		#define REQ_GetReport             0x01

+		#define REQ_GetReport               0x01

 

 		/** HID Class specific request to get the idle timeout period of the device. */

-		#define REQ_GetIdle               0x02

+		#define REQ_GetIdle                 0x02

 

 		/** HID Class specific request to send the next HID report to the device. */

-		#define REQ_SetReport             0x09

+		#define REQ_SetReport               0x09

 

 		/** HID Class specific request to set the idle timeout period of the device. */

-		#define REQ_SetIdle               0x0A

+		#define REQ_SetIdle                 0x0A

 

 		/** HID Class specific request to get the current HID protocol in use, either report or boot. */

-		#define REQ_GetProtocol           0x03

+		#define REQ_GetProtocol             0x03

 

 		/** HID Class specific request to set the current HID protocol in use, either report or boot. */

-		#define REQ_SetProtocol           0x0B

+		#define REQ_SetProtocol             0x0B

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left control key is currently pressed. */

+		#define KEYBOARD_MODIFER_LEFTCTRL   (1 << 0)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left shift key is currently pressed. */

+		#define KEYBOARD_MODIFER_LEFTSHIFT  (1 << 1)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left alt key is currently pressed. */

+		#define KEYBOARD_MODIFER_LEFTALT    (1 << 2)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left GUI key is currently pressed. */

+		#define KEYBOARD_MODIFER_LEFTGUI    (1 << 3)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right control key is currently pressed. */

+		#define KEYBOARD_MODIFER_RIGHTCTRL  (1 << 4)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right shift key is currently pressed. */

+		#define KEYBOARD_MODIFER_RIGHTSHIFT (1 << 5)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right alt key is currently pressed. */

+		#define KEYBOARD_MODIFER_RIGHTALT   (1 << 6)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */

+		#define KEYBOARD_MODIFER_RIGHTGUI   (1 << 7)

 

 		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */

-		#define LEDMASK_USB_NOTREADY      LEDS_LED1

+		#define LEDMASK_USB_NOTREADY        LEDS_LED1

 

 		/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */

-		#define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)

+		#define LEDMASK_USB_ENUMERATING     (LEDS_LED2 | LEDS_LED3)

 

 		/** LED mask for the library LED driver, to indicate that the USB interface is ready. */

-		#define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)

+		#define LEDMASK_USB_READY           (LEDS_LED2 | LEDS_LED4)

 

 		/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */

-		#define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)

+		#define LEDMASK_USB_ERROR           (LEDS_LED1 | LEDS_LED3)

 

 	/* Type Defines: */

 		/** Type define for the keyboard HID report structure, for creating and sending HID reports to the host PC.

diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
index 0247971dc..d6c9b4d11 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
@@ -221,6 +221,9 @@ void Keyboard_HID_Task(void)
 	/* Check if board button is not pressed, if so mouse mode enabled */

 	if (!(Buttons_GetStatus() & BUTTONS_BUTTON1))

 	{

+		/* Make sent key uppercase by indicating that the left shift key is pressed */

+		KeyboardReportData.Modifier = KEYBOARD_MODIFER_LEFTSHIFT;

+

 		if (JoyStatus_LCL & JOY_UP)

 		  KeyboardReportData.KeyCode[0] = 0x04; // A

 		else if (JoyStatus_LCL & JOY_DOWN)

diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h
index ac9e855be..ff2831408 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.h
@@ -49,28 +49,52 @@
 		

 	/* Macros: */

 		/** HID Class specific request to get the next HID report from the device. */

-		#define REQ_GetReport             0x01

+		#define REQ_GetReport               0x01

 

 		/** HID Class specific request to send the next HID report to the device. */

-		#define REQ_SetReport             0x09

+		#define REQ_SetReport               0x09

 

 		/** HID Class specific request to get the current HID protocol in use, either report or boot. */

-		#define REQ_GetProtocol           0x03

+		#define REQ_GetProtocol             0x03

 

 		/** HID Class specific request to set the current HID protocol in use, either report or boot. */

-		#define REQ_SetProtocol           0x0B

+		#define REQ_SetProtocol             0x0B

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left control key is currently pressed. */

+		#define KEYBOARD_MODIFER_LEFTCTRL   (1 << 0)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left shift key is currently pressed. */

+		#define KEYBOARD_MODIFER_LEFTSHIFT  (1 << 1)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left alt key is currently pressed. */

+		#define KEYBOARD_MODIFER_LEFTALT    (1 << 2)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left GUI key is currently pressed. */

+		#define KEYBOARD_MODIFER_LEFTGUI    (1 << 3)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right control key is currently pressed. */

+		#define KEYBOARD_MODIFER_RIGHTCTRL  (1 << 4)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right shift key is currently pressed. */

+		#define KEYBOARD_MODIFER_RIGHTSHIFT (1 << 5)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right alt key is currently pressed. */

+		#define KEYBOARD_MODIFER_RIGHTALT   (1 << 6)

+

+		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */

+		#define KEYBOARD_MODIFER_RIGHTGUI   (1 << 7)

 

 		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */

-		#define LEDMASK_USB_NOTREADY      LEDS_LED1

+		#define LEDMASK_USB_NOTREADY        LEDS_LED1

 

 		/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */

-		#define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)

+		#define LEDMASK_USB_ENUMERATING     (LEDS_LED2 | LEDS_LED3)

 

 		/** LED mask for the library LED driver, to indicate that the USB interface is ready. */

-		#define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)

+		#define LEDMASK_USB_READY           (LEDS_LED2 | LEDS_LED4)

 

 		/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */

-		#define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)

+		#define LEDMASK_USB_ERROR           (LEDS_LED1 | LEDS_LED3)

 		

 	/* Type Defines: */

 		/** Type define for the keyboard HID report structure, for creating and sending HID reports to the host PC.

diff --git a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
index f983d2cf8..a9b5248e4 100644
--- a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
+++ b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
@@ -86,7 +86,7 @@
 			unsigned char _RESERVED1          : 7;

 			unsigned char Removable           : 1;

 			

-			uint8_t      Version;

+			uint8_t       Version;

 			

 			unsigned char ResponseDataFormat  : 4;

 			unsigned char _RESERVED2          : 1;

@@ -94,8 +94,8 @@
 			unsigned char TrmTsk              : 1;

 			unsigned char AERC                : 1;

 

-			uint8_t      AdditionalLength;

-			uint8_t      _RESERVED3[2];

+			uint8_t       AdditionalLength;

+			uint8_t       _RESERVED3[2];

 

 			unsigned char SoftReset           : 1;

 			unsigned char CmdQue              : 1;

@@ -106,9 +106,9 @@
 			unsigned char WideBus32Bit        : 1;

 			unsigned char RelAddr             : 1;

 			

-			uint8_t      VendorID[8];

-			uint8_t      ProductID[16];

-			uint8_t      RevisionID[4];

+			uint8_t       VendorID[8];

+			uint8_t       ProductID[16];

+			uint8_t       RevisionID[4];

 		} SCSI_Inquiry_Response_t;

 		

 		/** Type define for a SCSI sense structure to a SCSI REQUEST SENSE command. For details of the

@@ -126,13 +126,13 @@
 			unsigned char EOM                 : 1;

 			unsigned char FileMark            : 1;

 			

-			uint8_t      Information[4];

-			uint8_t      AdditionalLength;

-			uint8_t      CmdSpecificInformation[4];

-			uint8_t      AdditionalSenseCode;

-			uint8_t      AdditionalSenseQualifier;

-			uint8_t      FieldReplaceableUnitCode;

-			uint8_t      SenseKeySpecific[3];

+			uint8_t       Information[4];

+			uint8_t       AdditionalLength;

+			uint8_t       CmdSpecificInformation[4];

+			uint8_t       AdditionalSenseCode;

+			uint8_t       AdditionalSenseQualifier;

+			uint8_t       FieldReplaceableUnitCode;

+			uint8_t       SenseKeySpecific[3];

 		} SCSI_Request_Sense_Response_t;

 		

 	/* Function Prototypes: */