jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store name in BloodyB820RController to avoid setting it in detector

Browse source
This commit is contained in:
Adam Honse 2025-08-01 11:37:40 -05:00
parent 9c26f79ca6
commit b8628bb495
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Controllers/A4TechController/A4Tech_Detector.cpp
View file

@ -46,9 +46,8 @@ void DetectBloodyB820R(hid_device_info* info, const std::string& name)
if(dev) if(dev)
{ {
BloodyB820RController* controller = new BloodyB820RController(dev, info->path); BloodyB820RController* controller = new BloodyB820RController(dev, info->path, name);
RGBController_BloodyB820R* rgb_controller = new RGBController_BloodyB820R(controller); RGBController_BloodyB820R* rgb_controller = new RGBController_BloodyB820R(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller); ResourceManager::get()->RegisterRGBController(rgb_controller);
} }

8
Controllers/A4TechController/BloodyB820RController/BloodyB820RController.cpp
View file

@ -20,10 +20,11 @@
| the second packet. | | the second packet. |
\*-------------------------------------------------------------------------------------*/ \*-------------------------------------------------------------------------------------*/
BloodyB820RController::BloodyB820RController(hid_device* dev_handle, const char* path) BloodyB820RController::BloodyB820RController(hid_device* dev_handle, const char* path, std::string dev_name)
{ {
dev = dev_handle; dev = dev_handle;
location = path; location = path;
name = dev_name;
SendControlPacket(BLOODY_B820R_GAIN_CONTROL); SendControlPacket(BLOODY_B820R_GAIN_CONTROL);
} }
@ -52,6 +53,11 @@ std::string BloodyB820RController::GetLocation()
return("HID: " + location); return("HID: " + location);
} }
std::string BloodyB820RController::GetName()
{
return(name);
}
void BloodyB820RController::SendControlPacket(uint8_t data) void BloodyB820RController::SendControlPacket(uint8_t data)
{ {
uint8_t buffer[BLOODY_B820R_PACKET_SIZE] = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 }; uint8_t buffer[BLOODY_B820R_PACKET_SIZE] = { 0x07, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 };

4
Controllers/A4TechController/BloodyB820RController/BloodyB820RController.h
View file

@ -39,15 +39,17 @@ enum
class BloodyB820RController class BloodyB820RController
{ {
public: public:
BloodyB820RController(hid_device* dev_handle, const char* path); BloodyB820RController(hid_device* dev_handle, const char* path, std::string dev_name);
~BloodyB820RController(); ~BloodyB820RController();
std::string GetSerial(); std::string GetSerial();
std::string GetLocation(); std::string GetLocation();
std::string GetName();
void SetLEDDirect(std::vector<RGBColor> colors); void SetLEDDirect(std::vector<RGBColor> colors);
void SendControlPacket(uint8_t data); void SendControlPacket(uint8_t data);
private: private:
std::string location; std::string location;
std::string name;
hid_device* dev; hid_device* dev;
}; };

2
Controllers/A4TechController/BloodyB820RController/RGBController_BloodyB820R.cpp
View file

@ -154,7 +154,7 @@ RGBController_BloodyB820R::RGBController_BloodyB820R(BloodyB820RController *cont
{ {
controller = controller_ptr; controller = controller_ptr;
name = "Bloody B820R"; name = controller->GetName();
vendor = "A4Tech"; vendor = "A4Tech";
type = DEVICE_TYPE_KEYBOARD; type = DEVICE_TYPE_KEYBOARD;
description = "A4Tech Bloody Keyboard"; description = "A4Tech Bloody Keyboard";