diff --git a/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp b/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp new file mode 100644 index 00000000..12bdefda --- /dev/null +++ b/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp @@ -0,0 +1,268 @@ +/*-----------------------------------------*\ +| RGBController_ValkyrieKeyboard.cpp | +| | +| Generic RGB Interface for Valkyrie RGB | +| keyboard devices | +| | +| Nollie(Nuonuo) 2023/12/6 | +\*-----------------------------------------*/ + +#include "RGBControllerKeyNames.h" +#include "RGBController_ValkyrieKeyboard.h" + +//0xFFFFFFFF indicates an unused entry in matrix +#define NA 0xFFFFFFFF + +static unsigned int matrix_map[6][22] = + { { 0, NA, 1, 2, 3, 4, NA, 5, 6, 7, 8, NA, 9, 10, 11, 12, NA, 13, NA, NA, NA, NA }, + { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, NA, NA, NA, 28, 29, 30, 31, 32 }, + { 33, NA, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, NA, NA, 47, 48, 49, 50, 51 }, + { 52, NA, NA, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, NA, 63, 64, NA, 65, 66, 67, 68, NA }, + { 69, NA, NA, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, NA, NA, 81, NA, 82, 83, 84, 85 }, + { 86, 87, 88, NA, NA, NA, NA, 89, NA, NA, NA, NA, 90, 91, 92, 93, 94, 95, NA, 96, 97, NA } }; + +static const char* zone_names[] = +{ + ZONE_EN_KEYBOARD +}; + +static zone_type zone_types[] = +{ + ZONE_TYPE_MATRIX, +}; + +static const unsigned int zone_sizes[] = +{ + 98 +}; + +static const char *led_names[] = +{ + KEY_EN_ESCAPE, + KEY_EN_F1, + KEY_EN_F2, + KEY_EN_F3, + KEY_EN_F4, + KEY_EN_F5, + KEY_EN_F6, + KEY_EN_F7, + KEY_EN_F8, + KEY_EN_F9, + KEY_EN_F10, + KEY_EN_F11, + KEY_EN_F12, + KEY_EN_DELETE, + KEY_EN_BACK_TICK, + KEY_EN_1, + KEY_EN_2, + KEY_EN_3, + KEY_EN_4, + KEY_EN_5, + KEY_EN_6, + KEY_EN_7, + KEY_EN_8, + KEY_EN_9, + KEY_EN_0, + KEY_EN_MINUS, + KEY_EN_PLUS, + KEY_EN_BACKSPACE, + KEY_EN_INSERT, + KEY_EN_NUMPAD_LOCK, + KEY_EN_NUMPAD_DIVIDE, + KEY_EN_NUMPAD_TIMES, + KEY_EN_NUMPAD_MINUS, + KEY_EN_TAB, + KEY_EN_Q, + KEY_EN_W, + KEY_EN_E, + KEY_EN_R, + KEY_EN_T, + KEY_EN_Y, + KEY_EN_U, + KEY_EN_I, + KEY_EN_O, + KEY_EN_P, + KEY_EN_LEFT_BRACKET, + KEY_EN_RIGHT_BRACKET, + KEY_EN_BACK_SLASH, + KEY_EN_PAGE_UP, + KEY_EN_NUMPAD_7, + KEY_EN_NUMPAD_8, + KEY_EN_NUMPAD_9, + KEY_EN_NUMPAD_PLUS, + KEY_EN_CAPS_LOCK, + KEY_EN_A, + KEY_EN_S, + KEY_EN_D, + KEY_EN_F, + KEY_EN_G, + KEY_EN_H, + KEY_EN_J, + KEY_EN_K, + KEY_EN_L, + KEY_EN_SEMICOLON, + KEY_EN_QUOTE, + KEY_EN_ANSI_ENTER, + KEY_EN_PAGE_DOWN, + KEY_EN_NUMPAD_4, + KEY_EN_NUMPAD_5, + KEY_EN_NUMPAD_6, + KEY_EN_LEFT_SHIFT, + KEY_EN_Z, + KEY_EN_X, + KEY_EN_C, + KEY_EN_V, + KEY_EN_B, + KEY_EN_N, + KEY_EN_M, + KEY_EN_COMMA, + KEY_EN_PERIOD, + KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_SHIFT, + KEY_EN_UP_ARROW, + KEY_EN_NUMPAD_1, + KEY_EN_NUMPAD_2, + KEY_EN_NUMPAD_3, + KEY_EN_NUMPAD_ENTER, + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_WINDOWS, + KEY_EN_LEFT_ALT, + KEY_EN_SPACE, + KEY_EN_RIGHT_ALT, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_RIGHT_CONTROL, + KEY_EN_LEFT_ARROW, + KEY_EN_DOWN_ARROW, + KEY_EN_RIGHT_ARROW, + KEY_EN_NUMPAD_0, + KEY_EN_NUMPAD_PERIOD +}; +/**------------------------------------------------------------------*\ + @name Valkyrie + @category Keyboard + @type USB + @save :x: + @direct :white_check_mark: + @effects :x: + @detectors DetectValkyrieKeyboardControllers + @comment +\*-------------------------------------------------------------------*/ + +RGBController_ValkyrieKeyboard::RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr) +{ + controller = controller_ptr; + + name = "Valkyrie Keyboard Device"; + vendor = "Valkyrie"; + type = DEVICE_TYPE_KEYBOARD; + description = "Valkyrie Keyboard Device"; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); + + mode Direct; + Direct.name = "Direct"; + Direct.value = 0xFFFF; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); + + SetupZones(); +} + +RGBController_ValkyrieKeyboard::~RGBController_ValkyrieKeyboard() +{ + /*---------------------------------------------------------*\ + | Delete the matrix map | + \*---------------------------------------------------------*/ + for(unsigned int zone_index = 0; zone_index < zones.size(); zone_index++) + { + if(zones[zone_index].matrix_map != NULL) + { + delete zones[zone_index].matrix_map; + } + } + + delete controller; +} + +void RGBController_ValkyrieKeyboard::SetupZones() +{ + /*---------------------------------------------------------*\ + | Set up zones | + \*---------------------------------------------------------*/ + unsigned int total_led_count = 0; + for(unsigned int zone_idx = 0; zone_idx < 1; zone_idx++) + { + unsigned int zone_size = 0; + unsigned int matrix_width = 0; + unsigned int* matrix_map_ptr = NULL; + + switch(controller->GetUSBPID()) + { + case Valkyrie_99_Pro_PID: + zone_size = zone_sizes[zone_idx]; + matrix_width = 22; + matrix_map_ptr = (unsigned int *)&matrix_map; + break; + } + + zone new_zone; + new_zone.name = zone_names[zone_idx]; + new_zone.type = zone_types[zone_idx]; + new_zone.leds_min = zone_size; + new_zone.leds_max = zone_size; + new_zone.leds_count = zone_size; + new_zone.matrix_map = new matrix_map_type; + new_zone.matrix_map->height = 6; + new_zone.matrix_map->width = matrix_width; + new_zone.matrix_map->map = matrix_map_ptr; + zones.push_back(new_zone); + + total_led_count += zone_size; + } + + for(unsigned int led_idx = 0; led_idx < total_led_count; led_idx++) + { + led new_led; + new_led.name = led_names[led_idx]; + leds.push_back(new_led); + } + + SetupColors(); +} + +void RGBController_ValkyrieKeyboard::ResizeZone(int /*zone*/, int /*new_size*/) +{ + /*---------------------------------------------------------*\ + | This device does not support resizing zones | + \*---------------------------------------------------------*/ +} + +void RGBController_ValkyrieKeyboard::DeviceUpdateLEDs() +{ + unsigned char colordata[1024]; + + for(std::size_t color_idx = 0; color_idx < colors.size(); color_idx++) + { + colordata[(color_idx*3)+0] = RGBGetRValue(colors[color_idx]); + colordata[(color_idx*3)+1] = RGBGetGValue(colors[color_idx]); + colordata[(color_idx*3)+2] = RGBGetBValue(colors[color_idx]); + } + + controller->SendColors(colordata, sizeof(colordata)); +} + +void RGBController_ValkyrieKeyboard::UpdateZoneLEDs(int /*zone*/) +{ + DeviceUpdateLEDs(); +} + +void RGBController_ValkyrieKeyboard::UpdateSingleLED(int /*led*/) +{ + DeviceUpdateLEDs(); +} + +void RGBController_ValkyrieKeyboard::DeviceUpdateMode() +{ + +} diff --git a/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.h b/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.h new file mode 100644 index 00000000..d31ede72 --- /dev/null +++ b/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.h @@ -0,0 +1,29 @@ +/*-----------------------------------------*\ +| RGBController_ValkyrieKeyboard.h | +| | +| Generic RGB Interface for Valkyrie RGB | +| keyboard devices | +| | +| Nollie(Nuonuo) 2023/12/6 | +\*-----------------------------------------*/ + +#pragma once +#include "RGBController.h" +#include "ValkyrieKeyboardController.h" + +class RGBController_ValkyrieKeyboard : public RGBController +{ +public: + RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr); + ~RGBController_ValkyrieKeyboard(); + + void SetupZones(); + void ResizeZone(int zone, int new_size); + void DeviceUpdateLEDs(); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); + void DeviceUpdateMode(); + +private: + ValkyrieKeyboardController* controller; +}; diff --git a/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp new file mode 100644 index 00000000..097b4c9d --- /dev/null +++ b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp @@ -0,0 +1,120 @@ +/*-----------------------------------------*\ +| ValkyrieKeyboardController.cpp | +| | +| Driver for Valkyrie RGB keyboardlighting | +| controller | +| | +| Nollie(Nuonuo) 2023/12/6 | +\*-----------------------------------------*/ + +#include +#include "ValkyrieKeyboardController.h" + +ValkyrieKeyboardController::ValkyrieKeyboardController(hid_device* dev_handle, const char* path, const unsigned short pid) +{ + dev = dev_handle; + location = path; + usb_pid = pid; +} + +ValkyrieKeyboardController::~ValkyrieKeyboardController() +{ + hid_close(dev); +} + +std::string ValkyrieKeyboardController::GetDeviceLocation() +{ + return("HID: " + location); +} + +std::string ValkyrieKeyboardController::GetSerialString() +{ + wchar_t serial_string[128]; + int ret = hid_get_serial_number_string(dev, serial_string, 128); + + if(ret != 0) + { + return(""); + } + + std::wstring return_wstring = serial_string; + std::string return_string(return_wstring.begin(), return_wstring.end()); + + return(return_string); +} + +unsigned short ValkyrieKeyboardController::GetUSBPID() +{ + return(usb_pid); +} + +void ValkyrieKeyboardController::SendColors(unsigned char* color_data,unsigned int color_data_size) +{ +// unsigned char* color_data_ptr = color_data; + unsigned char usb_buf[392]; + int led_num = 98; + for(int i = 0; i < led_num; i++) + { + usb_buf[i * 4] = key_code_99[i]; + usb_buf[i * 4 + 1] = color_data[i * 3]; + usb_buf[i * 4 + 2] = color_data[i * 3 + 1]; + usb_buf[i * 4 + 3] = color_data[i * 3 + 2]; + } + SendInitializeColorPacket(); + for(int i = 0; i <= 6; i++) + { + unsigned int usb_data_num = 16; + if(i == 6) + { + usb_data_num = led_num - usb_data_num * 6; + } + char send_usb_buf[65]; + memset(send_usb_buf, 0x00, sizeof(send_usb_buf)); + + for(int index = 0; index < usb_data_num; index++) + { + send_usb_buf[index * 4 + 1] = usb_buf[index * 4 + i * 64 ]; + send_usb_buf[index * 4 + 2] = usb_buf[index * 4 + i * 64 + 1]; + send_usb_buf[index * 4 + 3] = usb_buf[index * 4 + i * 64 + 2]; + send_usb_buf[index * 4 + 4] = usb_buf[index * 4 + i * 64 + 3]; + } + /*-----------------------------------------------------*\ + | Send packet | + \*-----------------------------------------------------*/ + hid_send_feature_report(dev, (unsigned char *)send_usb_buf, 65); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + } + SendTerminateColorPacket(); + std::this_thread::sleep_for(std::chrono::milliseconds(33)); +} + +void ValkyrieKeyboardController::SendInitializeColorPacket() +{ + uint8_t usb_write_buf[65]; + uint8_t usb_read_buf[65]; + memset(usb_write_buf, 0x00, sizeof(usb_write_buf)); + memset(usb_read_buf, 0x00, sizeof(usb_read_buf)); + usb_write_buf[1] = 0x04; + usb_write_buf[2] = 0x20; + usb_write_buf[9] = 0x08; + hid_send_feature_report(dev, (unsigned char *)usb_write_buf, 65); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + hid_get_feature_report (dev, (unsigned char *)usb_read_buf, 65); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); +} + +void ValkyrieKeyboardController::SendTerminateColorPacket() +{ + uint8_t usb_write_buf[65]; + uint8_t usb_read_buf[65]; + memset(usb_write_buf, 0x00, sizeof(usb_write_buf)); + memset(usb_read_buf, 0x00, sizeof(usb_read_buf)); + hid_send_feature_report(dev, (unsigned char *)usb_write_buf, 65); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + usb_write_buf[1] = 0x04; + usb_write_buf[2] = 0x02; + hid_send_feature_report(dev, (unsigned char *)usb_write_buf, 65); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); + hid_get_feature_report (dev, (unsigned char *)usb_read_buf, 65); + std::this_thread::sleep_for(std::chrono::milliseconds(1)); +} diff --git a/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.h b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.h new file mode 100644 index 00000000..fb8c80d1 --- /dev/null +++ b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.h @@ -0,0 +1,60 @@ +/*-----------------------------------------*\ +| ValkyrieKeyboardController.h | +| | +| Definitions and types for Valkyrie RGB | +| keyboard lighting controller | +| | +| Nollie(Nuonuo) 2023/12/6 | +\*-----------------------------------------*/ +#pragma once + +#include "RGBController.h" +#include +#include + +/*-----------------------------------------------------*\ +| Valkyrie vendor ID | +\*-----------------------------------------------------*/ +#define VALKYRIE_VID 0x05AC + +/*-----------------------------------------------------*\ +| Keyboard product IDs | +\*-----------------------------------------------------*/ +#define VALKYRIE_99_PRO_PID 0x024F + +class ValkyrieKeyboardController +{ +public: + ValkyrieKeyboardController(hid_device* dev_handle, const char* path, const unsigned short pid); + ~ValkyrieKeyboardController(); + + std::string GetDeviceLocation(); + std::string GetSerialString(); + unsigned short GetUSBPID(); + + void SendColors + ( + unsigned char* color_data, + unsigned int color_data_size + ); + +private: + hid_device* dev; + std::string location; + unsigned short usb_pid; + + void SendInitializeColorPacket(); + void SendTerminateColorPacket(); + int key_code_99[98] = + { + 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x77, + 0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,0x67, + 0x74,0x20,0x21,0x22,0x7A,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D, + 0x2E,0x2F,0x30,0x31,0x43,0x76,0x32,0x33,0x34,0x7B,0x37,0x38,0x39,0x3A, + 0x3B,0x3C,0x3D,0x3E,0x3F,0x40,0x41,0x42,0x55,0x79,0x44,0x45,0x46,0x49, + 0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54,0x65,0x56,0x57, + 0x58,0x6A,0x5B,0x5C,0x5D,0x5E,0x5F,0x60,0x62,0x63,0x64,0x66,0x68,0x69 + }; + + +}; diff --git a/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp new file mode 100644 index 00000000..74773daf --- /dev/null +++ b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp @@ -0,0 +1,20 @@ +#include "Detector.h" +#include "ValkyrieKeyboardController.h" +#include "RGBController.h" +#include "RGBController_ValkyrieKeyboard.h" +#include + +void DetectValkyrieKeyboardControllers(hid_device_info* info, const std::string& name) +{ + hid_device* dev = hid_open_path(info->path); + + if(dev) + { + ValkyrieKeyboardController* controller = new ValkyrieKeyboardController(dev, info->path, info->product_id); + RGBController_ValkyrieKeyboard* rgb_controller = new RGBController_ValkyrieKeyboard(controller); + rgb_controller->name = name; + ResourceManager::get()->RegisterRGBController(rgb_controller); + } +} /* DetectValkyrieKeyboardControllers() */ + +REGISTER_HID_DETECTOR_IPU("valkyrie-99pro",DetectValkyrieKeyboardControllers,VALKYRIE_VID,VALKYRIE_99_PRO_PID,3,0xFF13,0x0001); diff --git a/OpenRGB.pro b/OpenRGB.pro index 5f1ba77c..2a59072e 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -798,6 +798,8 @@ HEADERS += Controllers/TrustController/RGBController_TrustGXT180.h \ Controllers/TrustController/TrustGXT114Controller.h \ Controllers/TrustController/TrustGXT180Controller.h \ + Controllers/ValkyrieKeyboardController/ValkyrieController.h \ + Controllers/ValkyrieKeyboardController/RGBController_Valkyrie.h \ Controllers/ViewSonicController/VS_XG270QG_Controller.h \ Controllers/ViewSonicController/RGBController_XG270QG.h \ Controllers/WinbondGamingKeyboardController/RGBController_WinbondGamingKeyboard.h \ @@ -1542,6 +1544,9 @@ SOURCES += Controllers/TrustController/TrustControllerDetect.cpp \ Controllers/TrustController/RGBController_TrustGXT114.cpp \ Controllers/TrustController/RGBController_TrustGXT180.cpp \ + Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp \ + Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp \ + Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp \ Controllers/ViewSonicController/ViewSonicControllerDetect.cpp \ Controllers/ViewSonicController/RGBController_XG270QG.cpp \ Controllers/ViewSonicController/VS_XG270QG_Controller.cpp \