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

Store name in ZETEdgeAirProController to avoid setting it in detector

Browse source
This commit is contained in:
Adam Honse 2025-08-14 23:05:37 -05:00
parent 4e96056ac4
commit 86b2ced685
4 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp
View file

@ -27,13 +27,13 @@
RGBController_ZETEdgeAirPro::RGBController_ZETEdgeAirPro(ZETEdgeAirProController* controller_ptr)
{
controller = controller_ptr;
name = "ZET Edge Air Pro";
name = controller->GetNameString();
vendor = "ZET Gaming";
type = DEVICE_TYPE_MOUSE;
description = name;
description = "ZET Edge Air Pro Device";
location = controller->GetDeviceLocation();
serial = controller->GetSerialString();
version = controller->GetFirmwareVersion();
mode Static;
Static.name = "Static";

14
Controllers/ZETEdgeAirProController/ZETEdgeAirProController.cpp
View file

@ -13,11 +13,11 @@
#include "StringUtils.h"
#include "ZETEdgeAirProController.h"
ZETEdgeAirProController::ZETEdgeAirProController(hid_device* dev_handle, const hid_device_info& info)
ZETEdgeAirProController::ZETEdgeAirProController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name)
{
dev = dev_handle;
location = info.path;
version = "";
name = dev_name;
}
ZETEdgeAirProController::~ZETEdgeAirProController()
@ -30,6 +30,11 @@ std::string ZETEdgeAirProController::GetDeviceLocation()
return("HID: " + location);
}
std::string ZETEdgeAirProController::GetNameString()
{
return(name);
}
std::string ZETEdgeAirProController::GetSerialString()
{
wchar_t serial_string[128];
@ -43,11 +48,6 @@ std::string ZETEdgeAirProController::GetSerialString()
return(StringUtils::wstring_to_string(serial_string));
}
std::string ZETEdgeAirProController::GetFirmwareVersion()
{
return(version);
}
void ZETEdgeAirProController::SetMode(RGBColor color, unsigned char brightness, unsigned char speed, unsigned char mode_value)
{
/*---------------------------------------------------------*\

8
Controllers/ZETEdgeAirProController/ZETEdgeAirProController.h
View file

@ -38,12 +38,12 @@ enum
class ZETEdgeAirProController
{
public:
ZETEdgeAirProController(hid_device* dev_handle, const hid_device_info& info);
ZETEdgeAirProController(hid_device* dev_handle, const hid_device_info& info, std::string dev_name);
~ZETEdgeAirProController();
std::string GetSerialString();
std::string GetDeviceLocation();
std::string GetFirmwareVersion();
std::string GetNameString();
std::string GetSerialString();
void SetMode(RGBColor color, unsigned char brightness, unsigned char speed, unsigned char mode_value);
@ -52,5 +52,5 @@ protected:
private:
std::string location;
std::string version;
std::string name;
};

11
Controllers/ZETEdgeAirProController/ZETEdgeAirProControllerDetect.cpp
View file

@ -32,15 +32,14 @@ void DetectZETGAMINGEdgeAirProControllers(hid_device_info* info, const std::stri
if(dev)
{
ZETEdgeAirProController* controller = new ZETEdgeAirProController(dev, *info);
ZETEdgeAirProController* controller = new ZETEdgeAirProController(dev, *info, name);
RGBController_ZETEdgeAirPro* rgb_controller = new RGBController_ZETEdgeAirPro(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}
REGISTER_HID_DETECTOR_IPU("ZET GAMING Edge Air Pro (Wireless)", DetectZETGAMINGEdgeAirProControllers, ZET_GAMING_VID, ZET_GAMING_EDGE_AIR_PRO_WIRELESS_PID, 1, 0xFF02, 2);
REGISTER_HID_DETECTOR_IPU("ZET GAMING Edge Air Pro", DetectZETGAMINGEdgeAirProControllers, ZET_GAMING_VID, ZET_GAMING_EDGE_AIR_PRO_PID, 1, 0xFF02, 2);
REGISTER_HID_DETECTOR_IPU("ZET GAMING Edge Air Elit (Wireless)", DetectZETGAMINGEdgeAirProControllers, ZET_GAMING_VID, ZET_GAMING_EDGE_AIR_ELIT_WIRELESS_PID, 1, 0xFF02, 2);
REGISTER_HID_DETECTOR_IPU("ZET GAMING Edge Air Elit", DetectZETGAMINGEdgeAirProControllers, ZET_GAMING_VID, ZET_GAMING_EDGE_AIR_ELIT_PID, 1, 0xFF02, 2);
REGISTER_HID_DETECTOR_IPU("ZET GAMING Edge Air Pro (Wireless)", DetectZETGAMINGEdgeAirProControllers, ZET_GAMING_VID, ZET_GAMING_EDGE_AIR_PRO_WIRELESS_PID, 1, 0xFF02, 2);
REGISTER_HID_DETECTOR_IPU("ZET GAMING Edge Air Pro", DetectZETGAMINGEdgeAirProControllers, ZET_GAMING_VID, ZET_GAMING_EDGE_AIR_PRO_PID, 1, 0xFF02, 2);
REGISTER_HID_DETECTOR_IPU("ZET GAMING Edge Air Elit (Wireless)", DetectZETGAMINGEdgeAirProControllers, ZET_GAMING_VID, ZET_GAMING_EDGE_AIR_ELIT_WIRELESS_PID, 1, 0xFF02, 2);
REGISTER_HID_DETECTOR_IPU("ZET GAMING Edge Air Elit", DetectZETGAMINGEdgeAirProControllers, ZET_GAMING_VID, ZET_GAMING_EDGE_AIR_ELIT_PID, 1, 0xFF02, 2);