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

Remove RGB controllers argument from standard detector

Browse source
This commit is contained in:
Adam Honse 2023-01-26 20:19:45 -06:00
parent 060567548f
commit 92f0720639
30 changed files with 35 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Controllers/AsusTUFLaptopController/AsusTUFLaptopWMIDetect.cpp
View file

@ -7,7 +7,7 @@
#include "wmi.h"
#include <string>
static void DetectAsusTUFLaptopWMIControllers(std::vector<RGBController*>&)
static void DetectAsusTUFLaptopWMIControllers()
{
// Try to retrieve ProductID / Device name from WMI; Possibly can be rewritten to use wmi.cpp
// IF you encounter false detection ( e.g. if your laptop keyboard backlight uses USB interface

2
Controllers/AsusTUFLaptopLinuxController/AsusTUFLaptopLinuxDetect.cpp
View file

@ -5,7 +5,7 @@
#include "Detector.h"
#include <unistd.h>
static void DetectAsusTUFLaptopLinuxControllers(std::vector<RGBController*>&)
static void DetectAsusTUFLaptopLinuxControllers()
{
/*-------------------------------------------------------------------------------------*\
| If /sys/devices/platform/asus-nb-wmi/leds/asus::kbd_backlight/kbd_rgb_mode exists, |

2
Controllers/BlinkyTapeController/BlinkyTapeControllerDetect.cpp
View file

@ -19,7 +19,7 @@
* *
\******************************************************************************************/
void DetectBlinkyTapeControllers(std::vector<RGBController*> &rgb_controllers)
void DetectBlinkyTapeControllers()
{
std::vector<std::string *> device_locations = find_usb_serial_port(BLINKINLABS_VID, BLINKYTAPE_PID);

2
Controllers/CorsairHydro2Controller/CorsairHydro2ControllerDetect.cpp
View file

@ -20,7 +20,7 @@
#define CORSAIR_VID 0x1B1C
#define H100I_V2_PID 0x0C09
void DetectCorsairHydro2Controllers(std::vector<RGBController*>& rgb_controllers)
void DetectCorsairHydro2Controllers()
{
libusb_init(NULL);

2
Controllers/CorsairHydroController/CorsairHydroControllerDetect.cpp
View file

@ -49,7 +49,7 @@ static const corsair_hydro_device device_list[] =
* *
\******************************************************************************************/
void DetectCorsairHydroControllers(std::vector<RGBController*>& rgb_controllers)
void DetectCorsairHydroControllers()
{
libusb_init(NULL);

2
Controllers/DebugController/DebugControllerDetect.cpp
View file

@ -201,7 +201,7 @@ static const char *led_names[] =
* *
\******************************************************************************************/
void DetectDebugControllers(std::vector<RGBController*> &rgb_controllers)
void DetectDebugControllers()
{
json debug_settings;

2
Controllers/DygmaRaiseController/DygmaRaiseControllerDetect.cpp
View file

@ -19,7 +19,7 @@
* *
\******************************************************************************************/
void DetectDygmaRaiseControllers(std::vector<RGBController*> &rgb_controllers)
void DetectDygmaRaiseControllers()
{
std::vector<std::string *> ports = find_usb_serial_port(DYGMA_RAISE_VID, DYGMA_RAISE_PID);

2
Controllers/E131Controller/E131ControllerDetect.cpp
View file

@ -20,7 +20,7 @@
* *
\******************************************************************************************/
void DetectE131Controllers(std::vector<RGBController*> &rgb_controllers)
void DetectE131Controllers()
{
json e131_settings;

2
Controllers/ENESMBusController/XPGSpectrixS40GDetect.cpp
View file

@ -20,7 +20,7 @@
* *
\******************************************************************************************/
void DetectSpectrixS40GControllers(std::vector<RGBController*>& rgb_controllers)
void DetectSpectrixS40GControllers()
{
/*---------------------------------------------------------------------*\
| Search for /dev/nvmeX nodes with model matching "XPG SPECTRIX S40G" |

2
Controllers/ENESMBusController/XPGSpectrixS40GDetect_Windows.cpp
View file

@ -92,7 +92,7 @@ HANDLE OpenDevice(wchar_t buff[MAX_PATH])
* *
\******************************************************************************************/
void DetectSpectrixS40GControllers(std::vector<RGBController*>& rgb_controllers)
void DetectSpectrixS40GControllers()
{
/*-------------------------------------------------------------------------------------------------*\
| https://docs.microsoft.com/en-us/windows-hardware/drivers/install/identifiers-for-scsi-devices |

2
Controllers/ElgatoKeyLightController/ElgatoKeyLightControllerDetect.cpp
View file

@ -15,7 +15,7 @@
* *
\******************************************************************************************/
void DetectElgatoKeyLightControllers(std::vector<RGBController*> &rgb_controllers)
void DetectElgatoKeyLightControllers()
{
json elgato_keylight_settings;

2
Controllers/EspurnaController/EspurnaControllerDetect.cpp
View file

@ -15,7 +15,7 @@
* *
\******************************************************************************************/
void DetectEspurnaControllers(std::vector<RGBController*> &rgb_controllers)
void DetectEspurnaControllers()
{
json espurna_settings;

2
Controllers/FanBusController/FanBusControllerDetect.cpp
View file

@ -2,7 +2,7 @@
#include "FanBusController.h"
#include "RGBController_FanBus.h"
void DetectFanBusControllers(std::vector<RGBController*> &rgb_controllers)
void DetectFanBusControllers()
{
FanBusInterface* new_interface;
json fanbus_settings;

2
Controllers/FaustusController/RGBController_Faustus.cpp
View file

@ -153,7 +153,7 @@ void RGBController_Faustus::DeviceUpdateMode()
DeviceUpdateLEDs();
}
void DetectFaustusControllers(std::vector<RGBController*> &rgb_controllers)
void DetectFaustusControllers()
{
const char* base_path = "/sys/devices/platform/faustus/kbbl";
DIR* dir = opendir(base_path);

2
Controllers/GigabyteSuperIORGBController/GigabyteSuperIORGBControllerDetect.cpp
View file

@ -28,7 +28,7 @@ static gig_device compatible_devices[] =
{"X570 UD"}
};
void DetectGigabyteSuperIORGBControllers(std::vector<RGBController*> &rgb_controllers)
void DetectGigabyteSuperIORGBControllers()
{
int sio_addrs[2] = {0x2E, 0x4E};

2
Controllers/LEDStripController/LEDStripControllerDetect.cpp
View file

@ -15,7 +15,7 @@
* *
\******************************************************************************************/
void DetectLEDStripControllers(std::vector<RGBController*> &rgb_controllers)
void DetectLEDStripControllers()
{
json ledstrip_settings;
LEDStripDevice dev;

2
Controllers/LIFXController/LIFXControllerDetect.cpp
View file

@ -15,7 +15,7 @@
* *
\******************************************************************************************/
void DetectLIFXControllers(std::vector<RGBController*> &rgb_controllers)
void DetectLIFXControllers()
{
json lifx_settings;

4
Controllers/LianLiController/LianLiControllerDetect.cpp
View file

@ -56,7 +56,7 @@
| requires libusb as hidapi provides no wIndex customization. |
\*----------------------------------------------------------------------------*/
void DetectLianLiUniHub(std::vector<RGBController*>&)
void DetectLianLiUniHub()
{
libusb_device** devices = nullptr;
@ -102,7 +102,7 @@ void DetectLianLiUniHub(std::vector<RGBController*>&)
}
}
void DetectLianLiUniHub_AL10(std::vector<RGBController*>&)
void DetectLianLiUniHub_AL10()
{
libusb_device** devices = nullptr;

2
Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp
View file

@ -18,7 +18,7 @@
* *
\******************************************************************************************/
void DetectLinuxLEDControllers(std::vector<RGBController*> &rgb_controllers)
void DetectLinuxLEDControllers()
{
json linux_led_settings;

2
Controllers/MSIRGBController/MSIRGBControllerDetect.cpp
View file

@ -77,7 +77,7 @@ static msi_device compatible_devices[] =
{"7B87", true },
};
void DetectMSIRGBControllers(std::vector<RGBController*> &rgb_controllers)
void DetectMSIRGBControllers()
{
int sio_addrs[2] = {0x2E, 0x4E};

2
Controllers/NVIDIAIlluminationController/NVIDIAIlluminationControllerDetect.cpp
View file

@ -61,7 +61,7 @@ static const gpu_pci_device device_list[] =
{NVIDIA_VEN, NVIDIA_RTX4090_DEV, NVIDIA_VEN, NVIDIA_RTX4090_FE_SUB_DEV, NVIDIA_ILLUMINATION_V1, TREATS_RGBW_AS_RGBW, "NVIDIA 4090 FE" },
};
void DetectNVIDIAIllumGPUs(std::vector<RGBController*> &rgb_controllers)
void DetectNVIDIAIllumGPUs()
{
static NV_PHYSICAL_GPU_HANDLE gpu_handles[64];
static NV_S32 gpu_count = 0;

2
Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp
View file

@ -16,7 +16,7 @@
* *
\******************************************************************************************/
void DetectNZXTHuePlusControllers(std::vector<RGBController*> &/*rgb_controllers*/)
void DetectNZXTHuePlusControllers()
{
std::vector<std::string *> ports = find_usb_serial_port(NZXT_HUE_PLUS_VID, NZXT_HUE_PLUS_PID);

2
Controllers/NanoleafController/NanoleafControllerDetect.cpp
View file

@ -11,7 +11,7 @@
| |
\*----------------------------------------------------------------------------------------*/
void DetectNanoleafControllers(std::vector<RGBController*> &rgb_controllers)
void DetectNanoleafControllers()
{
json nanoleaf_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("NanoleafDevices");

2
Controllers/OpenRazerController/OpenRazerDetect.cpp
View file

@ -19,7 +19,7 @@
* *
\******************************************************************************************/
void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers)
void DetectOpenRazerControllers()
{
char driver_path[512];
DIR *dir;

2
Controllers/OpenRazerController/OpenRazerWindowsDetect.cpp
View file

@ -110,7 +110,7 @@ static void load_device_fn(device_fn_type* device_fn, device* dev)
* *
\******************************************************************************************/
void DetectOpenRazerControllers(std::vector<RGBController*> &rgb_controllers)
void DetectOpenRazerControllers()
{
static HMODULE module = LoadLibrary(OPENRAZERDLL);

8
Controllers/PhilipsHueController/PhilipsHueControllerDetect.cpp
View file

@ -23,7 +23,7 @@
* *
\******************************************************************************************/
void DetectPhilipsHueControllers(std::vector<RGBController*>& rgb_controllers)
void DetectPhilipsHueControllers()
{
json hue_settings;
@ -210,11 +210,11 @@ void DetectPhilipsHueControllers(std::vector<RGBController*>& rgb_controllers)
\*-------------------------------------------------*/
if(auto_connect)
{
for(unsigned int controller_idx = 0; controller_idx < rgb_controllers.size(); controller_idx++)
for(unsigned int controller_idx = 0; controller_idx < ResourceManager::get()->GetRGBControllers().size(); controller_idx++)
{
if(rgb_controllers[controller_idx]->description == "Philips Hue Entertainment Mode Device")
if(ResourceManager::get()->GetRGBControllers()[controller_idx]->description == "Philips Hue Entertainment Mode Device")
{
rgb_controllers[controller_idx]->SetMode(0);
ResourceManager::get()->GetRGBControllers()[controller_idx]->SetMode(0);
break;
}
}

2
Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp
View file

@ -15,7 +15,7 @@
* *
\******************************************************************************************/
void DetectPhilipsWizControllers(std::vector<RGBController*> &rgb_controllers)
void DetectPhilipsWizControllers()
{
json wiz_settings;

2
Controllers/YeelightController/YeelightControllerDetect.cpp
View file

@ -15,7 +15,7 @@
* *
\******************************************************************************************/
void DetectYeelightControllers(std::vector<RGBController*> &rgb_controllers)
void DetectYeelightControllers()
{
json yeelight_settings;

20
ResourceManager.cpp
View file

@ -1461,26 +1461,10 @@ void ResourceManager::DetectDevicesThreadFunction()
{
DetectionProgressChanged();
device_detectors[detector_idx](rgb_controllers_hw);
device_detectors[detector_idx]();
}
/*-------------------------------------------------*\
| If the device list size has changed, call the |
| device list changed callbacks |
\*-------------------------------------------------*/
if(rgb_controllers_hw.size() != detection_prev_size)
{
/*-------------------------------------------------*\
| First, load sizes for the new controllers |
\*-------------------------------------------------*/
for(unsigned int controller_size_idx = detection_prev_size; controller_size_idx < rgb_controllers_hw.size(); controller_size_idx++)
{
profile_manager->LoadDeviceFromListWithOptions(rgb_controllers_sizes, detection_size_entry_used, rgb_controllers_hw[controller_size_idx], true, false);
}
UpdateDeviceList();
}
else
if(rgb_controllers_hw.size() == detection_prev_size)
{
LOG_DEBUG("[%s] no devices found", detection_string);
}

2
ResourceManager.h
View file

@ -35,7 +35,7 @@
struct hid_device_info;
typedef std::function<bool()> I2CBusDetectorFunction;
typedef std::function<void(std::vector<RGBController*>&)> DeviceDetectorFunction;
typedef std::function<void()> DeviceDetectorFunction;
typedef std::function<void(std::vector<i2c_smbus_interface*>&)> I2CDeviceDetectorFunction;
typedef std::function<void(i2c_smbus_interface*, uint8_t, const std::string&)> I2CPCIDeviceDetectorFunction;
typedef std::function<void(hid_device_info*, const std::string&)> HIDDeviceDetectorFunction;