diff --git a/Controllers/RazerController/RazerControllerDetect.cpp b/Controllers/RazerController/RazerControllerDetect.cpp index 562ae3b87..d2f0196f3 100644 --- a/Controllers/RazerController/RazerControllerDetect.cpp +++ b/Controllers/RazerController/RazerControllerDetect.cpp @@ -339,7 +339,9 @@ REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1 Chroma", Det REGISTER_HID_DETECTOR_IPU("Razer Kraken 7.1 V2", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_V2_PID, 0x03, 0x0C, 0x01); REGISTER_HID_DETECTOR_IPU("Razer Kraken Kitty Edition", DetectRazerControllers, RAZER_VID, RAZER_KRAKEN_KITTY_EDITION_PID, 0x01, 0x01, 0x03); REGISTER_HID_DETECTOR_IPU("Razer Kraken Kitty Black Edition", DetectRazerControllers, RAZER_VID, RAZER_KRAKEN_KITTY_BLACK_EDITION_PID, 0x01, 0x01, 0x03); +REGISTER_HID_DETECTOR_IPU("Razer Kraken Kitty V2 Pro", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_KITTY_V2_PRO_PID, 0x03, 0x0C, 0x01); REGISTER_HID_DETECTOR_IPU("Razer Kraken Kitty Black Edition V2", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_KITTY_BLACK_EDITION_V2_PID, 0x03, 0x0C, 0x01); +REGISTER_HID_DETECTOR_IPU("Razer Kraken Kitty V2 BT", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_KITTY_V2_BT_PID, 0x03, 0x0C, 0x01); REGISTER_HID_DETECTOR_IPU("Razer Kraken Ultimate", DetectRazerKrakenControllers, RAZER_VID, RAZER_KRAKEN_ULTIMATE_PID, 0x03, 0x0C, 0x01); REGISTER_HID_DETECTOR_I( "Razer Tiamat 7.1 V2", DetectRazerControllers, RAZER_VID, RAZER_TIAMAT_71_V2_PID, 0x00 ); diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h index 373a92675..40a50f74d 100644 --- a/Controllers/RazerController/RazerDevices.h +++ b/Controllers/RazerController/RazerDevices.h @@ -222,7 +222,9 @@ #define RAZER_KRAKEN_PID 0x0504 #define RAZER_KRAKEN_ULTIMATE_PID 0x0527 #define RAZER_KRAKEN_V2_PID 0x0510 +#define RAZER_KRAKEN_KITTY_V2_PRO_PID 0x0554 #define RAZER_KRAKEN_KITTY_BLACK_EDITION_V2_PID 0x0560 +#define RAZER_KRAKEN_KITTY_V2_BT_PID 0x0562 #define RAZER_TIAMAT_71_V2_PID 0x0F03 /*-----------------------------------------------------*\ diff --git a/Controllers/RazerController/RazerKrakenController/RazerKrakenController.cpp b/Controllers/RazerController/RazerKrakenController/RazerKrakenController.cpp index 7ff0a9480..235ca1d84 100644 --- a/Controllers/RazerController/RazerKrakenController/RazerKrakenController.cpp +++ b/Controllers/RazerController/RazerKrakenController/RazerKrakenController.cpp @@ -43,7 +43,9 @@ RazerKrakenController::RazerKrakenController(hid_device* dev_handle, const char* switch(dev_pid) { case RAZER_KRAKEN_V2_PID: + case RAZER_KRAKEN_KITTY_V2_PRO_PID: case RAZER_KRAKEN_KITTY_BLACK_EDITION_V2_PID: + case RAZER_KRAKEN_KITTY_V2_BT_PID: case RAZER_KRAKEN_ULTIMATE_PID: led_mode_address = 0x172D; custom_address = 0x1189; diff --git a/ResourceManager.cpp b/ResourceManager.cpp index d06c47391..344ae7955 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -120,6 +120,7 @@ ResourceManager::ResourceManager() detection_percent = 100; detection_string = ""; detection_is_required = false; + DetectDevicesThread = nullptr; dynamic_detectors_processed = false; init_finished = false; background_thread_running = true; diff --git a/ResourceManager.h b/ResourceManager.h index 7b27d2055..92afc0fcc 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -291,6 +291,7 @@ class ResourceManager: public ResourceManagerInterface | Detection Thread and Detection State | \*-------------------------------------------------------------------------------------*/ std::thread * DetectDevicesThread; + std::thread * DetectDevicesThread; // Used for rescan std::mutex DetectDeviceMutex; std::function ScheduledBackgroundFunction; std::mutex BackgroundThreadStateMutex; diff --git a/ResourceManager.o b/ResourceManager.o new file mode 100644 index 000000000..c9043a93e Binary files /dev/null and b/ResourceManager.o differ