diff --git a/Controllers/RoccatController/RoccatControllerDetect.cpp b/Controllers/RoccatController/RoccatControllerDetect.cpp index 22ca6387..ce9bbf29 100644 --- a/Controllers/RoccatController/RoccatControllerDetect.cpp +++ b/Controllers/RoccatController/RoccatControllerDetect.cpp @@ -20,20 +20,20 @@ #define ROCCAT_VID 0x1E7D -#define ROCCAT_KONE_AIMO_PID 0x2E27 -#define ROCCAT_KONE_AIMO_16K_PID 0x2E2C -#define ROCCAT_VULCAN_120_AIMO_PID 0x3098 -#define ROCCAT_VULCAN_TKL_PID 0x2FEE -#define ROCCAT_MAGMA_PID 0x3124 -#define ROCCAT_MAGMA_MINI_PID 0x69A0 -#define ROCCAT_HORDE_AIMO_PID 0x303E #define ROCCAT_BURST_CORE_PID 0x2DE6 #define ROCCAT_BURST_PRO_PID 0x2DE1 -#define ROCCAT_KOVA_PID 0x2CEE +#define ROCCAT_BURST_PRO_AIR_PID 0x2CA6 #define ROCCAT_ELO_PID 0x3A34 +#define ROCCAT_HORDE_AIMO_PID 0x303E +#define ROCCAT_KONE_AIMO_PID 0x2E27 +#define ROCCAT_KONE_AIMO_16K_PID 0x2E2C +#define ROCCAT_KOVA_PID 0x2CEE +#define ROCCAT_MAGMA_PID 0x3124 +#define ROCCAT_MAGMA_MINI_PID 0x69A0 #define ROCCAT_SENSE_AIMO_MID_PID 0x343A #define ROCCAT_SENSE_AIMO_XXL_PID 0x343B -#define ROCCAT_BURST_PRO_AIR_PID 0x2CA6 +#define ROCCAT_VULCAN_120_AIMO_PID 0x3098 +#define ROCCAT_VULCAN_TKL_PID 0x2FEE void DetectRoccatMouseControllers(hid_device_info* info, const std::string& name) { @@ -148,9 +148,9 @@ void DetectRoccatBurstCoreControllers(hid_device_info* info, const std::string& if(dev) { - RoccatBurstController * controller = new RoccatBurstController(dev, *info); - RGBController_RoccatBurst * rgb_controller = new RGBController_RoccatBurst(controller, ROCCAT_BURST_CORE_NUMBER_OF_LEDS); - rgb_controller->name = name; + RoccatBurstController * controller = new RoccatBurstController(dev, *info); + RGBController_RoccatBurst * rgb_controller = new RGBController_RoccatBurst(controller, ROCCAT_BURST_CORE_NUMBER_OF_LEDS); + rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } } @@ -161,9 +161,9 @@ void DetectRoccatBurstProControllers(hid_device_info* info, const std::string& n if(dev) { - RoccatBurstController * controller = new RoccatBurstController(dev, *info); - RGBController_RoccatBurst * rgb_controller = new RGBController_RoccatBurst(controller, ROCCAT_BURST_PRO_NUMBER_OF_LEDS); - rgb_controller->name = name; + RoccatBurstController * controller = new RoccatBurstController(dev, *info); + RGBController_RoccatBurst * rgb_controller = new RGBController_RoccatBurst(controller, ROCCAT_BURST_PRO_NUMBER_OF_LEDS); + rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } } @@ -174,8 +174,8 @@ void DetectRoccatBurstProAirControllers(hid_device_info* info, const std::string if(dev) { - RoccatBurstProAirController * controller = new RoccatBurstProAirController(dev, *info); - RGBController_RoccatBurstProAir * rgb_controller = new RGBController_RoccatBurstProAir(controller); + RoccatBurstProAirController * controller = new RoccatBurstProAirController(dev, *info); + RGBController_RoccatBurstProAir *rgb_controller = new RGBController_RoccatBurstProAir(controller); rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } @@ -187,9 +187,9 @@ void DetectRoccatKovaControllers(hid_device_info* info, const std::string& name) if(dev) { - RoccatKovaController * controller = new RoccatKovaController(dev, info->path); - RGBController_RoccatKova * rgb_controller = new RGBController_RoccatKova(controller); - rgb_controller->name = name; + RoccatKovaController * controller = new RoccatKovaController(dev, info->path); + RGBController_RoccatKova * rgb_controller = new RGBController_RoccatKova(controller); + rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } } @@ -200,9 +200,9 @@ void DetectRoccatEloControllers(hid_device_info* info, const std::string& name) if(dev) { - RoccatEloController * controller = new RoccatEloController(dev, *info); - RGBController_RoccatElo * rgb_controller = new RGBController_RoccatElo(controller); - rgb_controller->name = name; + RoccatEloController * controller = new RoccatEloController(dev, *info); + RGBController_RoccatElo * rgb_controller = new RGBController_RoccatElo(controller); + rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } } @@ -213,27 +213,27 @@ void DetectRoccatSenseAimoControllers(hid_device_info* info, const std::string& if(dev) { - RoccatSenseAimoController * controller = new RoccatSenseAimoController(dev, info->path); - RGBController_RoccatSenseAimo * rgb_controller = new RGBController_RoccatSenseAimo(controller); - rgb_controller->name = name; + RoccatSenseAimoController * controller = new RoccatSenseAimoController(dev, info->path); + RGBController_RoccatSenseAimo * rgb_controller = new RGBController_RoccatSenseAimo(controller); + rgb_controller->name = name; ResourceManager::get()->RegisterRGBController(rgb_controller); } } REGISTER_PRE_DETECTION_HOOK(ResetRoccatVulcanKeyboardControllersPaths); -REGISTER_HID_DETECTOR_IPU("Roccat Kone Aimo", DetectRoccatMouseControllers, ROCCAT_VID, ROCCAT_KONE_AIMO_PID, 0, 0x0B, 0 ); -REGISTER_HID_DETECTOR_IPU("Roccat Kone Aimo 16K", DetectRoccatMouseControllers, ROCCAT_VID, ROCCAT_KONE_AIMO_16K_PID, 0, 0x0B, 0 ); -REGISTER_HID_DETECTOR_IP ("Roccat Vulcan 120-Series Aimo", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_120_AIMO_PID, 1, 11); -REGISTER_HID_DETECTOR_IP ("Roccat Vulcan TKL", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_TKL_PID, 1, 11); -REGISTER_HID_DETECTOR_IP ("Roccat Magma", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_MAGMA_PID, 1, 0xFF01); -REGISTER_HID_DETECTOR_IP ("Roccat Magma Mini", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_MAGMA_MINI_PID, 1, 0xFF01); -REGISTER_HID_DETECTOR_IPU("Roccat Horde Aimo", DetectRoccatHordeAimoKeyboardControllers, ROCCAT_VID, ROCCAT_HORDE_AIMO_PID, 1, 0x0B, 0 ); -REGISTER_HID_DETECTOR_IPU("Roccat Burst Core", DetectRoccatBurstCoreControllers, ROCCAT_VID, ROCCAT_BURST_CORE_PID, 3, 0xFF01, 1 ); -REGISTER_HID_DETECTOR_IPU("Roccat Burst Pro", DetectRoccatBurstProControllers, ROCCAT_VID, ROCCAT_BURST_PRO_PID, 3, 0xFF01, 1 ); -REGISTER_HID_DETECTOR_IPU("Roccat Kova", DetectRoccatKovaControllers, ROCCAT_VID, ROCCAT_KOVA_PID, 0, 0x0B, 0 ); -REGISTER_HID_DETECTOR_IPU("Roccat Elo 7.1", DetectRoccatEloControllers, ROCCAT_VID, ROCCAT_ELO_PID, 3, 0x0C, 1 ); -REGISTER_HID_DETECTOR_IPU("Roccat Sense Aimo Mid", DetectRoccatSenseAimoControllers, ROCCAT_VID, ROCCAT_SENSE_AIMO_MID_PID, 0, 0xFF01, 1 ); -REGISTER_HID_DETECTOR_IPU("Roccat Sense Aimo XXL", DetectRoccatSenseAimoControllers, ROCCAT_VID, ROCCAT_SENSE_AIMO_XXL_PID, 0, 0xFF01, 1 ); -REGISTER_HID_DETECTOR_IPU("Roccat Burst Pro Air", DetectRoccatBurstProAirControllers, ROCCAT_VID, ROCCAT_BURST_PRO_AIR_PID, 0, 0x01, 2); +REGISTER_HID_DETECTOR_IPU("Roccat Burst Core", DetectRoccatBurstCoreControllers, ROCCAT_VID, ROCCAT_BURST_CORE_PID, 3, 0xFF01, 1 ); +REGISTER_HID_DETECTOR_IPU("Roccat Burst Pro", DetectRoccatBurstProControllers, ROCCAT_VID, ROCCAT_BURST_PRO_PID, 3, 0xFF01, 1 ); +REGISTER_HID_DETECTOR_IPU("Roccat Burst Pro Air", DetectRoccatBurstProAirControllers, ROCCAT_VID, ROCCAT_BURST_PRO_AIR_PID, 0, 0x01, 2 ); +REGISTER_HID_DETECTOR_IPU("Roccat Elo 7.1", DetectRoccatEloControllers, ROCCAT_VID, ROCCAT_ELO_PID, 3, 0x0C, 1 ); +REGISTER_HID_DETECTOR_IPU("Roccat Horde Aimo", DetectRoccatHordeAimoKeyboardControllers, ROCCAT_VID, ROCCAT_HORDE_AIMO_PID, 1, 0x0B, 0 ); +REGISTER_HID_DETECTOR_IPU("Roccat Kone Aimo", DetectRoccatMouseControllers, ROCCAT_VID, ROCCAT_KONE_AIMO_PID, 0, 0x0B, 0 ); +REGISTER_HID_DETECTOR_IPU("Roccat Kova", DetectRoccatKovaControllers, ROCCAT_VID, ROCCAT_KOVA_PID, 0, 0x0B, 0 ); +REGISTER_HID_DETECTOR_IPU("Roccat Kone Aimo 16K", DetectRoccatMouseControllers, ROCCAT_VID, ROCCAT_KONE_AIMO_16K_PID, 0, 0x0B, 0 ); +REGISTER_HID_DETECTOR_IP ("Roccat Magma", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_MAGMA_PID, 1, 0xFF01 ); +REGISTER_HID_DETECTOR_IP ("Roccat Magma Mini", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_MAGMA_MINI_PID, 1, 0xFF01 ); +REGISTER_HID_DETECTOR_IPU("Roccat Sense Aimo Mid", DetectRoccatSenseAimoControllers, ROCCAT_VID, ROCCAT_SENSE_AIMO_MID_PID, 0, 0xFF01, 1 ); +REGISTER_HID_DETECTOR_IPU("Roccat Sense Aimo XXL", DetectRoccatSenseAimoControllers, ROCCAT_VID, ROCCAT_SENSE_AIMO_XXL_PID, 0, 0xFF01, 1 ); +REGISTER_HID_DETECTOR_IP ("Roccat Vulcan 120-Series Aimo", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_120_AIMO_PID, 1, 0x0B ); +REGISTER_HID_DETECTOR_IP ("Roccat Vulcan TKL", DetectRoccatVulcanKeyboardControllers, ROCCAT_VID, ROCCAT_VULCAN_TKL_PID, 1, 0x0B ); diff --git a/OpenRGB.pro b/OpenRGB.pro index a84673ae..5f1ba77c 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -715,16 +715,16 @@ HEADERS += Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyrox.h \ Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyroxTKLClassic.h \ Controllers/RoccatController/RGBController_RoccatBurst.h \ - Controllers/RoccatController/RGBController_RoccatElo.h \ Controllers/RoccatController/RGBController_RoccatBurstProAir.h \ + Controllers/RoccatController/RGBController_RoccatElo.h \ Controllers/RoccatController/RGBController_RoccatHordeAimo.h \ Controllers/RoccatController/RGBController_RoccatKoneAimo.h \ Controllers/RoccatController/RGBController_RoccatKova.h \ Controllers/RoccatController/RGBController_RoccatSenseAimo.h \ Controllers/RoccatController/RGBController_RoccatVulcanKeyboard.h \ Controllers/RoccatController/RoccatBurstController.h \ - Controllers/RoccatController/RoccatEloController.h \ Controllers/RoccatController/RoccatBurstProAirController.h \ + Controllers/RoccatController/RoccatEloController.h \ Controllers/RoccatController/RoccatHordeAimoController.h \ Controllers/RoccatController/RoccatKoneAimoController.h \ Controllers/RoccatController/RoccatKovaController.h \ @@ -1452,16 +1452,16 @@ SOURCES += Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyrox.cpp \ Controllers/RedSquareKeyroxController/RGBController_RedSquareKeyroxTKLClassic.cpp \ Controllers/RoccatController/RGBController_RoccatBurst.cpp \ - Controllers/RoccatController/RGBController_RoccatElo.cpp \ Controllers/RoccatController/RGBController_RoccatBurstProAir.cpp \ + Controllers/RoccatController/RGBController_RoccatElo.cpp \ Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp \ Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp \ Controllers/RoccatController/RGBController_RoccatKova.cpp \ Controllers/RoccatController/RGBController_RoccatSenseAimo.cpp \ Controllers/RoccatController/RGBController_RoccatVulcanKeyboard.cpp \ Controllers/RoccatController/RoccatBurstController.cpp \ - Controllers/RoccatController/RoccatEloController.cpp \ Controllers/RoccatController/RoccatBurstProAirController.cpp \ + Controllers/RoccatController/RoccatEloController.cpp \ Controllers/RoccatController/RoccatHordeAimoController.cpp \ Controllers/RoccatController/RoccatKoneAimoController.cpp \ Controllers/RoccatController/RoccatKovaController.cpp \