From 86b2ced685e1ed163a096316109c4dabccbea2a7 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 14 Aug 2025 23:05:37 -0500 Subject: [PATCH] Store name in ZETEdgeAirProController to avoid setting it in detector --- .../RGBController_ZETEdgeAirPro.cpp | 6 +++--- .../ZETEdgeAirProController.cpp | 14 +++++++------- .../ZETEdgeAirProController.h | 8 ++++---- .../ZETEdgeAirProControllerDetect.cpp | 11 +++++------ 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp b/Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp index f13e4eed..04c540a3 100644 --- a/Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp +++ b/Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp @@ -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"; diff --git a/Controllers/ZETEdgeAirProController/ZETEdgeAirProController.cpp b/Controllers/ZETEdgeAirProController/ZETEdgeAirProController.cpp index 065b40e6..4f0fa73b 100644 --- a/Controllers/ZETEdgeAirProController/ZETEdgeAirProController.cpp +++ b/Controllers/ZETEdgeAirProController/ZETEdgeAirProController.cpp @@ -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) { /*---------------------------------------------------------*\ diff --git a/Controllers/ZETEdgeAirProController/ZETEdgeAirProController.h b/Controllers/ZETEdgeAirProController/ZETEdgeAirProController.h index e4c7d61d..c7182063 100644 --- a/Controllers/ZETEdgeAirProController/ZETEdgeAirProController.h +++ b/Controllers/ZETEdgeAirProController/ZETEdgeAirProController.h @@ -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; }; diff --git a/Controllers/ZETEdgeAirProController/ZETEdgeAirProControllerDetect.cpp b/Controllers/ZETEdgeAirProController/ZETEdgeAirProControllerDetect.cpp index a09fecee..7e297856 100644 --- a/Controllers/ZETEdgeAirProController/ZETEdgeAirProControllerDetect.cpp +++ b/Controllers/ZETEdgeAirProController/ZETEdgeAirProControllerDetect.cpp @@ -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);