From 19c2b98e8aa4737871f37c250fbf8bbde65a6d4a Mon Sep 17 00:00:00 2001 From: morg Date: Thu, 24 Mar 2022 21:40:44 +0000 Subject: [PATCH] Add support for Trust GXT 180 mouse. Closes #2330 --- 60-openrgb.rules | 1 + .../RGBController_TrustGXT114.cpp | 0 .../RGBController_TrustGXT114.h | 0 .../RGBController_TrustGXT180.cpp | 130 ++++++++++++++++++ .../RGBController_TrustGXT180.h | 31 +++++ .../TrustControllerDetect.cpp} | 23 +++- .../TrustGXT114Controller.cpp | 0 .../TrustGXT114Controller.h | 3 +- .../TrustController/TrustGXT180Controller.cpp | 82 +++++++++++ .../TrustController/TrustGXT180Controller.h | 58 ++++++++ OpenRGB.pro | 14 +- 11 files changed, 333 insertions(+), 9 deletions(-) rename Controllers/{TrustGXT114Controller => TrustController}/RGBController_TrustGXT114.cpp (100%) rename Controllers/{TrustGXT114Controller => TrustController}/RGBController_TrustGXT114.h (100%) create mode 100644 Controllers/TrustController/RGBController_TrustGXT180.cpp create mode 100644 Controllers/TrustController/RGBController_TrustGXT180.h rename Controllers/{TrustGXT114Controller/TrustGXT114ControllerDetect.cpp => TrustController/TrustControllerDetect.cpp} (54%) rename Controllers/{TrustGXT114Controller => TrustController}/TrustGXT114Controller.cpp (100%) rename Controllers/{TrustGXT114Controller => TrustController}/TrustGXT114Controller.h (99%) create mode 100644 Controllers/TrustController/TrustGXT180Controller.cpp create mode 100644 Controllers/TrustController/TrustGXT180Controller.h diff --git a/60-openrgb.rules b/60-openrgb.rules index 17c0c29f..d0b936c3 100644 --- a/60-openrgb.rules +++ b/60-openrgb.rules @@ -880,6 +880,7 @@ SUBSYSTEMS=="usb", ATTR{idVendor}=="27b8", ATTR{idProduct}=="01ed", TAG+="uacces # Trust Controllers # #---------------------------------------------------------------# SUBSYSTEMS=="usb", ATTR{idVendor}=="145f", ATTR{idProduct}=="026d", TAG+="uaccess" +SUBSYSTEMS=="usb", ATTR{idVendor}=="145f", ATTR{idProduct}=="0248", TAG+="uaccess" #---------------------------------------------------------------# # Wooting Devices # diff --git a/Controllers/TrustGXT114Controller/RGBController_TrustGXT114.cpp b/Controllers/TrustController/RGBController_TrustGXT114.cpp similarity index 100% rename from Controllers/TrustGXT114Controller/RGBController_TrustGXT114.cpp rename to Controllers/TrustController/RGBController_TrustGXT114.cpp diff --git a/Controllers/TrustGXT114Controller/RGBController_TrustGXT114.h b/Controllers/TrustController/RGBController_TrustGXT114.h similarity index 100% rename from Controllers/TrustGXT114Controller/RGBController_TrustGXT114.h rename to Controllers/TrustController/RGBController_TrustGXT114.h diff --git a/Controllers/TrustController/RGBController_TrustGXT180.cpp b/Controllers/TrustController/RGBController_TrustGXT180.cpp new file mode 100644 index 00000000..d907c70a --- /dev/null +++ b/Controllers/TrustController/RGBController_TrustGXT180.cpp @@ -0,0 +1,130 @@ +/*-----------------------------------------*\ +| RGBController_TrustGXT180.cpp | +| | +| Generic RGB Interface for OpenRGB | +| Trust GXT 180 USB Driver | +| | +| Guimard Morgan (morg) 3/24/2022 | +\*-----------------------------------------*/ + +#include "RGBController_TrustGXT180.h" + +#include +#include + +RGBController_TrustGXT180::RGBController_TrustGXT180(TrustGXT180Controller* controller_ptr) +{ + controller = controller_ptr; + name = "Trust GXT 180"; + vendor = "Trust"; + type = DEVICE_TYPE_MOUSE; + description = name; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); + version = controller->GetFirmwareVersion(); + + mode Static; + Static.name = "Static"; + Static.value = TRUST_GXT_180_STATIC_MODE_VALUE; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_AUTOMATIC_SAVE; + Static.color_mode = MODE_COLORS_PER_LED; + Static.brightness_min = TRUST_GXT_180_BRIGHTNESS_MIN; + Static.brightness_max = TRUST_GXT_180_BRIGHTNESS_MAX; + Static.brightness = TRUST_GXT_180_BRIGHTNESS_MAX; + modes.push_back(Static); + + mode Breathing; + Breathing.name = "Breathing"; + Breathing.value = TRUST_GXT_180_BREATHING_MODE_VALUE; + Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_AUTOMATIC_SAVE; + Breathing.color_mode = MODE_COLORS_PER_LED; + Breathing.speed_min = TRUST_GXT_180_SPEED_MIN; + Breathing.speed_max = TRUST_GXT_180_SPEED_MAX; + Breathing.speed = TRUST_GXT_180_SPEED_MIN; + Breathing.brightness_min = TRUST_GXT_180_BRIGHTNESS_MIN; + Breathing.brightness_max = TRUST_GXT_180_BRIGHTNESS_MAX; + Breathing.brightness = TRUST_GXT_180_BRIGHTNESS_MAX; + modes.push_back(Breathing); + + mode ColorShift; + ColorShift.name = "ColorShift"; + ColorShift.value = TRUST_GXT_180_COLORSHIFT_MODE_VALUE; + ColorShift.flags = MODE_FLAG_HAS_RANDOM_COLOR | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_AUTOMATIC_SAVE; + ColorShift.color_mode = MODE_COLORS_RANDOM; + ColorShift.speed_min = TRUST_GXT_180_SPEED_MIN; + ColorShift.speed_max = TRUST_GXT_180_SPEED_MAX; + ColorShift.speed = TRUST_GXT_180_SPEED_MIN; + ColorShift.brightness_min = TRUST_GXT_180_BRIGHTNESS_MIN; + ColorShift.brightness_max = TRUST_GXT_180_BRIGHTNESS_MAX; + ColorShift.brightness = TRUST_GXT_180_BRIGHTNESS_MAX; + modes.push_back(ColorShift); + + mode Off; + Off.name = "Off"; + Off.value = TRUST_GXT_180_OFF_MODE_VALUE; + Off.flags = MODE_FLAG_AUTOMATIC_SAVE; + Off.color_mode = MODE_COLORS_NONE; + modes.push_back(Off); + + SetupZones(); +} + +RGBController_TrustGXT180::~RGBController_TrustGXT180() +{ + delete controller; +} + +void RGBController_TrustGXT180::SetupZones() +{ + zone new_zone; + + new_zone.name = "Mouse"; + new_zone.type = ZONE_TYPE_LINEAR; + new_zone.leds_min = TRUST_GXT_180_NUMBER_OF_LEDS; + new_zone.leds_max = TRUST_GXT_180_NUMBER_OF_LEDS; + new_zone.leds_count = TRUST_GXT_180_NUMBER_OF_LEDS; + new_zone.matrix_map = nullptr; + + zones.emplace_back(new_zone); + + leds.resize(new_zone.leds_count); + + for(unsigned int i = 0; i < TRUST_GXT_180_NUMBER_OF_LEDS; i++) + { + leds[i].name = "LED " + std::to_string(i + 1); + } + + SetupColors(); +} + +void RGBController_TrustGXT180::ResizeZone(int /*zone*/, int /*new_size*/) +{ + /*---------------------------------------------------------*\ + | This device does not support resizing zones | + \*---------------------------------------------------------*/ +} + +void RGBController_TrustGXT180::DeviceUpdateLEDs() +{ + DeviceUpdateMode(); +} + +void RGBController_TrustGXT180::UpdateZoneLEDs(int /*zone*/) +{ + DeviceUpdateMode(); +} + +void RGBController_TrustGXT180::UpdateSingleLED(int /*led*/) +{ + DeviceUpdateMode(); +} + +void RGBController_TrustGXT180::SetCustomMode() +{ + active_mode = 0; +} + +void RGBController_TrustGXT180::DeviceUpdateMode() +{ + controller->SetMode(colors[0], modes[active_mode].brightness, modes[active_mode].speed, modes[active_mode].value); +} diff --git a/Controllers/TrustController/RGBController_TrustGXT180.h b/Controllers/TrustController/RGBController_TrustGXT180.h new file mode 100644 index 00000000..0c1fa9d7 --- /dev/null +++ b/Controllers/TrustController/RGBController_TrustGXT180.h @@ -0,0 +1,31 @@ +/*-----------------------------------------*\ +| RGBController_TrustGXT180.h | +| | +| Generic RGB Interface for OpenRGB | +| Trust GXT 180 USB Driver | +| | +| Guimard Morgan (morg) 3/24/2022 | +\*-----------------------------------------*/ + +#pragma once + +#include "RGBController.h" +#include "TrustGXT180Controller.h" + +class RGBController_TrustGXT180 : public RGBController +{ +public: + RGBController_TrustGXT180(TrustGXT180Controller* controller_ptr); + ~RGBController_TrustGXT180(); + + void SetupZones(); + void ResizeZone(int zone, int new_size); + void DeviceUpdateLEDs(); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); + void DeviceUpdateMode(); + void SetCustomMode(); + +private: + TrustGXT180Controller* controller; +}; diff --git a/Controllers/TrustGXT114Controller/TrustGXT114ControllerDetect.cpp b/Controllers/TrustController/TrustControllerDetect.cpp similarity index 54% rename from Controllers/TrustGXT114Controller/TrustGXT114ControllerDetect.cpp rename to Controllers/TrustController/TrustControllerDetect.cpp index bc4b1504..f0b0e03b 100644 --- a/Controllers/TrustGXT114Controller/TrustGXT114ControllerDetect.cpp +++ b/Controllers/TrustController/TrustControllerDetect.cpp @@ -1,7 +1,9 @@ #include "Detector.h" #include "TrustGXT114Controller.h" +#include "TrustGXT180Controller.h" #include "RGBController.h" #include "RGBController_TrustGXT114.h" +#include "RGBController_TrustGXT180.h" /*---------------------------------------------------------*\ | Trust vendor ID | @@ -9,11 +11,12 @@ #define TRUST_VID 0x145F /*---------------------------------------------------------*\ -| Product ID | +| Product IDs | \*---------------------------------------------------------*/ #define TRUST_GXT_114_PID 0x026D +#define TRUST_GXT_180_PID 0x0248 -void DetectTrustGXT114ControllerControllers(hid_device_info* info, const std::string& name) +void DetectTrustGXT114Controllers(hid_device_info* info, const std::string& name) { hid_device* dev = hid_open_path(info->path); @@ -34,4 +37,18 @@ void DetectTrustGXT114ControllerControllers(hid_device_info* info, const std::st } } -REGISTER_HID_DETECTOR_IPU("Trust GXT 114", DetectTrustGXT114ControllerControllers, TRUST_VID, TRUST_GXT_114_PID, 1, 0xFF00, 1); +void DetectTrustGXT180Controllers(hid_device_info* info, const std::string& name) +{ + hid_device* dev = hid_open_path(info->path); + + if(dev) + { + TrustGXT180Controller* controller = new TrustGXT180Controller(dev, *info); + RGBController_TrustGXT180* rgb_controller = new RGBController_TrustGXT180(controller); + rgb_controller->name = name; + ResourceManager::get()->RegisterRGBController(rgb_controller); + } +} + +REGISTER_HID_DETECTOR_IPU("Trust GXT 114", DetectTrustGXT114Controllers, TRUST_VID, TRUST_GXT_114_PID, 1, 0xFF00, 1); +REGISTER_HID_DETECTOR_IPU("Trust GXT 180", DetectTrustGXT180Controllers, TRUST_VID, TRUST_GXT_180_PID, 1, 0xFFA0, 1); diff --git a/Controllers/TrustGXT114Controller/TrustGXT114Controller.cpp b/Controllers/TrustController/TrustGXT114Controller.cpp similarity index 100% rename from Controllers/TrustGXT114Controller/TrustGXT114Controller.cpp rename to Controllers/TrustController/TrustGXT114Controller.cpp diff --git a/Controllers/TrustGXT114Controller/TrustGXT114Controller.h b/Controllers/TrustController/TrustGXT114Controller.h similarity index 99% rename from Controllers/TrustGXT114Controller/TrustGXT114Controller.h rename to Controllers/TrustController/TrustGXT114Controller.h index 23ce2027..791c8ee7 100644 --- a/Controllers/TrustGXT114Controller/TrustGXT114Controller.h +++ b/Controllers/TrustController/TrustGXT114Controller.h @@ -6,12 +6,13 @@ | | | Guimard Morgan (morg) 1/24/2022 | \*-----------------------------------------*/ -#pragma once #include "RGBController.h" #include #include +#pragma once + #define TRUST_GXT_114_REPORT_SIZE 154 #define TRUST_GXT_114_NUMBER_OF_LEDS 1 #define TRUST_GXT_114_REPORT_ID 0x04 diff --git a/Controllers/TrustController/TrustGXT180Controller.cpp b/Controllers/TrustController/TrustGXT180Controller.cpp new file mode 100644 index 00000000..53655435 --- /dev/null +++ b/Controllers/TrustController/TrustGXT180Controller.cpp @@ -0,0 +1,82 @@ +/*-----------------------------------------*\ +| TrustGXT180Controller.cpp | +| | +| Driver for Trust GXT 180 controller | +| | +| Guimard Morgan (morg) 3/24/2022 | +\*-----------------------------------------*/ +#include "TrustGXT180Controller.h" +#include + +TrustGXT180Controller::TrustGXT180Controller(hid_device* dev_handle, const hid_device_info& info) +{ + dev = dev_handle; + location = info.path; + version = ""; + + wchar_t serial_string[128]; + int ret = hid_get_serial_number_string(dev, serial_string, 128); + + if(ret != 0) + { + serial_number = ""; + } + else + { + std::wstring return_wstring = serial_string; + serial_number = std::string(return_wstring.begin(), return_wstring.end()); + } + +} + +TrustGXT180Controller::~TrustGXT180Controller() +{ + hid_close(dev); +} + +std::string TrustGXT180Controller::GetDeviceLocation() +{ + return("HID: " + location); +} + +std::string TrustGXT180Controller::GetSerialString() +{ + return(serial_number); +} + +std::string TrustGXT180Controller::GetFirmwareVersion() +{ + return(version); +} + +void TrustGXT180Controller::SetMode(RGBColor color, unsigned char brightness, unsigned char speed, unsigned char mode_value) +{ + /*-----------------------------------------*\ + | Create and zero out the buffer | + \*-----------------------------------------*/ + unsigned char usb_buf[TRUST_GXT_180_REPORT_SIZE]; + memset(usb_buf, 0x00, sizeof(usb_buf)); + + usb_buf[0] = TRUST_GXT_180_REPORT_ID; + usb_buf[1] = 0x06; + usb_buf[2] = 0xBB; + usb_buf[3] = 0xAA; + usb_buf[4] = 0x2A; + usb_buf[6] = 0x0A; + + if(mode_value != TRUST_GXT_180_OFF_MODE_VALUE) + { + usb_buf[8] = RGBGetRValue(color); + usb_buf[9] = RGBGetGValue(color); + usb_buf[10] = RGBGetBValue(color); + } + + usb_buf[11] = mode_value; + usb_buf[13] = brightness; + usb_buf[14] = speed; + + /*-----------------------------------------*\ + | Send the feature report | + \*-----------------------------------------*/ + hid_send_feature_report(dev, usb_buf, TRUST_GXT_180_REPORT_SIZE); +} diff --git a/Controllers/TrustController/TrustGXT180Controller.h b/Controllers/TrustController/TrustGXT180Controller.h new file mode 100644 index 00000000..841fe1bd --- /dev/null +++ b/Controllers/TrustController/TrustGXT180Controller.h @@ -0,0 +1,58 @@ +/*-----------------------------------------*\ +| TrustGXT180Controller.h | +| | +| Driver for Trust GXT 180 | +| controller - header file | +| | +| Guimard Morgan (morg) 3/24/2022 | +\*-----------------------------------------*/ + +#include "RGBController.h" +#include +#include + +#pragma once + +#define TRUST_GXT_180_REPORT_SIZE 64 +#define TRUST_GXT_180_NUMBER_OF_LEDS 1 +#define TRUST_GXT_180_REPORT_ID 0x03 + +enum +{ + TRUST_GXT_180_STATIC_MODE_VALUE = 0x01, + TRUST_GXT_180_BREATHING_MODE_VALUE = 0x02, + TRUST_GXT_180_COLORSHIFT_MODE_VALUE = 0x03, + TRUST_GXT_180_OFF_MODE_VALUE = 0x04 +}; + +enum +{ + TRUST_GXT_180_BRIGHTNESS_MIN = 0x00, + TRUST_GXT_180_BRIGHTNESS_MAX = 0x05 +}; + +enum +{ + TRUST_GXT_180_SPEED_MIN = 0x0A, + TRUST_GXT_180_SPEED_MAX = 0x00 +}; + +class TrustGXT180Controller +{ +public: + TrustGXT180Controller(hid_device* dev_handle, const hid_device_info& info); + ~TrustGXT180Controller(); + + std::string GetSerialString(); + std::string GetDeviceLocation(); + std::string GetFirmwareVersion(); + void SetMode(RGBColor color, unsigned char brightness, unsigned char speed, unsigned char mode_value); + +protected: + hid_device* dev; + +private: + std::string location; + std::string serial_number; + std::string version; +}; diff --git a/OpenRGB.pro b/OpenRGB.pro index 863eea2b..74add79a 100644 --- a/OpenRGB.pro +++ b/OpenRGB.pro @@ -511,8 +511,10 @@ HEADERS += Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.h \ Controllers/ThingMController/BlinkController.h \ Controllers/ThingMController/RGBController_BlinkController.h \ - Controllers/TrustGXT114Controller/RGBController_TrustGXT114.h \ - Controllers/TrustGXT114Controller/TrustGXT114Controller.h \ + Controllers/TrustController/RGBController_TrustGXT114.h \ + Controllers/TrustController/RGBController_TrustGXT180.h \ + Controllers/TrustController/TrustGXT114Controller.h \ + Controllers/TrustController/TrustGXT180Controller.h \ Controllers/WootingKeyboardController/WootingKeyboardController.h \ Controllers/WootingKeyboardController/WootingOneKeyboardController.h \ Controllers/WootingKeyboardController/WootingTwoKeyboardController.h \ @@ -987,9 +989,11 @@ SOURCES += Controllers/ThingMController/ThingMControllerDetect.cpp \ Controllers/ThingMController/BlinkController.cpp \ Controllers/ThingMController/RGBController_BlinkController.cpp \ - Controllers/TrustGXT114Controller/TrustGXT114Controller.cpp \ - Controllers/TrustGXT114Controller/TrustGXT114ControllerDetect.cpp \ - Controllers/TrustGXT114Controller/RGBController_TrustGXT114.cpp \ + Controllers/TrustController/TrustGXT114Controller.cpp \ + Controllers/TrustController/TrustGXT180Controller.cpp \ + Controllers/TrustController/TrustControllerDetect.cpp \ + Controllers/TrustController/RGBController_TrustGXT114.cpp \ + Controllers/TrustController/RGBController_TrustGXT180.cpp \ Controllers/WootingKeyboardController/WootingKeyboardController.cpp \ Controllers/WootingKeyboardController/WootingKeyboardControllerDetect.cpp \ Controllers/WootingKeyboardController/WootingOneKeyboardController.cpp \