Fixed shift press bug in keyboard ascii write

remdeskd/www/index.html

@@ -141,6 +141,7 @@
 
         function handleKeyDown(event) {
             event.preventDefault();
+            event.stopImmediatePropagation();
             const key = event.key;
             if (socket){
                 if (key == "Shift" || key == "Control" || key == "Alt"){
@@ -161,6 +162,7 @@
 
         function handleKeyUp(event) {
             event.preventDefault();
+            event.stopImmediatePropagation();
             const key = event.key;
             if (socket) {
                 if (key == "Shift" || key == "Control" || key == "Alt") {

usbkvm/usbkvm_fw/src/remdesHid/USBHIDKeyboardMouse.c

@@ -238,7 +238,8 @@ uint8_t Keyboard_press(__data uint8_t k) {
     }
     if (k &
         0x80) { // it's a capital letter or other character reached with shift
-      HIDKey[0] |= 0x02; // the left shift modifier
+        //Ignore the shift mask as we are emulating a keyboard and it should already have pressed
+        //HIDKey[0] |= 0x02; // the left shift modifier
       k &= 0x7F;
     }
   }
@@ -277,7 +278,8 @@ uint8_t Keyboard_release(__data uint8_t k) {
     }
     if (k &
         0x80) { // it's a capital letter or other character reached with shift
-      HIDKey[0] &= ~(0x02); // the left shift modifier
+      //Commented due to same reason as above
+      //HIDKey[0] &= ~(0x02); // the left shift modifier
       k &= 0x7F;
     }
   }

usbkvm/usbkvm_fw/src/remdesHid/USBconstant.c

@@ -2,24 +2,25 @@
 
 // Device descriptor
 __code USB_Descriptor_Device_t DeviceDescriptor = {
-    .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
+  .Header = { .Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device },
 
-    .USBSpecification = VERSION_BCD(1, 1, 0),
-    .Class = 0x00,
-    .SubClass = 0x00,
-    .Protocol = 0x00,
+  .USBSpecification = VERSION_BCD(1, 1, 0),
+  .Class = 0x00,
+  .SubClass = 0x00,
+  .Protocol = 0x00,
 
-    .Endpoint0Size = DEFAULT_ENDP0_SIZE,
+  .Endpoint0Size = DEFAULT_ENDP0_SIZE,
 
-    .VendorID = 0x1209,
-    .ProductID = 0xc55D,
-    .ReleaseNumber = VERSION_BCD(1, 0, 0),
+  .VendorID = 0x1209,
+  .ProductID = 0xc55D,
+  .ReleaseNumber = VERSION_BCD(1, 0, 0),
 
-    .ManufacturerStrIndex = 1,
-    .ProductStrIndex = 2,
-    .SerialNumStrIndex = 3,
+  .ManufacturerStrIndex = 1,
+  .ProductStrIndex = 2,
+  .SerialNumStrIndex = 3,
 
-    .NumberOfConfigurations = 1};
+  .NumberOfConfigurations = 1
+};
 
 /** Configuration descriptor structure. This descriptor, located in FLASH
  * memory, describes the usage of the device in one of its supported
@@ -29,166 +30,171 @@ __code USB_Descriptor_Device_t DeviceDescriptor = {
  * communicate with the USB device.
  */
 __code USB_Descriptor_Configuration_t ConfigurationDescriptor = {
-    .Config = {.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t),
-                          .Type = DTYPE_Configuration},
+  .Config = { .Header = { .Size = sizeof(USB_Descriptor_Configuration_Header_t),
+                          .Type = DTYPE_Configuration },
+
+              .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
+              .TotalInterfaces = 1,
+
+              .ConfigurationNumber = 1,
+              .ConfigurationStrIndex = NO_DESCRIPTOR,
 
-               .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
-               .TotalInterfaces = 1,
+              .ConfigAttributes = (USB_CONFIG_ATTR_RESERVED),
 
-               .ConfigurationNumber = 1,
-               .ConfigurationStrIndex = NO_DESCRIPTOR,
+              .MaxPowerConsumption = USB_CONFIG_POWER_MA(200) },
 
-               .ConfigAttributes = (USB_CONFIG_ATTR_RESERVED),
+  .HID_Interface = { .Header = { .Size = sizeof(USB_Descriptor_Interface_t),
+                                 .Type = DTYPE_Interface },
 
-               .MaxPowerConsumption = USB_CONFIG_POWER_MA(200)},
+                     .InterfaceNumber = 0,
+                     .AlternateSetting = 0x00,
 
-    .HID_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t),
-                                 .Type = DTYPE_Interface},
+                     .TotalEndpoints = 2,
 
-                      .InterfaceNumber = 0,
-                      .AlternateSetting = 0x00,
+                     .Class = HID_CSCP_HIDClass,
+                     .SubClass = HID_CSCP_BootSubclass,
+                     .Protocol = HID_CSCP_KeyboardBootProtocol,
 
-                      .TotalEndpoints = 2,
+                     .InterfaceStrIndex = NO_DESCRIPTOR },
 
