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

Store name in IonicoController to avoid setting it in detector

Browse source
This commit is contained in:
Adam Honse 2025-08-11 18:07:13 -05:00
parent 0bdf600409
commit ca73941e5d
4 changed files with 52 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Controllers/IonicoController/IonicoController.cpp
View file

@ -12,11 +12,12 @@
#include <string.h>
#include "IonicoController.h"
IonicoController::IonicoController(hid_device* dev_handle, const hid_device_info& info, const unsigned short pid)
IonicoController::IonicoController(hid_device* dev_handle, const hid_device_info& info, const unsigned short pid, std::string dev_name)
{
dev = dev_handle;
location = info.path;
usb_pid = pid;
name = dev_name;
}
IonicoController::~IonicoController()
@ -29,6 +30,11 @@ std::string IonicoController::GetDeviceLocation()
return("HID: " + location);
}
std::string IonicoController::GetDeviceName()
{
return(name);
}
uint16_t IonicoController::GetUSBPID()
{
return(usb_pid);

5
Controllers/IonicoController/IonicoController.h
View file

@ -41,10 +41,11 @@ enum
class IonicoController
{
public:
IonicoController(hid_device* dev_handle, const hid_device_info& info, const unsigned short pid);
IonicoController(hid_device* dev_handle, const hid_device_info& info, const unsigned short pid, std::string dev_name);
~IonicoController();
std::string GetDeviceLocation();
std::string GetDeviceName();
void SetMode(uint8_t mode_value, uint8_t brightness, uint8_t speed);
void SetColors(int device, std::vector<RGBColor> array_colors, bool is_mode);
@ -55,7 +56,7 @@ class IonicoController
private:
hid_device* dev;
std::string location;
std::string name;
std::string serial_number;
std::string version;
uint16_t usb_pid;
};

3
Controllers/IonicoController/IonicoControllerDetect.cpp
View file

@ -34,9 +34,8 @@ void DetectIonicoControllers(hid_device_info* info, const std::string& name)
if(dev)
{
IonicoController* controller = new IonicoController(dev, *info, info->product_id);
IonicoController* controller = new IonicoController(dev, *info, info->product_id, name);
RGBController_Ionico* rgb_controller = new RGBController_Ionico(controller);
rgb_controller->name = name;
if(info->product_id == IONICO_KB_PID)
{

81
Controllers/IonicoController/RGBController_Ionico.cpp
View file

@ -26,7 +26,8 @@
RGBController_Ionico::RGBController_Ionico(IonicoController* controller_ptr)
{
controller = controller_ptr;
name = "Ionico";
name = controller->GetDeviceName();
vendor = "Pcspecialist";
description = name;
location = controller->GetDeviceLocation();
@ -43,21 +44,21 @@ RGBController_Ionico::RGBController_Ionico(IonicoController* controller_ptr)
modes.push_back(Direct);
mode Breathing;
Breathing.name = "Breathing";
Breathing.value = IONICO_MODE_BREATHING;
Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
Breathing.speed_min = IONICO_DIRECT_SPEED_MIN;
Breathing.speed_max = IONICO_DIRECT_SPEED_MAX;
Breathing.speed = IONICO_DIRECT_SPEED_DEFAULT;
Breathing.brightness_min = IONICO_DIRECT_BRIGHTNESS_MIN;
Breathing.brightness_max = IONICO_DIRECT_BRIGHTNESS_MAX;
Breathing.brightness = IONICO_DIRECT_BRIGHTNESS_MAX;
Breathing.name = "Breathing";
Breathing.value = IONICO_MODE_BREATHING;
Breathing.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC;
Breathing.speed_min = IONICO_DIRECT_SPEED_MIN;
Breathing.speed_max = IONICO_DIRECT_SPEED_MAX;
Breathing.speed = IONICO_DIRECT_SPEED_DEFAULT;
Breathing.brightness_min = IONICO_DIRECT_BRIGHTNESS_MIN;
Breathing.brightness_max = IONICO_DIRECT_BRIGHTNESS_MAX;
Breathing.brightness = IONICO_DIRECT_BRIGHTNESS_MAX;
Breathing.colors.resize(7);
modes.push_back(Breathing);
mode Wave;
Wave.name = "Wave";
Wave.name = "Wave";
if(controller->GetUSBPID() == IONICO_KB_PID)
{
Wave.value = IONICO_MODE_WAVE;
@ -66,30 +67,30 @@ RGBController_Ionico::RGBController_Ionico(IonicoController* controller_ptr)
{
Wave.value = IONICO_FB_MODE_WAVE;
}
Wave.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
Wave.color_mode = MODE_COLORS_MODE_SPECIFIC;
Wave.speed_min = IONICO_DIRECT_SPEED_MIN;
Wave.speed_max = IONICO_DIRECT_SPEED_MAX;
Wave.speed = IONICO_DIRECT_SPEED_DEFAULT;
Wave.brightness_min = IONICO_DIRECT_BRIGHTNESS_MIN;
Wave.brightness_max = IONICO_DIRECT_BRIGHTNESS_MAX;
Wave.brightness = IONICO_DIRECT_BRIGHTNESS_MAX;
Wave.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
Wave.color_mode = MODE_COLORS_MODE_SPECIFIC;
Wave.speed_min = IONICO_DIRECT_SPEED_MIN;
Wave.speed_max = IONICO_DIRECT_SPEED_MAX;
Wave.speed = IONICO_DIRECT_SPEED_DEFAULT;
Wave.brightness_min = IONICO_DIRECT_BRIGHTNESS_MIN;
Wave.brightness_max = IONICO_DIRECT_BRIGHTNESS_MAX;
Wave.brightness = IONICO_DIRECT_BRIGHTNESS_MAX;
Wave.colors.resize(7);
modes.push_back(Wave);
if(controller->GetUSBPID() == IONICO_KB_PID)
{
mode Flash;
Flash.name = "Flashing";
Flash.value = IONICO_MODE_FLASH;
Flash.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
Flash.color_mode = MODE_COLORS_MODE_SPECIFIC;
Flash.speed_min = IONICO_DIRECT_SPEED_MIN;
Flash.speed_max = IONICO_DIRECT_SPEED_MAX;
Flash.speed = IONICO_DIRECT_SPEED_DEFAULT;
Flash.brightness_min = IONICO_DIRECT_BRIGHTNESS_MIN;
Flash.brightness_max = IONICO_DIRECT_BRIGHTNESS_MAX;
Flash.brightness = IONICO_DIRECT_BRIGHTNESS_MAX;
Flash.name = "Flashing";
Flash.value = IONICO_MODE_FLASH;
Flash.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
Flash.color_mode = MODE_COLORS_MODE_SPECIFIC;
Flash.speed_min = IONICO_DIRECT_SPEED_MIN;
Flash.speed_max = IONICO_DIRECT_SPEED_MAX;
Flash.speed = IONICO_DIRECT_SPEED_DEFAULT;
Flash.brightness_min = IONICO_DIRECT_BRIGHTNESS_MIN;
Flash.brightness_max = IONICO_DIRECT_BRIGHTNESS_MAX;
Flash.brightness = IONICO_DIRECT_BRIGHTNESS_MAX;
Flash.colors.resize(7);
modes.push_back(Flash);
}
@ -97,16 +98,16 @@ RGBController_Ionico::RGBController_Ionico(IonicoController* controller_ptr)
if(controller->GetUSBPID() == IONICO_FB_PID)
{
mode Raindrops;
Raindrops.name = "Raindrops";
Raindrops.value = IONICO_MODE_RAIN;
Raindrops.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
Raindrops.color_mode = MODE_COLORS_MODE_SPECIFIC;
Raindrops.speed_min = IONICO_DIRECT_SPEED_MIN;
Raindrops.speed_max = IONICO_DIRECT_SPEED_MAX;
Raindrops.speed = IONICO_DIRECT_SPEED_DEFAULT;
Raindrops.brightness_min = IONICO_DIRECT_BRIGHTNESS_MIN;
Raindrops.brightness_max = IONICO_DIRECT_BRIGHTNESS_MAX;
Raindrops.brightness = IONICO_DIRECT_BRIGHTNESS_MAX;
Raindrops.name = "Raindrops";
Raindrops.value = IONICO_MODE_RAIN;
Raindrops.flags = MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_MANUAL_SAVE;
Raindrops.color_mode = MODE_COLORS_MODE_SPECIFIC;
Raindrops.speed_min = IONICO_DIRECT_SPEED_MIN;
Raindrops.speed_max = IONICO_DIRECT_SPEED_MAX;
Raindrops.speed = IONICO_DIRECT_SPEED_DEFAULT;
Raindrops.brightness_min = IONICO_DIRECT_BRIGHTNESS_MIN;
Raindrops.brightness_max = IONICO_DIRECT_BRIGHTNESS_MAX;
Raindrops.brightness = IONICO_DIRECT_BRIGHTNESS_MAX;
Raindrops.colors.resize(7);
modes.push_back(Raindrops);
}