X-Git-Url: https://git.donarmstrong.com/?p=kiibohd-controller.git;a=blobdiff_plain;f=Output%2FpjrcUSB%2Farm%2Fusb_desc.c;h=b0be2a0c6aa8e5cd5fab6e1fbe773d68e52eda73;hp=02ffd5da224bdea56379570425a38a5b5ee18b77;hb=18aef02a1feaf1e3f49085cc82e36221039530b4;hpb=3c9a97d51a2f3b94168e46ff1524ceec63703eff diff --git a/Output/pjrcUSB/arm/usb_desc.c b/Output/pjrcUSB/arm/usb_desc.c index 02ffd5d..b0be2a0 100644 --- a/Output/pjrcUSB/arm/usb_desc.c +++ b/Output/pjrcUSB/arm/usb_desc.c @@ -309,32 +309,33 @@ static uint8_t sys_ctrl_report_desc[] = { static uint8_t mouse_report_desc[] = { 0x05, 0x01, // Usage Page (Generic Desktop) 0x09, 0x02, // Usage (Mouse) - 0xa1, 0x01, // Collection (Application) + 0xA1, 0x01, // Collection (Application) 0x09, 0x02, // Usage (Mouse) - 0xa1, 0x02, // Collection (Logical) + 0xA1, 0x02, // Collection (Logical) 0x09, 0x01, // Usage (Pointer) - // Buttons (8 bits) - 0xa1, 0x00, // Collection (Physical) - Buttons + // Buttons (16 bits) + 0xA1, 0x00, // Collection (Physical) - Buttons 0x05, 0x09, // Usage Page (Button) 0x19, 0x01, // Usage Minimum (Button 1) - 0x29, 0x08, // Usage Maximum (Button 8) + 0x29, 0x10, // Usage Maximum (Button 16) 0x15, 0x00, // Logical Minimum (0) 0x25, 0x01, // Logical Maximum (1) 0x75, 0x01, // Report Size (1) - 0x95, 0x08, // Report Count (8) + 0x95, 0x10, // Report Count (16) 0x81, 0x02, // Input (Data,Var,Abs) - // Pointer (16 bits) + // Pointer (32 bits) 0x05, 0x01, // Usage PAGE (Generic Desktop) 0x09, 0x30, // Usage (X) 0x09, 0x31, // Usage (Y) - 0x15, 0x81, // Logical Minimum (-127) - 0x25, 0x7f, // Logical Maximum (127) - 0x75, 0x08, // Report Size (8) + 0x16, 0x01, 0x80, // Logical Minimum (-32 767) + 0x26, 0xFF, 0x7F, // Logical Maximum (32 767) + 0x75, 0x10, // Report Size (16) 0x95, 0x02, // Report Count (2) 0x81, 0x06, // Input (Data,Var,Rel) + /* // Vertical Wheel // - Multiplier (2 bits) 0xa1, 0x02, // Collection (Logical) @@ -377,6 +378,7 @@ static uint8_t mouse_report_desc[] = { 0x81, 0x06, // Input (Data,Var,Rel) 0xc0, // End Collection - Horizontal Wheel + */ 0xc0, // End Collection - Buttons 0xc0, // End Collection - Mouse Logical 0xc0 // End Collection - Mouse Application