-                      .Class = HID_CSCP_HIDClass,
-                      .SubClass = HID_CSCP_BootSubclass,
-                      .Protocol = HID_CSCP_KeyboardBootProtocol,
+  .HID_KeyboardHID = { .Header = { .Size = sizeof(USB_HID_Descriptor_HID_t),
+                                   .Type = HID_DTYPE_HID },
 
-                      .InterfaceStrIndex = NO_DESCRIPTOR},
+                       .HIDSpec = VERSION_BCD(1, 1, 0),
+                       .CountryCode = 0x00,
+                       .TotalReportDescriptors = 1,
+                       .HIDReportType = HID_DTYPE_Report,
+                       .HIDReportLength = sizeof(ReportDescriptor) },
 
-    .HID_KeyboardHID = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t),
-                                   .Type = HID_DTYPE_HID},
+  .HID_ReportINEndpoint = { .Header = { .Size =
+                                          sizeof(USB_Descriptor_Endpoint_t),
+                                        .Type = DTYPE_Endpoint },
 
-                        .HIDSpec = VERSION_BCD(1, 1, 0),
-                        .CountryCode = 0x00,
-                        .TotalReportDescriptors = 1,
-                        .HIDReportType = HID_DTYPE_Report,
-                        .HIDReportLength = sizeof(ReportDescriptor)},
+                            .EndpointAddress = KEYBOARD_EPADDR,
+                            .Attributes =
+                              (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+                            .EndpointSize = KEYBOARD_MOUSE_EPSIZE,
+                            .PollingIntervalMS = 10 },
 
