jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Wooting 80HE support

Browse source
This commit is contained in:
4rcheria 2025-04-04 21:58:29 +02:00
parent acca2baa57
commit a2330fea6a
4 changed files with 141 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

128
Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp
View file

@ -27,6 +27,16 @@ static unsigned int matrix_map_tkl[6][17] =
{ 5, 11, 17, NA, NA, NA, 41, NA, NA, NA, 65, 71, 77, 83, 89, 95, 101}
};
static unsigned int matrix_map_80HE[6][17] =
{
{ 0, 6, 12, 18, 24, 30, 36, 42, 48, NA, 60, 66, 72, 78, 84, 90, 100},
{ 1, 7, 13, 19, 25, 31, 37, 43, 49, 55, 61, 67, 73, 79, 85, 91, 97},
{ 2, 8, 14, 20, 26, 32, 38, 44, 50, 56, 62, 68, 74, 80, 86, 92, 98},
{ 3, 9, 15, 21, 27, 33, 39, 45, 51, 57, 63, 69, 75, 81, 87, NA, NA},
{ 4, 10, 16, 22, 28, 34, 40, 46, 52, 58, 64, 70, NA, 82, 88, 94, NA},
{ 5, 11, 17, NA, NA, NA, 41, NA, NA, NA, 65, 71, 77, NA, 89, 95, 101}
};
static unsigned int matrix_map_full[6][21] =
{
{ 0, NA, 12, 18, 24, 30, 36, 42, 48, 54, 60, 66, 72, 78, 84, 90, 100, 102, 108, 114, 120},
@ -40,10 +50,11 @@ static unsigned int matrix_map_full[6][21] =
static const unsigned int zone_sizes[] =
{
102,
126
126,
102
};
static const char *led_names[] =
static const char *led_names_default[] =
{
KEY_EN_ESCAPE,
KEY_EN_BACK_TICK,
@ -173,6 +184,112 @@ static const char *led_names[] =
KEY_EN_UNUSED
};
static const char *led_names_80HE[] =
{
KEY_EN_ESCAPE,
KEY_EN_BACK_TICK,
KEY_EN_TAB,
KEY_EN_CAPS_LOCK,
KEY_EN_LEFT_SHIFT,
KEY_EN_LEFT_CONTROL,
KEY_EN_F1,
KEY_EN_1,
KEY_EN_Q,
KEY_EN_A,
KEY_EN_ISO_BACK_SLASH, //iso key - 10
KEY_EN_LEFT_WINDOWS,
KEY_EN_F2,
KEY_EN_2,
KEY_EN_W,
KEY_EN_S,
KEY_EN_Z,
KEY_EN_LEFT_ALT,
KEY_EN_F3,
KEY_EN_3,
KEY_EN_E, //20
KEY_EN_D,
KEY_EN_X,
KEY_EN_UNUSED, //space
KEY_EN_F4,
KEY_EN_4,
KEY_EN_R,
KEY_EN_F,
KEY_EN_C,
KEY_EN_UNUSED, //space
KEY_EN_F5, //30
KEY_EN_5,
KEY_EN_T,
KEY_EN_G,
KEY_EN_V,
KEY_EN_UNUSED, //space
KEY_EN_F6,
KEY_EN_6,
KEY_EN_Y,
KEY_EN_H,
KEY_EN_B, //40
KEY_EN_SPACE,
KEY_EN_F7,
KEY_EN_7,
KEY_EN_U,
KEY_EN_J,
KEY_EN_N,
KEY_EN_UNUSED, //space
KEY_EN_F8,
KEY_EN_8,
KEY_EN_I, //50
KEY_EN_K,
KEY_EN_M,
KEY_EN_UNUSED, //space
KEY_EN_UNUSED,
KEY_EN_9,
KEY_EN_O,
KEY_EN_L,
KEY_EN_COMMA,
KEY_EN_UNUSED, //space
KEY_EN_F9, //60
KEY_EN_0,
KEY_EN_P,
KEY_EN_SEMICOLON,
KEY_EN_PERIOD,
KEY_EN_RIGHT_ALT,
KEY_EN_F10,
KEY_EN_MINUS,
KEY_EN_LEFT_BRACKET,
KEY_EN_QUOTE,
KEY_EN_FORWARD_SLASH, //70
KEY_EN_RIGHT_WINDOWS,
KEY_EN_F11,
KEY_EN_EQUALS,
KEY_EN_RIGHT_BRACKET,
KEY_EN_POUND, //iso only
KEY_EN_UNUSED,
KEY_EN_RIGHT_FUNCTION,
KEY_EN_F12,
KEY_EN_UNUSED,
KEY_EN_ANSI_BACK_SLASH, //80
KEY_EN_UNUSED,
KEY_EN_UNUSED,
KEY_EN_RIGHT_CONTROL,
"Key: Mode",
KEY_EN_BACKSPACE,
KEY_EN_UNUSED,
KEY_EN_ANSI_ENTER,
KEY_EN_RIGHT_SHIFT,
KEY_EN_LEFT_ARROW,
KEY_EN_PRINT_SCREEN, //90
KEY_EN_HOME,
KEY_EN_END,
KEY_EN_UNUSED,
KEY_EN_UP_ARROW,
KEY_EN_DOWN_ARROW,
KEY_EN_UNUSED,
KEY_EN_PAGE_UP,
KEY_EN_PAGE_DOWN,
KEY_EN_UNUSED,
KEY_EN_PAUSE_BREAK, //100 - Scroll lock for WootingTwo KB's
KEY_EN_RIGHT_ARROW
};
/**------------------------------------------------------------------*\
@name Wooting Keyboards
@category Keyboard
@ -247,6 +364,11 @@ void RGBController_WootingKeyboard::SetupZones()
new_zone.matrix_map->width = WOOTING_ONE_RGB_COLUMNS;
new_zone.matrix_map->map = (unsigned int *)&matrix_map_tkl;
}
else if(wooting_type == WOOTING_80HE)
{
new_zone.matrix_map->width = WOOTING_ONE_RGB_COLUMNS;
new_zone.matrix_map->map = (unsigned int *)&matrix_map_80HE;
}
else
{
new_zone.matrix_map->width = WOOTING_TWO_RGB_COLUMNS;
@ -256,6 +378,8 @@ void RGBController_WootingKeyboard::SetupZones()
zones.push_back(new_zone);
LOG_DEBUG("%sCreating LED array - total_led_count %03i", WOOTING_CONTROLLER_NAME, total_led_count);
static const char **led_names = (wooting_type == WOOTING_80HE) ? led_names_80HE : led_names_default;
for (unsigned int led_idx = 0; led_idx < total_led_count; led_idx++)
{
led new_led;

3
Controllers/WootingKeyboardController/WootingKeyboardController.h
View file

@ -40,7 +40,8 @@
enum WOOTING_DEVICE_TYPE
{
WOOTING_KB_TKL = 0,
WOOTING_KB_FULL = 1
WOOTING_KB_FULL = 1,
WOOTING_80HE = 2
};
enum RGB_PARTS

13
Controllers/WootingKeyboardController/WootingKeyboardControllerDetect.cpp
View file

@ -52,6 +52,7 @@
#define WOOTING_TWO_UWU_RGB_X_PID 0x1510
#define WOOTING_TWO_UWU_RGB_C_PID 0x1511
#define WOOTING_TWO_UWU_RGB_N_PID 0x1512
#define WOOTING_TWO_80HE_PID 0x1400
void DetectWootingOneKeyboardControllers(hid_device_info* info, const std::string& name)
{
@ -86,8 +87,15 @@ void DetectWootingTwoKeyboardControllers(hid_device_info* info, const std::strin
if(dev)
{
LOG_DEBUG("[%s] Device type %i opened - creating Controller", controller_name, WOOTING_KB_FULL);
WootingTwoKeyboardController* controller = new WootingTwoKeyboardController(dev, info->path, WOOTING_KB_FULL);
uint8_t wooting_type;
switch(info->product_id)
{
case WOOTING_TWO_80HE_PID : wooting_type = WOOTING_80HE; break;
default : wooting_type = WOOTING_KB_FULL; break;
}
LOG_DEBUG("[%s] Device type %i opened - creating Controller", controller_name, wooting_type);
WootingTwoKeyboardController* controller = new WootingTwoKeyboardController(dev, info->path, wooting_type);
LOG_DEBUG("[%s] Controller created - creating RGBController", controller_name);
RGBController_WootingKeyboard* rgb_controller = new RGBController_WootingKeyboard(controller);
@ -124,3 +132,4 @@ REGISTER_HID_DETECTOR_PU("Wooting Two 60HE (ARM) (None)", DetectWootingTwoKey
REGISTER_HID_DETECTOR_PU("Wooting Two UwU RGB (Xbox)", DetectWootingTwoKeyboardControllers, WOOTING_NEW_VID, WOOTING_TWO_UWU_RGB_X_PID, 0x1337, 1);
REGISTER_HID_DETECTOR_PU("Wooting Two UwU RGB (Classic)", DetectWootingTwoKeyboardControllers, WOOTING_NEW_VID, WOOTING_TWO_UWU_RGB_C_PID, 0x1337, 1);
REGISTER_HID_DETECTOR_PU("Wooting Two UwU RGB (None)", DetectWootingTwoKeyboardControllers, WOOTING_NEW_VID, WOOTING_TWO_UWU_RGB_N_PID, 0x1337, 1);
REGISTER_HID_DETECTOR_PU("Wooting Two 80HE", DetectWootingTwoKeyboardControllers, WOOTING_NEW_VID, WOOTING_TWO_80HE_PID, 0x1337, 1);

4
Controllers/WootingKeyboardController/WootingTwoKeyboardController/WootingTwoKeyboardController.cpp
View file

@ -28,11 +28,11 @@ typedef uint16_t R5G6B5_color;
static unsigned int matrix_to_led_index_map_full[WOOTING_RGB_ROWS * WOOTING_TWO_RGB_COLUMNS] =
{
0, 21, 42, 63, 84, 105, NA, 22, 43, 64, 85, 106, 2, 23, 44, 65, 86, 107, 3, 24, 45,
0, 21, 42, 63, 84, 105, 1, 22, 43, 64, 85, 106, 2, 23, 44, 65, 86, 107, 3, 24, 45,
66, 87, NA, 4, 25, 46, 67, 88, NA, 5, 26, 47, 68, 89, NA, 6, 27, 48, 69, 90, 111,
7, 28, 49, 70, 91, NA, 8, 29, 50, 71, 92, NA, 9, 30, 51, 72, 93, NA, 10, 31, 52,
73, 94, 115, 11, 32, 53, 74, 95, 116, 12, 33, 54, 75, NA, 117, 13, 34, 55, 76, 97, 118,
14, 35, 56, NA, NA, 119, 15, 36, 57, NA, 99, 120, NA, 37, 58, NA, 16, 121, 17, 38, 59,
14, 35, 56, 77, 98, 119, 15, 36, 57, NA, 99, 120, 16, 37, 58, NA, 16, 121, 17, 38, 59,
80, 101, NA, 18, 39, 60, 81, 102, 123, 19, 40, 61, 82, 103, 124, 20, 41, 62, NA, 104, NA
};