mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-02-07 22:01:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Prepare LampArray report IDs being parsed dynamically

Browse Source
This commit is contained in:
Werner Sembach
2025-05-30 14:02:22 +02:00
committed by Adam Honse
parent f02ca20ca3
commit d1e3240b9e
2 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Controllers/HIDLampArrayController/HIDLampArrayController.cpp
View File

@@ -14,9 +14,18 @@
HIDLampArrayController::HIDLampArrayController(hid_device *dev_handle, const char *path, std::string dev_name)
{
dev = dev_handle;
location = path;
name = dev_name;
dev = dev_handle;
location = path;
name = dev_name;
/*-----------------------------------------------------*\
| Get LampArrayAttributesReport |
\*-----------------------------------------------------*/
ids.LampArrayAttributesReportID = 0x01;
ids.LampAttributesRequestReportID = 0x02;
ids.LampAttributesResponseReportID = 0x03;
ids.LampMultiUpdateReportID = 0x04;
ids.LampArrayControlReportID = 0x06;
/*-----------------------------------------------------*\
| Get LampArrayAttributesReport |
@@ -79,7 +88,7 @@ void HIDLampArrayController::GetLampArrayAttributesReport()
/*-----------------------------------------------------*\
| First byte is the report ID |
\*-----------------------------------------------------*/
usb_buf[0] = HID_LAMPARRAY_LAMP_ARRAY_ATTRIBUTES_REPORT_ID;
usb_buf[0] = ids.LampArrayAttributesReportID;
/*-----------------------------------------------------*\
| Get the report |
@@ -100,7 +109,7 @@ void HIDLampArrayController::GetLampAttributesResponseReport()
/*-----------------------------------------------------*\
| First byte is the report ID |
\*-----------------------------------------------------*/
usb_buf[0] = HID_LAMPARRAY_LAMP_ATTRIBUTES_RESPONSE_REPORT_ID;
usb_buf[0] = ids.LampAttributesResponseReportID;
/*-----------------------------------------------------*\
| Get the report |
@@ -124,7 +133,7 @@ void HIDLampArrayController::SetLampArrayControlReport(unsigned char AutonomousM
/*-----------------------------------------------------*\
| First byte is the report ID |
\*-----------------------------------------------------*/
usb_buf[0] = HID_LAMPARRAY_LAMP_ARRAY_CONTROL_REPORT_ID;
usb_buf[0] = ids.LampArrayControlReportID;
/*-----------------------------------------------------*\
| Fill in control data |
@@ -146,7 +155,7 @@ void HIDLampArrayController::SetLampAttributesRequestReport(unsigned short LampI
/*-----------------------------------------------------*\
| First byte is the report ID |
\*-----------------------------------------------------*/
usb_buf[0] = HID_LAMPARRAY_LAMP_ATTRIBUTES_REQUEST_REPORT_ID;
usb_buf[0] = ids.LampAttributesRequestReportID;
/*-----------------------------------------------------*\
| Fill in request data |
@@ -168,7 +177,7 @@ void HIDLampArrayController::SetLampMultiUpdateReport(unsigned char LampCount, u
/*-----------------------------------------------------*\
| First byte is the report ID |
\*-----------------------------------------------------*/
usb_buf[0] = HID_LAMPARRAY_LAMP_MULTI_UPDATE_REPORT_ID;
usb_buf[0] = ids.LampMultiUpdateReportID;
/*-----------------------------------------------------*\
| Fill in multi update data |

22
Controllers/HIDLampArrayController/HIDLampArrayController.h
View File

@@ -81,14 +81,15 @@ PACK(struct LampMultiUpdate
LampArrayColor UpdateColors[LAMP_MULTI_UPDATE_LAMP_COUNT];
});
enum
typedef struct
{
HID_LAMPARRAY_LAMP_ARRAY_ATTRIBUTES_REPORT_ID = 0x01, /* LampArrayAttributesReport ID */
HID_LAMPARRAY_LAMP_ATTRIBUTES_REQUEST_REPORT_ID = 0x02, /* LampAttributesRequestReport ID */
HID_LAMPARRAY_LAMP_ATTRIBUTES_RESPONSE_REPORT_ID = 0x03, /* LampAttributesResponseReport ID */
HID_LAMPARRAY_LAMP_MULTI_UPDATE_REPORT_ID = 0x04, /* LampMultiUpdateReport ID */
HID_LAMPARRAY_LAMP_ARRAY_CONTROL_REPORT_ID = 0x06, /* LampArrayControlReport ID */
};
unsigned char LampArrayAttributesReportID;
unsigned char LampAttributesRequestReportID;
unsigned char LampAttributesResponseReportID;
unsigned char LampMultiUpdateReportID;
unsigned char LampRangeUpdateReportID;
unsigned char LampArrayControlReportID;
} HIDLampArrayReportIDs;
enum
{
@@ -121,9 +122,10 @@ public:
void SetLampMultiUpdateReport(unsigned char LampCount, unsigned char LampUpdateFlags, unsigned short * LampIds, LampArrayColor * UpdateColors);
private:
hid_device * dev;
std::string location;
std::string name;
hid_device * dev;
HIDLampArrayReportIDs ids;
std::string location;
std::string name;
/*-----------------------------------------------------*\
| Vector to store lamp attributes for each lamp |