From dafc6e9cbc2121a4ee027aa648ab7b13f1fcce50 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Wed, 22 Jul 2026 11:37:15 -0500 Subject: [PATCH] Split Bloody/A4Tech detector file into individual files per controller --- .../A4TechController/A4Tech_Detector.cpp | 66 ------------------- .../BloodyB820RControllerDetect.cpp | 40 +++++++++++ .../BloodyMouseControllerDetect.cpp | 44 +++++++++++++ 3 files changed, 84 insertions(+), 66 deletions(-) delete mode 100644 Controllers/A4TechController/A4Tech_Detector.cpp create mode 100644 Controllers/A4TechController/BloodyB820RController/BloodyB820RControllerDetect.cpp create mode 100644 Controllers/A4TechController/BloodyMouseController/BloodyMouseControllerDetect.cpp diff --git a/Controllers/A4TechController/A4Tech_Detector.cpp b/Controllers/A4TechController/A4Tech_Detector.cpp deleted file mode 100644 index 63d4d6d39..000000000 --- a/Controllers/A4TechController/A4Tech_Detector.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/*---------------------------------------------------------*\ -| A4TechDetector.cpp | -| | -| Detector for A4Tech Devices | -| | -| Chris M (Dr_No) 30 Jun 2022 | -| Mohammed Julfikar Ali Mahbub (o-julfikar) 01 Apr 2024 | -| | -| This file is part of the OpenRGB project | -| SPDX-License-Identifier: GPL-2.0-or-later | -\*---------------------------------------------------------*/ - -#include -#include "BloodyB820RController.h" -#include "BloodyMouseController.h" -#include "DetectionManager.h" -#include "RGBController_BloodyB820R.h" -#include "RGBController_BloodyMouse.h" - -/*---------------------------------------------------------*\ -| A4 Tech USB vendor ID | -\*---------------------------------------------------------*/ -#define A4_TECH_VID 0x09DA - -DetectedControllers DetectA4TechMouseControllers(hid_device_info* info, const std::string& name) -{ - DetectedControllers detected_controllers; - hid_device* dev; - - dev = hid_open_path(info->path); - - if(dev) - { - BloodyMouseController* controller = new BloodyMouseController(dev, info->path, info->product_id, name); - RGBController_BloodyMouse* rgb_controller = new RGBController_BloodyMouse(controller); - - detected_controllers.push_back(rgb_controller); - } - - return(detected_controllers); -} - -DetectedControllers DetectBloodyB820R(hid_device_info* info, const std::string& name) -{ - DetectedControllers detected_controllers; - hid_device* dev; - - dev = hid_open_path(info->path); - - if(dev) - { - BloodyB820RController* controller = new BloodyB820RController(dev, info->path, name); - RGBController_BloodyB820R* rgb_controller = new RGBController_BloodyB820R(controller); - - detected_controllers.push_back(rgb_controller); - } - - return(detected_controllers); -} - -REGISTER_HID_DETECTOR_IPU("Bloody W60 Pro", DetectA4TechMouseControllers, A4_TECH_VID, BLOODY_W60_PRO_PID, 2, 0xFF33, 0x0529); -REGISTER_HID_DETECTOR_IPU("Bloody W70 Max", DetectA4TechMouseControllers, A4_TECH_VID, BLOODY_W70_MAX_PID, 2, 0xFF33, 0x0518); -REGISTER_HID_DETECTOR_IPU("Bloody W90 Max", DetectA4TechMouseControllers, A4_TECH_VID, BLOODY_W90_MAX_PID, 2, 0xFF33, 0x053D); -REGISTER_HID_DETECTOR_IPU("Bloody W90 Pro", DetectA4TechMouseControllers, A4_TECH_VID, BLOODY_W90_PRO_PID, 2, 0xFF33, 0x054D); -REGISTER_HID_DETECTOR_IPU("Bloody MP 50RS", DetectA4TechMouseControllers, A4_TECH_VID, BLOODY_MP_50RS_PID, 2, 0xFFF2, 0x6009); -REGISTER_HID_DETECTOR_IPU("Bloody B820R", DetectBloodyB820R, A4_TECH_VID, BLOODY_B820R_PID, 2, 0xFF52, 0x0210); diff --git a/Controllers/A4TechController/BloodyB820RController/BloodyB820RControllerDetect.cpp b/Controllers/A4TechController/BloodyB820RController/BloodyB820RControllerDetect.cpp new file mode 100644 index 000000000..1368e8922 --- /dev/null +++ b/Controllers/A4TechController/BloodyB820RController/BloodyB820RControllerDetect.cpp @@ -0,0 +1,40 @@ +/*---------------------------------------------------------*\ +| BloodyB820RControllerDetect.cpp | +| | +| Detector for Bloody B820R Devices | +| | +| Mohammed Julfikar Ali Mahbub (o-julfikar) 01 Apr 2024 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-or-later | +\*---------------------------------------------------------*/ + +#include +#include "BloodyB820RController.h" +#include "DetectionManager.h" +#include "RGBController_BloodyB820R.h" + +/*---------------------------------------------------------*\ +| A4 Tech USB vendor ID | +\*---------------------------------------------------------*/ +#define A4_TECH_VID 0x09DA + +DetectedControllers DetectBloodyB820R(hid_device_info* info, const std::string& name) +{ + DetectedControllers detected_controllers; + hid_device* dev; + + dev = hid_open_path(info->path); + + if(dev) + { + BloodyB820RController* controller = new BloodyB820RController(dev, info->path, name); + RGBController_BloodyB820R* rgb_controller = new RGBController_BloodyB820R(controller); + + detected_controllers.push_back(rgb_controller); + } + + return(detected_controllers); +} + +REGISTER_HID_DETECTOR_IPU("Bloody B820R", DetectBloodyB820R, A4_TECH_VID, BLOODY_B820R_PID, 2, 0xFF52, 0x0210); diff --git a/Controllers/A4TechController/BloodyMouseController/BloodyMouseControllerDetect.cpp b/Controllers/A4TechController/BloodyMouseController/BloodyMouseControllerDetect.cpp new file mode 100644 index 000000000..8697804e4 --- /dev/null +++ b/Controllers/A4TechController/BloodyMouseController/BloodyMouseControllerDetect.cpp @@ -0,0 +1,44 @@ +/*---------------------------------------------------------*\ +| BloodyMouseControllerDetect.cpp | +| | +| Detector for Bloody Mouse Devices | +| | +| Chris M (Dr_No) 30 Jun 2022 | +| | +| This file is part of the OpenRGB project | +| SPDX-License-Identifier: GPL-2.0-or-later | +\*---------------------------------------------------------*/ + +#include +#include "BloodyMouseController.h" +#include "DetectionManager.h" +#include "RGBController_BloodyMouse.h" + +/*---------------------------------------------------------*\ +| A4 Tech USB vendor ID | +\*---------------------------------------------------------*/ +#define A4_TECH_VID 0x09DA + +DetectedControllers DetectBloodyMouseControllers(hid_device_info* info, const std::string& name) +{ + DetectedControllers detected_controllers; + hid_device* dev; + + dev = hid_open_path(info->path); + + if(dev) + { + BloodyMouseController* controller = new BloodyMouseController(dev, info->path, info->product_id, name); + RGBController_BloodyMouse* rgb_controller = new RGBController_BloodyMouse(controller); + + detected_controllers.push_back(rgb_controller); + } + + return(detected_controllers); +} + +REGISTER_HID_DETECTOR_IPU("Bloody W60 Pro", DetectBloodyMouseControllers, A4_TECH_VID, BLOODY_W60_PRO_PID, 2, 0xFF33, 0x0529); +REGISTER_HID_DETECTOR_IPU("Bloody W70 Max", DetectBloodyMouseControllers, A4_TECH_VID, BLOODY_W70_MAX_PID, 2, 0xFF33, 0x0518); +REGISTER_HID_DETECTOR_IPU("Bloody W90 Max", DetectBloodyMouseControllers, A4_TECH_VID, BLOODY_W90_MAX_PID, 2, 0xFF33, 0x053D); +REGISTER_HID_DETECTOR_IPU("Bloody W90 Pro", DetectBloodyMouseControllers, A4_TECH_VID, BLOODY_W90_PRO_PID, 2, 0xFF33, 0x054D); +REGISTER_HID_DETECTOR_IPU("Bloody MP 50RS", DetectBloodyMouseControllers, A4_TECH_VID, BLOODY_MP_50RS_PID, 2, 0xFFF2, 0x6009);