-    .HID_ReportINEndpoint = {.Header = {.Size =
-                                            sizeof(USB_Descriptor_Endpoint_t),
-                                        .Type = DTYPE_Endpoint},
+  .HID_ReportOUTEndpoint = { .Header = { .Size =
+                                           sizeof(USB_Descriptor_Endpoint_t),
+                                         .Type = DTYPE_Endpoint },
 
-                             .EndpointAddress = KEYBOARD_EPADDR,
+                             .EndpointAddress = KEYBOARD_LED_EPADDR,
                              .Attributes =
-                                 (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC |
-                                  ENDPOINT_USAGE_DATA),
+                               (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                              .EndpointSize = KEYBOARD_MOUSE_EPSIZE,
-                             .PollingIntervalMS = 10},
-
-    .HID_ReportOUTEndpoint = {.Header = {.Size =
-                                             sizeof(USB_Descriptor_Endpoint_t),
-                                         .Type = DTYPE_Endpoint},
-
-                              .EndpointAddress = KEYBOARD_LED_EPADDR,
-                              .Attributes =
-                                  (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC |
-                                   ENDPOINT_USAGE_DATA),
-                              .EndpointSize = KEYBOARD_MOUSE_EPSIZE,
-                              .PollingIntervalMS = 10},
+                             .PollingIntervalMS = 10 },
 };
 
 __code uint8_t ReportDescriptor[] = {
-    0x05, 0x01,       // USAGE_PAGE (Generic Desktop)
-    0x09, 0x06,       // USAGE (Keyboard)
-    0xa1, 0x01,       // COLLECTION (Application)
-    0x85, 0x01,       //   REPORT_ID (1)
-    0x05, 0x07,       //   USAGE_PAGE (Keyboard)
-    0x19, 0xe0,       //   USAGE_MINIMUM (Keyboard LeftControl)
-    0x29, 0xe7,       //   USAGE_MAXIMUM (Keyboard Right GUI)
-    0x15, 0x00,       //   LOGICAL_MINIMUM (0)
-    0x25, 0x01,       //   LOGICAL_MAXIMUM (1)
-    0x95, 0x08,       //   REPORT_COUNT (8)
-    0x75, 0x01,       //   REPORT_SIZE (1)
-    0x81, 0x02,       //   INPUT (Data,Var,Abs)
-    0x95, 0x01,       //   REPORT_COUNT (1)
-    0x75, 0x08,       //   REPORT_SIZE (8)
-    0x81, 0x03,       //   INPUT (Cnst,Var,Abs)
-    0x95, 0x06,       //   REPORT_COUNT (6)
-    0x75, 0x08,       //   REPORT_SIZE (8)
-    0x15, 0x00,       //   LOGICAL_MINIMUM (0)
-    0x26, 0xff, 0x00, //   LOGICAL_MAXIMUM (255)
-    0x05, 0x07,       //   USAGE_PAGE (Keyboard)
-    0x19, 0x00,       //   USAGE_MINIMUM (Reserved (no event indicated))
-    0x29, 0xe7,       //   USAGE_MAXIMUM (Keyboard Right GUI)
-    0x81, 0x00,       //   INPUT (Data,Ary,Abs)
-    0x05, 0x08,       //   USAGE_PAGE (LEDs)
-    0x19, 0x01,       //   USAGE_MINIMUM (Num Lock)
-    0x29, 0x05,       //   USAGE_MAXIMUM (Kana)
-    0x15, 0x00,       //   LOGICAL_MINIMUM (0)
-    0x25, 0x01,       //   LOGICAL_MAXIMUM (1)
-    0x95, 0x05,       //   REPORT_COUNT (5)
-    0x75, 0x01,       //   REPORT_SIZE (1)
-    0x91, 0x02,       //   OUTPUT (Data,Var,Abs)
-    0x95, 0x01,       //   REPORT_COUNT (1)
-    0x75, 0x03,       //   REPORT_SIZE (3)
-    0x91, 0x03,       //   OUTPUT (Cnst,Var,Abs)
-    0xc0,             // END_COLLECTION
-    0x05, 0x01,       // USAGE_PAGE (Generic Desktop)
-    0x09, 0x02,       // USAGE (Mouse)
-    0xa1, 0x01,       // COLLECTION (Application)
-    0x09, 0x01,       //   USAGE (Pointer)
-    0xa1, 0x00,       //   COLLECTION (Physical)
-    0x85, 0x02,       //   REPORT_ID (2)
-    0x05, 0x09,       //     USAGE_PAGE (Button)
-    0x19, 0x01,       //     USAGE_MINIMUM (Button 1)
-    0x29, 0x03,       //     USAGE_MAXIMUM (Button 3)
-    0x15, 0x00,       //     LOGICAL_MINIMUM (0)
-    0x25, 0x01,       //     LOGICAL_MAXIMUM (1)
-    0x95, 0x03,       //     REPORT_COUNT (3)
-    0x75, 0x01,       //     REPORT_SIZE (1)
-    0x81, 0x02,       //     INPUT (Data,Var,Abs)
-    0x95, 0x01,       //     REPORT_COUNT (1)
-    0x75, 0x05,       //     REPORT_SIZE (5)
-    0x81, 0x03,       //     INPUT (Cnst,Var,Abs)
-    0x05, 0x01,       //     USAGE_PAGE (Generic Desktop)
-    0x09, 0x30,       //     USAGE (X)
-    0x09, 0x31,       //     USAGE (Y)
-    0x09, 0x38,       //     USAGE (Wheel)
-    0x15, 0x81,       //     LOGICAL_MINIMUM (-127)
-    0x25, 0x7f,       //     LOGICAL_MAXIMUM (127)
-    0x75, 0x08,       //     REPORT_SIZE (8)
-    0x95, 0x03,       //     REPORT_COUNT (3)
-    0x81, 0x06,       //     INPUT (Data,Var,Rel)
-    0xc0,             //     END_COLLECTION
-    0xc0              // END_COLLECTION
+  0x05, 0x01,        // USAGE_PAGE (Generic Desktop)
+  0x09, 0x06,        // USAGE (Keyboard)
+  0xa1, 0x01,        // COLLECTION (Application)
+  0x85, 0x01,        //   REPORT_ID (1)
+  0x05, 0x07,        //   USAGE_PAGE (Keyboard)
+  0x19, 0xe0,        //   USAGE_MINIMUM (Keyboard LeftControl)
+  0x29, 0xe7,        //   USAGE_MAXIMUM (Keyboard Right GUI)
+  0x15, 0x00,        //   LOGICAL_MINIMUM (0)
+  0x25, 0x01,        //   LOGICAL_MAXIMUM (1)
+  0x95, 0x08,        //   REPORT_COUNT (8)
+  0x75, 0x01,        //   REPORT_SIZE (1)
+  0x81, 0x02,        //   INPUT (Data,Var,Abs)
+  0x95, 0x01,        //   REPORT_COUNT (1)
+  0x75, 0x08,        //   REPORT_SIZE (8)
+  0x81, 0x03,        //   INPUT (Cnst,Var,Abs)
+  0x95, 0x06,        //   REPORT_COUNT (6)
+  0x75, 0x08,        //   REPORT_SIZE (8)
+  0x15, 0x00,        //   LOGICAL_MINIMUM (0)
+  0x26, 0xff, 0x00,  //   LOGICAL_MAXIMUM (255)
+  0x05, 0x07,        //   USAGE_PAGE (Keyboard)
+  0x19, 0x00,        //   USAGE_MINIMUM (Reserved (no event indicated))
+  0x29, 0xe7,        //   USAGE_MAXIMUM (Keyboard Right GUI)
+  0x81, 0x00,        //   INPUT (Data,Ary,Abs)
+  0x05, 0x08,        //   USAGE_PAGE (LEDs)
+  0x19, 0x01,        //   USAGE_MINIMUM (Num Lock)
+  0x29, 0x05,        //   USAGE_MAXIMUM (Kana)
+  0x15, 0x00,        //   LOGICAL_MINIMUM (0)
+  0x25, 0x01,        //   LOGICAL_MAXIMUM (1)
+  0x95, 0x05,        //   REPORT_COUNT (5)
+  0x75, 0x01,        //   REPORT_SIZE (1)
+  0x91, 0x02,        //   OUTPUT (Data,Var,Abs)
+  0x95, 0x01,        //   REPORT_COUNT (1)
+  0x75, 0x03,        //   REPORT_SIZE (3)
+  0x91, 0x03,        //   OUTPUT (Cnst,Var,Abs)
+  0xc0,              // END_COLLECTION
+  0x05, 0x01,        // USAGE_PAGE (Generic Desktop)
+  0x09, 0x02,        // USAGE (Mouse)
+  0xa1, 0x01,        // COLLECTION (Application)
+  0x09, 0x01,        //   USAGE (Pointer)
+  0xa1, 0x00,        //   COLLECTION (Physical)
+  0x85, 0x02,        //   REPORT_ID (2)
+  0x05, 0x09,        //     USAGE_PAGE (Button)
+  0x19, 0x01,        //     USAGE_MINIMUM (Button 1)
+  0x29, 0x03,        //     USAGE_MAXIMUM (Button 3)
+  0x15, 0x00,        //     LOGICAL_MINIMUM (0)
+  0x25, 0x01,        //     LOGICAL_MAXIMUM (1)
+  0x95, 0x03,        //     REPORT_COUNT (3)
+  0x75, 0x01,        //     REPORT_SIZE (1)
+  0x81, 0x02,        //     INPUT (Data,Var,Abs)
+  0x95, 0x01,        //     REPORT_COUNT (1)
+  0x75, 0x05,        //     REPORT_SIZE (5)
+  0x81, 0x03,        //     INPUT (Cnst,Var,Abs)
+  0x05, 0x01,        //     USAGE_PAGE (Generic Desktop)
+  0x09, 0x30,        //     USAGE (X)
+  0x09, 0x31,        //     USAGE (Y)
+  0x09, 0x38,        //     USAGE (Wheel)
+  0x15, 0x81,        //     LOGICAL_MINIMUM (-127)
+  0x25, 0x7f,        //     LOGICAL_MAXIMUM (127)
+  0x75, 0x08,        //     REPORT_SIZE (8)
+  0x95, 0x03,        //     REPORT_COUNT (3)
+  0x81, 0x06,        //     INPUT (Data,Var,Rel)
+  0xc0,              //     END_COLLECTION
+  0xc0               // END_COLLECTION
 };
 
 // String Descriptors
