diff --git a/Controllers/WootingKeyboardController/WootingKeyboardController.cpp b/Controllers/WootingKeyboardController/WootingKeyboardController.cpp index ed2786390..29407be4d 100644 --- a/Controllers/WootingKeyboardController/WootingKeyboardController.cpp +++ b/Controllers/WootingKeyboardController/WootingKeyboardController.cpp @@ -128,9 +128,8 @@ void WootingKeyboardController::SendDirect(RGBColor* colors, unsigned int num_co void WootingKeyboardController::SendInitialize() { wooting_usb_send_feature(WOOTING_COLOR_INIT_COMMAND, 0,0,0,0); - unsigned char stub = 0; - hid_read(dev, &stub, 0); - hid_read_timeout(dev, &stub, 0, 50); + + std::this_thread::sleep_for(std::chrono::milliseconds(50)); } bool WootingKeyboardController::wooting_usb_send_feature(uint8_t commandId, uint8_t parameter0, uint8_t parameter1, uint8_t parameter2, uint8_t parameter3) diff --git a/Controllers/WootingKeyboardController/WootingKeyboardControllerDetect.cpp b/Controllers/WootingKeyboardController/WootingKeyboardControllerDetect.cpp index f357fc500..ff15c1405 100644 --- a/Controllers/WootingKeyboardController/WootingKeyboardControllerDetect.cpp +++ b/Controllers/WootingKeyboardController/WootingKeyboardControllerDetect.cpp @@ -8,13 +8,16 @@ /*-----------------------------------------------------*\ | Wooting vendor ID | \*-----------------------------------------------------*/ -#define WOOTING_VID 0x03EB +#define WOOTING_OLD_VID 0x03EB +#define WOOTING_NEW_VID 0x31E3 /*-----------------------------------------------------*\ | Keyboard product IDs | \*-----------------------------------------------------*/ -#define WOOTING_ONE_PID 0xFF01 -#define WOOTING_TWO_PID 0xFF02 +#define WOOTING_ONE_PID 0xFF01 +#define WOOTING_TWO_PID 0xFF02 +#define WOOTING_TWO_LE_PID 0x1210 +#define WOOTING_TWO_HE_PID 0x1220 typedef struct { @@ -30,8 +33,10 @@ static const wooting_device device_list[] = /*-----------------------------------------------------------------------*\ | Keyboards | \*-----------------------------------------------------------------------*/ - { WOOTING_VID, WOOTING_ONE_PID, "Wooting One" }, -// { WOOTING_VID, WOOTING_TWO_PID, "Wooting Two" }, + { WOOTING_OLD_VID, WOOTING_ONE_PID, "Wooting One" }, + { WOOTING_OLD_VID, WOOTING_TWO_PID, "Wooting Two" }, + { WOOTING_NEW_VID, WOOTING_TWO_LE_PID, "Wooting Two LE" }, + { WOOTING_NEW_VID, WOOTING_TWO_HE_PID, "Wooting Two HE" }, }; /******************************************************************************************\