Changeset 8d96947 in avrstuff for kbd/pcw2hid/code/Descriptors.c

Timestamp:

Feb 7, 2023, 9:03:10 PM (16 months ago)

Author:

PulkoMandy <pulkomandy@…>

Branches:

main

Children:

88a38a8

Parents:

110c692

Message:

More untested code for PCW to HID keyboard adapter

• Use VOTI shared keyboard ID
• Use standard keyboard descriptor from LUFA demo
• Don't scan past row 10 of the PCW keyboard (we don't need more)
• Convert PCW keys to (roughly) corresponding USB HID keycodes

TODO:

• If shift is pressed, maybe convert f1/3/5/7 to f2/4/6/8
• Some keys (ab)use F2/4/6/8 keycodes, move them to F9-F12 instead
• Some keys use "unusual" keycodes (cancel, stop), maybe move to more common ones

File:

• kbd/pcw2hid/code/Descriptors.c (modified) (7 diffs)

kbd/pcw2hid/code/Descriptors.c

@@ -44 +44 @@
  *  more details on HID report descriptors.
  */
-const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
-{
-                        HID_RI_USAGE_PAGE(8, 0x01),
-                        HID_RI_USAGE(8, 0x04),
-                        HID_RI_COLLECTION(8, 0x01),
-
-                                0x85, 0x01, // Report ID 1
-
-                                // 15 constant bytes
-                                HID_RI_REPORT_SIZE(8, 15),
-                                HID_RI_REPORT_COUNT(8, 0x01),
-                                HID_RI_INPUT(8, HID_IOF_CONSTANT),
-
-                                HID_RI_USAGE_PAGE(8, 0x09),
-                                HID_RI_LOGICAL_MINIMUM(8, 0x00),
-                                HID_RI_LOGICAL_MAXIMUM(8, 0x01),
-
-                                HID_RI_USAGE_MINIMUM(8, 7),
-                                HID_RI_USAGE_MAXIMUM(8, 9),
-                                HID_RI_USAGE(8, 4),
-                                HID_RI_REPORT_SIZE(8, 0x01),
-                                HID_RI_REPORT_COUNT(8, 4),
-                                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-                                HID_RI_REPORT_SIZE(8, 1),
-                                HID_RI_REPORT_COUNT(8, 0x01),
-                                HID_RI_INPUT(8, HID_IOF_CONSTANT),
-
-                                HID_RI_USAGE(8, 10),
-                                HID_RI_USAGE_MINIMUM(8, 1),
-                                HID_RI_USAGE_MAXIMUM(8, 3),
-                                HID_RI_REPORT_SIZE(8, 0x01),
-                                HID_RI_REPORT_COUNT(8, 4),
-                                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-                                HID_RI_REPORT_SIZE(8, 1),
-                                HID_RI_REPORT_COUNT(8, 0x01),
-                                HID_RI_INPUT(8, HID_IOF_CONSTANT),
-
-                                HID_RI_USAGE_MINIMUM(8, 5),
-                                HID_RI_USAGE_MAXIMUM(8, 6),
-                                HID_RI_REPORT_SIZE(8, 0x01),
-                                HID_RI_REPORT_COUNT(8, 2),
-                                HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-                                HID_RI_USAGE_PAGE(8, 0x01),
-                                HID_RI_USAGE(8, 0x01),
-                                HID_RI_COLLECTION(8, 0x00),
-                                        HID_RI_USAGE(8, 0x31),
-                                        HID_RI_LOGICAL_MINIMUM(8, -2),
-                                        HID_RI_LOGICAL_MAXIMUM(8, 1),
-                                        HID_RI_REPORT_COUNT(8, 1),
-                                        HID_RI_REPORT_SIZE(8, 2),
-                                        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-
-                                        HID_RI_REPORT_SIZE(8, 1),
-                                        HID_RI_REPORT_COUNT(8, 0x01),
-                                        HID_RI_INPUT(8, HID_IOF_CONSTANT),
-
-                                        HID_RI_USAGE(8, 0x30),
-                                        HID_RI_LOGICAL_MINIMUM(8, -2),
-                                        HID_RI_LOGICAL_MAXIMUM(8, 1),
-                                        HID_RI_REPORT_COUNT(8, 1),
-                                        HID_RI_REPORT_SIZE(8, 2),
-                                        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
-                                HID_RI_END_COLLECTION(0),
-
-                        HID_RI_END_COLLECTION(0)
+const USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] =
+{
+        /* Use the HID class driver's standard Keyboard report.
+         *   Max simultaneous keys: 6
+         */
+        HID_DESCRIPTOR_KEYBOARD(6)
 };
 
@@ -131 +69 @@
 
         .VendorID               = 0x16c0,
-        .ProductID              = 0x27dc,
+        .ProductID              = 0x27db,
         .ReleaseNumber          = VERSION_BCD(0,0,1),
 
@@ -167 +105 @@
                         .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
-                        .InterfaceNumber        = INTERFACE_ID_Joystick,
+                        .InterfaceNumber        = INTERFACE_ID_Keyboard,
                         .AlternateSetting       = 0x00,
 
@@ -173 +111 @@
 
                         .Class                  = HID_CSCP_HIDClass,
-                        .SubClass               = HID_CSCP_NonBootSubclass,
-                        .Protocol               = HID_CSCP_NonBootProtocol,
+                        .SubClass               = HID_CSCP_BootSubclass,
+                        .Protocol               = HID_CSCP_KeyboardBootProtocol,
 
                         .InterfaceStrIndex      = NO_DESCRIPTOR
                 },
 
-        .HID_JoystickHID =
+        .HID_KeyboardHID =
                 {
                         .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
@@ -187 +125 @@
                         .TotalReportDescriptors = 1,
                         .HIDReportType          = HID_DTYPE_Report,
-                        .HIDReportLength        = sizeof(JoystickReport)
+                        .HIDReportLength        = sizeof(KeyboardReport)
                 },
 
@@ -194 +132 @@
                         .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
-                        .EndpointAddress        = JOYSTICK_EPADDR,
+                        .EndpointAddress        = KEYBOARD_EPADDR,
                         .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
-                        .EndpointSize           = JOYSTICK_EPSIZE,
+                        .EndpointSize           = KEYBOARD_EPSIZE,
                         .PollingIntervalMS      = 0x05
                 }
@@ -264 +202 @@
                         break;
                 case HID_DTYPE_HID:
-                        Address = &ConfigurationDescriptor.HID_JoystickHID;
+                        Address = &ConfigurationDescriptor.HID_KeyboardHID;
                         Size    = sizeof(USB_HID_Descriptor_HID_t);
                         break;
                 case HID_DTYPE_Report:
-                        Address = &JoystickReport;
-                        Size    = sizeof(JoystickReport);
+                        Address = &KeyboardReport;
+                        Size    = sizeof(KeyboardReport);
                         break;
         }