Skip to content

Commit 62906e7

Browse files
ShayBoxCalcProgrammer1
authored andcommitted
Add Wooting LE & HE and fix Wooting initialization on Linux
Commits squashed and amended to remove commented code by Adam Honse <calcprogrammer1@gmail.com>
1 parent efb19ab commit 62906e7

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

Controllers/WootingKeyboardController/WootingKeyboardController.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,8 @@ void WootingKeyboardController::SendDirect(RGBColor* colors, unsigned int num_co
128128
void WootingKeyboardController::SendInitialize()
129129
{
130130
wooting_usb_send_feature(WOOTING_COLOR_INIT_COMMAND, 0,0,0,0);
131-
unsigned char stub = 0;
132-
hid_read(dev, &stub, 0);
133-
hid_read_timeout(dev, &stub, 0, 50);
131+
132+
std::this_thread::sleep_for(std::chrono::milliseconds(50));
134133
}
135134

136135
bool WootingKeyboardController::wooting_usb_send_feature(uint8_t commandId, uint8_t parameter0, uint8_t parameter1, uint8_t parameter2, uint8_t parameter3)

Controllers/WootingKeyboardController/WootingKeyboardControllerDetect.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
/*-----------------------------------------------------*\
99
| Wooting vendor ID |
1010
\*-----------------------------------------------------*/
11-
#define WOOTING_VID 0x03EB
11+
#define WOOTING_OLD_VID 0x03EB
12+
#define WOOTING_NEW_VID 0x31E3
1213

1314
/*-----------------------------------------------------*\
1415
| Keyboard product IDs |
1516
\*-----------------------------------------------------*/
16-
#define WOOTING_ONE_PID 0xFF01
17-
#define WOOTING_TWO_PID 0xFF02
17+
#define WOOTING_ONE_PID 0xFF01
18+
#define WOOTING_TWO_PID 0xFF02
19+
#define WOOTING_TWO_LE_PID 0x1210
20+
#define WOOTING_TWO_HE_PID 0x1220
1821

1922
typedef struct
2023
{
@@ -30,8 +33,10 @@ static const wooting_device device_list[] =
3033
/*-----------------------------------------------------------------------*\
3134
| Keyboards |
3235
\*-----------------------------------------------------------------------*/
33-
{ WOOTING_VID, WOOTING_ONE_PID, "Wooting One" },
34-
// { WOOTING_VID, WOOTING_TWO_PID, "Wooting Two" },
36+
{ WOOTING_OLD_VID, WOOTING_ONE_PID, "Wooting One" },
37+
{ WOOTING_OLD_VID, WOOTING_TWO_PID, "Wooting Two" },
38+
{ WOOTING_NEW_VID, WOOTING_TWO_LE_PID, "Wooting Two LE" },
39+
{ WOOTING_NEW_VID, WOOTING_TWO_HE_PID, "Wooting Two HE" },
3540
};
3641

3742
/******************************************************************************************\

0 commit comments

Comments
 (0)