-__code uint8_t LanguageDescriptor[] = {0x04, 0x03, 0x09,
-                                       0x04}; // Language Descriptor
+__code uint8_t LanguageDescriptor[] = { 0x04, 0x03, 0x09,
+                                        0x04 };  // Language Descriptor
 __code uint16_t SerialDescriptor[] = {
-    // Serial String Descriptor
-    (((13 + 1) * 2) | (DTYPE_String << 8)),
-    'C',
-    'H',
-    '5',
-    '5',
-    'x',
-    ' ',
-    'k',
-    'b',
-    'd',
-    ' ',
-    'm',
-    'o',
-    's',
+  // Serial String Descriptor
+  (((13 + 1) * 2) | (DTYPE_String << 8)),
+  'R',
+  'e',
+  'm',
+  'd',
+  'e',
+  's',
+  'K',
+  'V',
+  'M',
+  ' ',
+  'U',
+  'S',
+  'B',
 };
 __code uint16_t ProductDescriptor[] = {
-    // Produce String Descriptor
-    (((10 + 1) * 2) | (DTYPE_String << 8)),
-    'C',
-    'H',
-    '5',
-    '5',
-    'x',
-    'd',
-    'u',
-    'i',
-    'n',
-    'o',
+  // Produce String Descriptor
+  (((10 + 1) * 2) | (DTYPE_String << 8)),
+  'R',
+  'E',
+  'M',
+  'D',
+  'E',
+  'S',
+  ' ',
+  'K',
+  'V',
+  'M',
 };
 __code uint16_t ManufacturerDescriptor[] = {
-    // SDCC is little endian
-    (((6 + 1) * 2) | (DTYPE_String << 8)), 'D', 'e', 'q', 'i', 'n', 'g',
+  // SDCC is little endian
+  (((7 + 1) * 2) | (DTYPE_String << 8)),
+  'i',
+  'm',
+  'u',
+  's',
+  'l',
+  'a',
+  'b',
 };