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

Don't override name in HoltekControllerDetect, names are generic so not saving them in Controller

Browse source
This commit is contained in:
Adam Honse 2025-08-10 16:17:36 -05:00
parent ee66121364
commit aa31e21868
3 changed files with 54 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Controllers/HoltekController/HoltekA070Controller/RGBController_HoltekA070.cpp
View file

@ -24,29 +24,29 @@
RGBController_HoltekA070::RGBController_HoltekA070(HoltekA070Controller* controller_ptr)
{
controller = controller_ptr;
controller = controller_ptr;
name = "Holtek USB Gaming Mouse Device";
vendor = "Holtek";
type = DEVICE_TYPE_MOUSE;
description = "Holtek USB Gaming Mouse Device";
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
name = "Holtek USB Gaming Mouse";
vendor = "Holtek";
type = DEVICE_TYPE_MOUSE;
description = "Holtek USB Gaming Mouse Device";
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
mode Static;
Static.name = "Static";
Static.speed = HOLTEK_A070_MODE_STATIC;
Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
Static.color_mode = MODE_COLORS_PER_LED;
Static.name = "Static";
Static.speed = HOLTEK_A070_MODE_STATIC;
Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
Static.color_mode = MODE_COLORS_PER_LED;
modes.push_back(Static);
mode Breathing;
Breathing.name = "Breathing";
Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
Breathing.color_mode = MODE_COLORS_PER_LED;
Breathing.speed_min = HOLTEK_A070_MODE_BREATHING_SLOW;
Breathing.speed_max = HOLTEK_A070_MODE_BREATHING_FAST;
Breathing.speed = HOLTEK_A070_MODE_BREATHING_MEDIUM;
Breathing.name = "Breathing";
Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
Breathing.color_mode = MODE_COLORS_PER_LED;
Breathing.speed_min = HOLTEK_A070_MODE_BREATHING_SLOW;
Breathing.speed_max = HOLTEK_A070_MODE_BREATHING_FAST;
Breathing.speed = HOLTEK_A070_MODE_BREATHING_MEDIUM;
modes.push_back(Breathing);
SetupZones();

74
Controllers/HoltekController/HoltekA1FAController/RGBController_HoltekA1FA.cpp
View file

@ -24,57 +24,57 @@
RGBController_HoltekA1FA::RGBController_HoltekA1FA(HoltekA1FAController* controller_ptr)
{
controller = controller_ptr;
controller = controller_ptr;
name = "Holtek Mousemat Device";
vendor = "Holtek";
type = DEVICE_TYPE_MOUSEMAT;
description = "Holtek Mousemat Device";
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
name = "Holtek Mousemat";
vendor = "Holtek";
type = DEVICE_TYPE_MOUSEMAT;
description = "Holtek Mousemat Device";
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
mode Static;
Static.name = "Static";
Static.value = HOLTEK_A1FA_MODE_STATIC;
Static.speed = HOLTEK_A1FA_MODE_STATIC;
Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
Static.color_mode = MODE_COLORS_PER_LED;
Static.colors_min = 1;
Static.colors_max = 7;
Static.name = "Static";
Static.value = HOLTEK_A1FA_MODE_STATIC;
Static.speed = HOLTEK_A1FA_MODE_STATIC;
Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS;
Static.color_mode = MODE_COLORS_PER_LED;
Static.colors_min = 1;
Static.colors_max = 7;
Static.colors.resize(7);
modes.push_back(Static);
mode Breathing;
Breathing.name = "Breathing";
Breathing.value = HOLTEK_A1FA_MODE_BREATHING;
Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_RANDOM_COLOR;
Breathing.color_mode = MODE_COLORS_PER_LED;
Breathing.speed_min = HOLTEK_A1FA_SPEED_SLOWEST;
Breathing.speed_max = HOLTEK_A1FA_SPEED_FASTEST;
Breathing.speed = HOLTEK_A1FA_SPEED_NORMAL;
Breathing.colors_min = 1;
Breathing.colors_max = 7;
Breathing.name = "Breathing";
Breathing.value = HOLTEK_A1FA_MODE_BREATHING;
Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_RANDOM_COLOR;
Breathing.color_mode = MODE_COLORS_PER_LED;
Breathing.speed_min = HOLTEK_A1FA_SPEED_SLOWEST;
Breathing.speed_max = HOLTEK_A1FA_SPEED_FASTEST;
Breathing.speed = HOLTEK_A1FA_SPEED_NORMAL;
Breathing.colors_min = 1;
Breathing.colors_max = 7;
Breathing.colors.resize(7);
modes.push_back(Breathing);
mode Neon;
Neon.name = "Neon";
Neon.value = HOLTEK_A1FA_MODE_NEON;
Neon.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
Neon.color_mode = MODE_COLORS_NONE;
Neon.speed_min = HOLTEK_A1FA_SPEED_SLOWEST;
Neon.speed_max = HOLTEK_A1FA_SPEED_FASTEST;
Neon.speed = HOLTEK_A1FA_SPEED_NORMAL;
Neon.name = "Neon";
Neon.value = HOLTEK_A1FA_MODE_NEON;
Neon.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
Neon.color_mode = MODE_COLORS_NONE;
Neon.speed_min = HOLTEK_A1FA_SPEED_SLOWEST;
Neon.speed_max = HOLTEK_A1FA_SPEED_FASTEST;
Neon.speed = HOLTEK_A1FA_SPEED_NORMAL;
modes.push_back(Neon);
mode Rainbow;
Rainbow.name = "Rainbow";
Rainbow.value = HOLTEK_A1FA_MODE_RAINBOW;
Rainbow.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
Rainbow.color_mode = MODE_COLORS_NONE;
Rainbow.speed_min = HOLTEK_A1FA_SPEED_SLOWEST;
Rainbow.speed_max = HOLTEK_A1FA_SPEED_FASTEST;
Rainbow.speed = HOLTEK_A1FA_SPEED_NORMAL;
Rainbow.name = "Rainbow";
Rainbow.value = HOLTEK_A1FA_MODE_RAINBOW;
Rainbow.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS;
Rainbow.color_mode = MODE_COLORS_NONE;
Rainbow.speed_min = HOLTEK_A1FA_SPEED_SLOWEST;
Rainbow.speed_max = HOLTEK_A1FA_SPEED_FASTEST;
Rainbow.speed = HOLTEK_A1FA_SPEED_NORMAL;
modes.push_back(Rainbow);
SetupZones();

2
Controllers/HoltekController/HoltekControllerDetect.cpp
View file

@ -35,7 +35,6 @@ void DetectHoltekControllers(hid_device_info* info, const std::string& name)
{
HoltekA070Controller* controller = new HoltekA070Controller(dev, info->path);
RGBController_HoltekA070* rgb_controller = new RGBController_HoltekA070(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
@ -49,7 +48,6 @@ void DetectHoltekMousemats(hid_device_info *info, const std::string &name)
{
HoltekA1FAController* controller = new HoltekA1FAController(dev, info->path);
RGBController_HoltekA1FA* rgb_controller = new RGBController_HoltekA1FA(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}