~ruther/qmk_firmware

f149c07d68c3819e26198f8d4f97857de3a1c78e — Sergey Vlasov 4 years ago 2c92ee1 
Fix KEYBOARD_SHARED_EP incompatibility with VIA (#9930)

The `KEYBOARD_SHARED_EP=yes` option was breaking the VIA support,
because the raw HID interface number in this case was 0 instead of 1,
and the VIA app depends on the exact interface number for raw HID.
Change the interface ordering to put the shared interface before the raw
HID interface if `KEYBOARD_SHARED_EP` is enabled, so that the raw HID
interface can keep its number.
patch browse .tar.gz 
1 files changed, 8 insertions(+), 2 deletions(-)

M tmk_core/protocol/usb_descriptor.h

M tmk_core/protocol/usb_descriptor.h => tmk_core/protocol/usb_descriptor.h +8 -2
@@ 60,6 60,11 @@ typedef struct {
    USB_Descriptor_Interface_t Keyboard_Interface;
    USB_HID_Descriptor_HID_t   Keyboard_HID;
    USB_Descriptor_Endpoint_t  Keyboard_INEndpoint;
#else
    // Shared Interface
    USB_Descriptor_Interface_t Shared_Interface;
    USB_HID_Descriptor_HID_t   Shared_HID;
    USB_Descriptor_Endpoint_t  Shared_INEndpoint;
#endif

#ifdef RAW_ENABLE


@@ 77,7 82,7 @@ typedef struct {
    USB_Descriptor_Endpoint_t  Mouse_INEndpoint;
#endif

#ifdef SHARED_EP_ENABLE
#if defined(SHARED_EP_ENABLE) && !defined(KEYBOARD_SHARED_EP)
    // Shared Interface
    USB_Descriptor_Interface_t Shared_Interface;
    USB_HID_Descriptor_HID_t   Shared_HID;


@@ 139,6 144,7 @@ enum usb_interfaces {
#ifndef KEYBOARD_SHARED_EP
    KEYBOARD_INTERFACE,
#else
    SHARED_INTERFACE,
#    define KEYBOARD_INTERFACE SHARED_INTERFACE
#endif



@@ 153,7 159,7 @@ enum usb_interfaces {
    MOUSE_INTERFACE,
#endif

#ifdef SHARED_EP_ENABLE
#if defined(SHARED_EP_ENABLE) && !defined(KEYBOARD_SHARED_EP)
    SHARED_INTERFACE,
#endif