diff --git a/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp b/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp index 52bc782a..019067be 100644 --- a/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp +++ b/Controllers/NZXTHue2Controller/NZXTHue2Controller.cpp @@ -232,6 +232,10 @@ void NZXTHue2Controller::UpdateDeviceList() num_leds_in_device = 24; break; + case 0x1E: //Kraken Elite Ring + num_leds_in_device = 24; + break; + default: break; } diff --git a/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp b/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp index e400ba6a..a4b4f57c 100644 --- a/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp +++ b/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp @@ -14,25 +14,26 @@ #include "NZXTHue2Controller.h" #include "RGBController_NZXTHue2.h" -#define NZXT_VID 0x1E71 -#define NZXT_HUE_2_PID 0x2001 -#define NZXT_HUE_2_AMBIENT_PID 0x2002 -#define NZXT_MOTHERBOARD_DEVICE_PID 0x2005 -#define NZXT_MOTHERBOARD_DEVICE_2_PID 0x200B -#define NZXT_SMART_DEVICE_V2_PID 0x2006 -#define NZXT_KRAKEN_X3_SERIES_PID 0x2007 -#define NZXT_KRAKEN_X3_SERIES_RGB_PID 0x2014 -#define NZXT_RGB_FAN_CONTROLLER_PID 0x2009 -#define NZXT_RGB_FAN_CONTROLLER2_PID 0x2010 -#define NZXT_RGB_FAN_CONTROLLER3_PID 0x200E -#define NZXT_RGB_FAN_CONTROLLER4_PID 0x2011 -#define NZXT_RGB_FAN_CONTROLLER5_PID 0x2019 -#define NZXT_RGB_FAN_CONTROLLER6_PID 0x2020 -#define NZXT_RGB_FAN_CONTROLLER7_PID 0x201F -#define NZXT_RGB_CONTROLLER_1_PID 0x2012 -#define NZXT_RGB_CONTROLLER_2_PID 0x2021 -#define NZXT_SMART_DEVICE_V2_1_PID 0x200D -#define NZXT_SMART_DEVICE_V2_2_PID 0x200F +#define NZXT_VID 0x1E71 +#define NZXT_HUE_2_PID 0x2001 +#define NZXT_HUE_2_AMBIENT_PID 0x2002 +#define NZXT_MOTHERBOARD_DEVICE_PID 0x2005 +#define NZXT_MOTHERBOARD_DEVICE_2_PID 0x200B +#define NZXT_SMART_DEVICE_V2_PID 0x2006 +#define NZXT_KRAKEN_X3_SERIES_PID 0x2007 +#define NZXT_KRAKEN_X3_SERIES_RGB_PID 0x2014 +#define NZXT_KRAKEN_2024_ELITE_SERIES_RGB_PID 0x3012 +#define NZXT_RGB_FAN_CONTROLLER_PID 0x2009 +#define NZXT_RGB_FAN_CONTROLLER2_PID 0x2010 +#define NZXT_RGB_FAN_CONTROLLER3_PID 0x200E +#define NZXT_RGB_FAN_CONTROLLER4_PID 0x2011 +#define NZXT_RGB_FAN_CONTROLLER5_PID 0x2019 +#define NZXT_RGB_FAN_CONTROLLER6_PID 0x2020 +#define NZXT_RGB_FAN_CONTROLLER7_PID 0x201F +#define NZXT_RGB_CONTROLLER_1_PID 0x2012 +#define NZXT_RGB_CONTROLLER_2_PID 0x2021 +#define NZXT_SMART_DEVICE_V2_1_PID 0x200D +#define NZXT_SMART_DEVICE_V2_2_PID 0x200F static void spawn_hue(hid_device_info* info, const std::string& name, int rgb_channels, int fan_channels) { @@ -73,6 +74,11 @@ void DetectNZXTKrakenX3(hid_device_info* info, const std::string& name) spawn_hue(info, name, 3, 0); } +void DetectNZXTKrakenElite(hid_device_info* info, const std::string& name) +{ + spawn_hue(info, name, 2, 2); +} + void DetectNZXTFanController(hid_device_info* info, const std::string& name) { spawn_hue(info, name, 2, 3); @@ -88,21 +94,22 @@ void DetectNZXTRGBController(hid_device_info* info, const std::string& name) spawn_hue(info, name, 3, 0); } -REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController, NZXT_VID, NZXT_RGB_FAN_CONTROLLER_PID); -REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController, NZXT_VID, NZXT_RGB_FAN_CONTROLLER2_PID); -REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController, NZXT_VID, NZXT_RGB_FAN_CONTROLLER3_PID); -REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER4_PID); -REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER5_PID); -REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER6_PID); -REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER7_PID); -REGISTER_HID_DETECTOR("NZXT Hue 2", DetectNZXTHue2, NZXT_VID, NZXT_HUE_2_PID); -REGISTER_HID_DETECTOR("NZXT Hue 2 Ambient", DetectNZXTHue2Ambient, NZXT_VID, NZXT_HUE_2_AMBIENT_PID); -REGISTER_HID_DETECTOR("NZXT Hue 2 Motherboard", DetectNZXTHue2Motherboard, NZXT_VID, NZXT_MOTHERBOARD_DEVICE_PID); -REGISTER_HID_DETECTOR("NZXT Hue 2 Motherboard", DetectNZXTHue2Motherboard, NZXT_VID, NZXT_MOTHERBOARD_DEVICE_2_PID); -REGISTER_HID_DETECTOR("NZXT Kraken X3 Series", DetectNZXTKrakenX3, NZXT_VID, NZXT_KRAKEN_X3_SERIES_PID); -REGISTER_HID_DETECTOR("NZXT Kraken X3 Series RGB", DetectNZXTKrakenX3, NZXT_VID, NZXT_KRAKEN_X3_SERIES_RGB_PID); -REGISTER_HID_DETECTOR("NZXT RGB Controller", DetectNZXTRGBController, NZXT_VID, NZXT_RGB_CONTROLLER_1_PID); -REGISTER_HID_DETECTOR("NZXT RGB Controller", DetectNZXTRGBController, NZXT_VID, NZXT_RGB_CONTROLLER_2_PID); -REGISTER_HID_DETECTOR("NZXT Smart Device V2", DetectNZXTSmartDeviceV2, NZXT_VID, NZXT_SMART_DEVICE_V2_PID); -REGISTER_HID_DETECTOR("NZXT Smart Device V2", DetectNZXTSmartDeviceV2, NZXT_VID, NZXT_SMART_DEVICE_V2_1_PID); -REGISTER_HID_DETECTOR("NZXT Smart Device V2", DetectNZXTSmartDeviceV2, NZXT_VID, NZXT_SMART_DEVICE_V2_2_PID); +REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController, NZXT_VID, NZXT_RGB_FAN_CONTROLLER_PID); +REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController, NZXT_VID, NZXT_RGB_FAN_CONTROLLER2_PID); +REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController, NZXT_VID, NZXT_RGB_FAN_CONTROLLER3_PID); +REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER4_PID); +REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER5_PID); +REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER6_PID); +REGISTER_HID_DETECTOR("NZXT RGB & Fan Controller", DetectNZXTFanController6Channel, NZXT_VID, NZXT_RGB_FAN_CONTROLLER7_PID); +REGISTER_HID_DETECTOR("NZXT Hue 2", DetectNZXTHue2, NZXT_VID, NZXT_HUE_2_PID); +REGISTER_HID_DETECTOR("NZXT Hue 2 Ambient", DetectNZXTHue2Ambient, NZXT_VID, NZXT_HUE_2_AMBIENT_PID); +REGISTER_HID_DETECTOR("NZXT Hue 2 Motherboard", DetectNZXTHue2Motherboard, NZXT_VID, NZXT_MOTHERBOARD_DEVICE_PID); +REGISTER_HID_DETECTOR("NZXT Hue 2 Motherboard", DetectNZXTHue2Motherboard, NZXT_VID, NZXT_MOTHERBOARD_DEVICE_2_PID); +REGISTER_HID_DETECTOR("NZXT Kraken X3 Series", DetectNZXTKrakenX3, NZXT_VID, NZXT_KRAKEN_X3_SERIES_PID); +REGISTER_HID_DETECTOR("NZXT Kraken X3 Series RGB", DetectNZXTKrakenX3, NZXT_VID, NZXT_KRAKEN_X3_SERIES_RGB_PID); +REGISTER_HID_DETECTOR("NZXT Kraken 2024 ELITE Series RGB", DetectNZXTKrakenElite, NZXT_VID, NZXT_KRAKEN_2024_ELITE_SERIES_RGB_PID); +REGISTER_HID_DETECTOR("NZXT RGB Controller", DetectNZXTRGBController, NZXT_VID, NZXT_RGB_CONTROLLER_1_PID); +REGISTER_HID_DETECTOR("NZXT RGB Controller", DetectNZXTRGBController, NZXT_VID, NZXT_RGB_CONTROLLER_2_PID); +REGISTER_HID_DETECTOR("NZXT Smart Device V2", DetectNZXTSmartDeviceV2, NZXT_VID, NZXT_SMART_DEVICE_V2_PID); +REGISTER_HID_DETECTOR("NZXT Smart Device V2", DetectNZXTSmartDeviceV2, NZXT_VID, NZXT_SMART_DEVICE_V2_1_PID); +REGISTER_HID_DETECTOR("NZXT Smart Device V2", DetectNZXTSmartDeviceV2, NZXT_VID, NZXT_SMART_DEVICE_V2_2_PID); diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp index 7762084b..f3b2041f 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp @@ -336,6 +336,10 @@ void RGBController_NZXTHue2::SetupZones() device_name = "F360 Core fan case version (360mm)"; break; + case 0x1E: //Kraken Elite Ring + device_name = "Kraken Elite Ring"; + break; + default: break; }