diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.cpp index b32eccb5..c4796642 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.cpp @@ -18,10 +18,11 @@ \*-----------------------------------------*/ static const unsigned int SKIP_INDICES[] = { 23, 29, 41, 47, 70, 71, 76, 77, 87, 88, 93, 99, 100, 102, 108, 113 }; -HyperXAlloyElite2Controller::HyperXAlloyElite2Controller(hid_device* dev_handle, const char* path) +HyperXAlloyElite2Controller::HyperXAlloyElite2Controller(hid_device* dev_handle, const char* path, std::string dev_name) { dev = dev_handle; location = path; + name = dev_name; } HyperXAlloyElite2Controller::~HyperXAlloyElite2Controller() @@ -34,6 +35,11 @@ std::string HyperXAlloyElite2Controller::GetDeviceLocation() return("HID " + location); } +std::string HyperXAlloyElite2Controller::GetNameString() +{ + return(name); +} + std::string HyperXAlloyElite2Controller::GetSerialString() { wchar_t serial_string[128]; diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.h b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.h index bead5d59..d1c47f8f 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.h +++ b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/HyperXAlloyElite2Controller.h @@ -18,10 +18,11 @@ class HyperXAlloyElite2Controller { public: - HyperXAlloyElite2Controller(hid_device* dev_handle, const char* path); + HyperXAlloyElite2Controller(hid_device* dev_handle, const char* path, std::string dev_name); ~HyperXAlloyElite2Controller(); std::string GetDeviceLocation(); + std::string GetNameString(); std::string GetSerialString(); void SetLEDsDirect(const std::vector& colors); @@ -29,6 +30,7 @@ public: private: hid_device* dev; std::string location; + std::string name; void SendDirectInitialization(); }; diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.cpp index 8d3a80dd..c6447cbe 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyElite2Controller/RGBController_HyperXAlloyElite2.cpp @@ -208,20 +208,20 @@ static const char *led_names[] = RGBController_HyperXAlloyElite2::RGBController_HyperXAlloyElite2(HyperXAlloyElite2Controller* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "HyperX Alloy Elite 2 Keyboard Device"; - vendor = "HyperX"; - type = DEVICE_TYPE_KEYBOARD; - description = "HyperX Alloy Elite 2 Keyboard Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = controller->GetNameString(); + vendor = "HyperX"; + type = DEVICE_TYPE_KEYBOARD; + description = "HyperX Alloy Elite 2 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; + 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(); diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.cpp index a802b2d1..204aa459 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.cpp @@ -29,10 +29,11 @@ static unsigned int extended_red[] = {0x08, 0x48, 0x88, 0x09, 0x89, 0x0A, 0x8A, static unsigned int extended_grn[] = {0x29, 0x28, 0x78, 0x19, 0x79, 0x1A, 0x7A, 0x1B, 0x7B, 0x1C, 0x7C, 0x1D, 0x7D, 0x1E, 0x6E, 0x7E, 0x1F, 0x6F, 0x82, 0x23, 0x83, 0x22 }; static unsigned int extended_blu[] = {0x39, 0x38, 0x68, 0x3A, 0x69, 0x2A, 0x6A, 0x2B, 0x6B, 0x2C, 0x6C, 0x2D, 0x6D, 0x2E, 0x5E, 0x5D, 0x2F, 0x5F, 0x72, 0x33, 0x73, 0x32 }; -HyperXAlloyEliteController::HyperXAlloyEliteController(hid_device* dev_handle, const char* path) +HyperXAlloyEliteController::HyperXAlloyEliteController(hid_device* dev_handle, const char* path, std::string dev_name) { dev = dev_handle; location = path; + name = dev_name; } HyperXAlloyEliteController::~HyperXAlloyEliteController() @@ -45,6 +46,11 @@ std::string HyperXAlloyEliteController::GetDeviceLocation() return("HID: " + location); } +std::string HyperXAlloyEliteController::GetNameString() +{ + return(name); +} + std::string HyperXAlloyEliteController::GetSerialString() { wchar_t serial_string[128]; diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.h b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.h index 9a5a7093..a1aa846e 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.h +++ b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/HyperXAlloyEliteController.h @@ -66,10 +66,11 @@ enum class HyperXAlloyEliteController { public: - HyperXAlloyEliteController(hid_device* dev_handle, const char* path); + HyperXAlloyEliteController(hid_device* dev_handle, const char* path, std::string dev_name); ~HyperXAlloyEliteController(); std::string GetDeviceLocation(); + std::string GetNameString(); std::string GetSerialString(); void SetMode @@ -89,6 +90,7 @@ private: unsigned char active_direction; unsigned char active_speed; std::string location; + std::string name; void SelectProfile ( diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.cpp index ec6e4d1d..eab80c3e 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyEliteController/RGBController_HyperXAlloyElite.cpp @@ -191,50 +191,50 @@ static const char *led_names[] = RGBController_HyperXAlloyElite::RGBController_HyperXAlloyElite(HyperXAlloyEliteController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "HyperX Alloy Elite"; - vendor = "HyperX"; - type = DEVICE_TYPE_KEYBOARD; - description = "HyperX Alloy Elite Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = controller->GetNameString(); + vendor = "HyperX"; + type = DEVICE_TYPE_KEYBOARD; + description = "HyperX Alloy Elite Device"; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); mode Direct; - Direct.name = "Direct"; - Direct.value = HYPERX_ALLOY_ELITE_MODE_STATIC; - Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Direct.color_mode = MODE_COLORS_PER_LED; + Direct.name = "Direct"; + Direct.value = HYPERX_ALLOY_ELITE_MODE_STATIC; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; modes.push_back(Direct); mode Static; - Static.name = "Static"; - Static.value = HYPERX_ALLOY_ELITE_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Static"; + Static.value = HYPERX_ALLOY_ELITE_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); mode Wave; - Wave.name = "Wave"; - Wave.value = HYPERX_ALLOY_ELITE_MODE_WAVE; - Wave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_AUTOMATIC_SAVE; - Wave.speed_min = 0x00; - Wave.speed_max = 0x09; - Wave.color_mode = MODE_COLORS_NONE; - Wave.speed = 0x09; - Wave.direction = MODE_DIRECTION_LEFT; + Wave.name = "Wave"; + Wave.value = HYPERX_ALLOY_ELITE_MODE_WAVE; + Wave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_DIRECTION_LR | MODE_FLAG_AUTOMATIC_SAVE; + Wave.speed_min = 0x00; + Wave.speed_max = 0x09; + Wave.color_mode = MODE_COLORS_NONE; + Wave.speed = 0x09; + Wave.direction = MODE_DIRECTION_LEFT; modes.push_back(Wave); mode Breathing; - Breathing.name = "Breathing"; - Breathing.value = HYPERX_ALLOY_ELITE_MODE_BREATHING; - Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_AUTOMATIC_SAVE; - Breathing.speed_min = 0x00; - Breathing.speed_max = 0x09; - Breathing.colors_min = 1; - Breathing.colors_max = 2; - Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC; - Breathing.speed = 0x09; + Breathing.name = "Breathing"; + Breathing.value = HYPERX_ALLOY_ELITE_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_AUTOMATIC_SAVE; + Breathing.speed_min = 0x00; + Breathing.speed_max = 0x09; + Breathing.colors_min = 1; + Breathing.colors_max = 2; + Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC; + Breathing.speed = 0x09; Breathing.colors.resize(2); modes.push_back(Breathing); diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.cpp index a93270af..779e34af 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.cpp @@ -25,10 +25,11 @@ static unsigned int keys[] = {0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x 0x7F, 0x81, 0x84, 0x85, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x91, 0x94, 0x95 }; -HyperXAlloyFPSController::HyperXAlloyFPSController(hid_device* dev_handle, const char* path) +HyperXAlloyFPSController::HyperXAlloyFPSController(hid_device* dev_handle, const char* path, std::string dev_name) { dev = dev_handle; location = path; + name = dev_name; } HyperXAlloyFPSController::~HyperXAlloyFPSController() @@ -41,6 +42,11 @@ std::string HyperXAlloyFPSController::GetDeviceLocation() return("HID: " + location); } +std::string HyperXAlloyFPSController::GetNameString() +{ + return(name); +} + std::string HyperXAlloyFPSController::GetSerialString() { wchar_t serial_string[128]; diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.h b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.h index 340a543b..96187dce 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.h +++ b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/HyperXAlloyFPSController.h @@ -30,10 +30,11 @@ enum class HyperXAlloyFPSController { public: - HyperXAlloyFPSController(hid_device* dev_handle, const char* path); + HyperXAlloyFPSController(hid_device* dev_handle, const char* path, std::string dev_name); ~HyperXAlloyFPSController(); std::string GetDeviceLocation(); + std::string GetNameString(); std::string GetSerialString(); void SetLEDsDirect(std::vector colors); @@ -41,6 +42,7 @@ public: private: hid_device* dev; std::string location; + std::string name; void SendDirect ( diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.cpp index a7c62ca3..dc152b13 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyFPSController/RGBController_HyperXAlloyFPS.cpp @@ -163,20 +163,20 @@ static const char *led_names[] = RGBController_HyperXAlloyFPS::RGBController_HyperXAlloyFPS(HyperXAlloyFPSController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "HyperX Alloy FPS"; - vendor = "HyperX"; - type = DEVICE_TYPE_KEYBOARD; - description = "HyperX Alloy FPS Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = controller->GetNameString(); + vendor = "HyperX"; + type = DEVICE_TYPE_KEYBOARD; + description = "HyperX Alloy FPS Device"; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); mode Direct; - Direct.name = "Direct"; - Direct.value = 0; - Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Direct.color_mode = MODE_COLORS_PER_LED; + Direct.name = "Direct"; + Direct.value = 0; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; modes.push_back(Direct); SetupZones(); diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.cpp index 1a960e59..00b944cd 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.cpp @@ -13,10 +13,11 @@ #include "HyperXAlloyOrigins60and65Controller.h" #include "StringUtils.h" -HyperXAlloyOrigins60and65Controller::HyperXAlloyOrigins60and65Controller(hid_device* dev_handle, const char* path) +HyperXAlloyOrigins60and65Controller::HyperXAlloyOrigins60and65Controller(hid_device* dev_handle, const char* path, std::string dev_name) { dev = dev_handle; location = path; + dev_name = name; } HyperXAlloyOrigins60and65Controller::~HyperXAlloyOrigins60and65Controller() @@ -29,6 +30,11 @@ std::string HyperXAlloyOrigins60and65Controller::GetDeviceLocation() return("HID " + location); } +std::string HyperXAlloyOrigins60and65Controller::GetNameString() +{ + return(name); +} + std::string HyperXAlloyOrigins60and65Controller::GetSerialString() { wchar_t serial_string[128]; diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.h b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.h index 81b42c62..43dd52a5 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.h +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/HyperXAlloyOrigins60and65Controller.h @@ -18,10 +18,11 @@ class HyperXAlloyOrigins60and65Controller { public: - HyperXAlloyOrigins60and65Controller(hid_device* dev_handle, const char* path); + HyperXAlloyOrigins60and65Controller(hid_device* dev_handle, const char* path, std::string dev_name); ~HyperXAlloyOrigins60and65Controller(); std::string GetDeviceLocation(); + std::string GetNameString(); std::string GetSerialString(); void SetLEDsDirect(std::vector colors); @@ -29,6 +30,7 @@ public: private: hid_device* dev; std::string location; + std::string name; void SendDirectInitialization(); void SendDirectColorPacket diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.cpp index cd7c3fb7..142183e5 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOrigins60and65Controller/RGBController_HyperXAlloyOrigins60and65.cpp @@ -210,29 +210,31 @@ static const char *led_names_65[] = RGBController_HyperXAlloyOrigins60and65::RGBController_HyperXAlloyOrigins60and65(HyperXAlloyOrigins60and65Controller* controller_ptr, AlloyOrigins60and65MappingLayoutType keyboard_layout) { - controller = controller_ptr; - layout = keyboard_layout; + controller = controller_ptr; + layout = keyboard_layout; switch(layout) { case ALLOY_ORIGINS_60_LAYOUT: - name = "HyperX Alloy Origins 60 Keyboard Device"; + description = "HyperX Alloy Origins 60 Keyboard Device"; break; + case ALLOY_ORIGINS_65_LAYOUT: - name = "HyperX Alloy Origins 65 Keyboard Device"; + description = "HyperX Alloy Origins 65 Keyboard Device"; + break; } - description = name; - vendor = "HyperX"; - type = DEVICE_TYPE_KEYBOARD; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = controller->GetNameString(); + vendor = "HyperX"; + type = DEVICE_TYPE_KEYBOARD; + 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; + 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(); diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.cpp index ff589553..4942f8c4 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.cpp @@ -16,10 +16,11 @@ // Skip these indices in the color output static unsigned int skip_idx[] = { 23, 29, 41, 47, 59, 70, 71, 87, 88, 93, 99, 100, 102, 108, 113, 114, 120, 123, 124 }; -HyperXAlloyOriginsController::HyperXAlloyOriginsController(hid_device* dev_handle, const char* path) +HyperXAlloyOriginsController::HyperXAlloyOriginsController(hid_device* dev_handle, const char* path, std::string dev_name) { dev = dev_handle; location = path; + name = dev_name; } HyperXAlloyOriginsController::~HyperXAlloyOriginsController() @@ -32,6 +33,11 @@ std::string HyperXAlloyOriginsController::GetDeviceLocation() return("HID " + location); } +std::string HyperXAlloyOriginsController::GetNameString() +{ + return(name); +} + std::string HyperXAlloyOriginsController::GetSerialString() { wchar_t serial_string[128]; diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.h b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.h index c81cbfff..10680199 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.h +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/HyperXAlloyOriginsController.h @@ -18,10 +18,11 @@ class HyperXAlloyOriginsController { public: - HyperXAlloyOriginsController(hid_device* dev_handle, const char* path); + HyperXAlloyOriginsController(hid_device* dev_handle, const char* path, std::string dev_name); ~HyperXAlloyOriginsController(); std::string GetDeviceLocation(); + std::string GetNameString(); std::string GetSerialString(); void SetLEDsDirect(std::vector colors); @@ -29,6 +30,7 @@ public: private: hid_device* dev; std::string location; + std::string name; void SendDirectInitialization(); void SendDirectColorPacket diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.cpp index 17b9b6c8..69691677 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsController/RGBController_HyperXAlloyOrigins.cpp @@ -183,20 +183,20 @@ static const char *led_names[] = RGBController_HyperXAlloyOrigins::RGBController_HyperXAlloyOrigins(HyperXAlloyOriginsController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "HyperX Alloy Origins Keyboard Device"; - vendor = "HyperX"; - type = DEVICE_TYPE_KEYBOARD; - description = "HyperX Alloy Origins Keyboard Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = controller->GetNameString(); + vendor = "HyperX"; + type = DEVICE_TYPE_KEYBOARD; + description = "HyperX Alloy Origins 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; + 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(); diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.cpp index f747ce74..24841b33 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.cpp @@ -17,10 +17,11 @@ #include "LogManager.h" -HyperXAlloyOriginsCoreController::HyperXAlloyOriginsCoreController(hid_device* dev_handle, hid_device_info* dev_info) +HyperXAlloyOriginsCoreController::HyperXAlloyOriginsCoreController(hid_device* dev_handle, hid_device_info* dev_info, std::string dev_name) { - dev = dev_handle; - location = dev_info->path; + dev = dev_handle; + location = dev_info->path; + name = dev_name; /*-----------------------------------------------------*\ | Get the firmware version from the device info | @@ -44,6 +45,11 @@ std::string HyperXAlloyOriginsCoreController::GetDeviceLocation() return("HID " + location); } +std::string HyperXAlloyOriginsCoreController::GetNameString() +{ + return(name); +} + std::string HyperXAlloyOriginsCoreController::GetSerialString() { wchar_t serial_string[128]; diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.h b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.h index 4e1394f0..7e332607 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.h +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/HyperXAlloyOriginsCoreController.h @@ -18,10 +18,11 @@ class HyperXAlloyOriginsCoreController { public: - HyperXAlloyOriginsCoreController(hid_device* dev_handle, hid_device_info* dev_info); + HyperXAlloyOriginsCoreController(hid_device* dev_handle, hid_device_info* dev_info, std::string dev_name); ~HyperXAlloyOriginsCoreController(); std::string GetDeviceLocation(); + std::string GetNameString(); std::string GetSerialString(); std::string GetFirmwareVersion(); unsigned int GetVariant(); @@ -33,4 +34,5 @@ private: hid_device* dev; std::string location; std::string firmware_version; + std::string name; }; diff --git a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.cpp b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.cpp index 627a7223..27c48393 100644 --- a/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.cpp +++ b/Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController/RGBController_HyperXAlloyOriginsCore.cpp @@ -186,16 +186,16 @@ static led_index led_names[] = RGBController_HyperXAlloyOriginsCore::RGBController_HyperXAlloyOriginsCore(HyperXAlloyOriginsCoreController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "HyperX Alloy Origins Core Keyboard Device"; - vendor = "HyperX"; - type = DEVICE_TYPE_KEYBOARD; - description = "HyperX Alloy Origins Core Keyboard Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); - version = controller->GetFirmwareVersion(); - variant = controller->GetVariant(); + name = controller->GetNameString(); + vendor = "HyperX"; + type = DEVICE_TYPE_KEYBOARD; + description = "HyperX Alloy Origins Core Keyboard Device"; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); + version = controller->GetFirmwareVersion(); + variant = controller->GetVariant(); mode Direct; Direct.name = "Direct"; diff --git a/Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp b/Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp index abbe728f..2bbec9d8 100644 --- a/Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp +++ b/Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp @@ -67,9 +67,8 @@ void DetectHyperXAlloyElite(hid_device_info* info, const std::string& name) if(dev) { - HyperXAlloyEliteController* controller = new HyperXAlloyEliteController(dev, info->path); + HyperXAlloyEliteController* controller = new HyperXAlloyEliteController(dev, info->path, name); RGBController_HyperXAlloyElite* rgb_controller = new RGBController_HyperXAlloyElite(controller); - rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } @@ -81,9 +80,8 @@ void DetectHyperXAlloyElite2(hid_device_info* info, const std::string& name) if(dev) { - HyperXAlloyElite2Controller* controller = new HyperXAlloyElite2Controller(dev, info->path); + HyperXAlloyElite2Controller* controller = new HyperXAlloyElite2Controller(dev, info->path, name); RGBController_HyperXAlloyElite2* rgb_controller = new RGBController_HyperXAlloyElite2(controller); - rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } @@ -95,9 +93,8 @@ void DetectHyperXAlloyFPS(hid_device_info* info, const std::string& name) if(dev) { - HyperXAlloyFPSController* controller = new HyperXAlloyFPSController(dev, info->path); + HyperXAlloyFPSController* controller = new HyperXAlloyFPSController(dev, info->path, name); RGBController_HyperXAlloyFPS* rgb_controller = new RGBController_HyperXAlloyFPS(controller); - rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } @@ -109,9 +106,8 @@ void DetectHyperXAlloyOrigins(hid_device_info* info, const std::string& name) if(dev) { - HyperXAlloyOriginsController* controller = new HyperXAlloyOriginsController(dev, info->path); + HyperXAlloyOriginsController* controller = new HyperXAlloyOriginsController(dev, info->path, name); RGBController_HyperXAlloyOrigins* rgb_controller = new RGBController_HyperXAlloyOrigins(controller); - rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } @@ -123,9 +119,8 @@ void DetectHyperXAlloyOriginsCore(hid_device_info* info, const std::string& name if(dev) { - HyperXAlloyOriginsCoreController* controller = new HyperXAlloyOriginsCoreController(dev, info); + HyperXAlloyOriginsCoreController* controller = new HyperXAlloyOriginsCoreController(dev, info, name); RGBController_HyperXAlloyOriginsCore* rgb_controller = new RGBController_HyperXAlloyOriginsCore(controller); - rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } @@ -137,10 +132,9 @@ void DetectHyperXAlloyOrigins60and65(hid_device_info* info, const std::string& n if(dev) { - HyperXAlloyOrigins60and65Controller* controller = new HyperXAlloyOrigins60and65Controller(dev, info->path); + HyperXAlloyOrigins60and65Controller* controller = new HyperXAlloyOrigins60and65Controller(dev, info->path, name); AlloyOrigins60and65MappingLayoutType layout = GetAlloyOrigins60and65MappingLayoutType(info->product_id); RGBController_HyperXAlloyOrigins60and65* rgb_controller = new RGBController_HyperXAlloyOrigins60and65(controller, layout); - rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); }