From 3f0027aa90f3d16329d8912c5c066478ee90b96a Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Tue, 12 May 2020 15:58:00 -0500 Subject: [PATCH] Use byte index 2 of config table for channel count on addressable Aura controllers --- Controllers/AuraUSBController/AuraAddressableController.cpp | 1 + Controllers/AuraUSBController/AuraMainboardController.cpp | 1 + Controllers/AuraUSBController/AuraUSBController.cpp | 2 +- Controllers/AuraUSBController/AuraUSBController.h | 4 +++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Controllers/AuraUSBController/AuraAddressableController.cpp b/Controllers/AuraUSBController/AuraAddressableController.cpp index 497f7aca6..6b2765a58 100644 --- a/Controllers/AuraUSBController/AuraAddressableController.cpp +++ b/Controllers/AuraUSBController/AuraAddressableController.cpp @@ -12,6 +12,7 @@ AuraAddressableController::AuraAddressableController(hid_device* dev_handle) : AuraUSBController(dev_handle) { + channel_count = config_table[2]; } AuraAddressableController::~AuraAddressableController() diff --git a/Controllers/AuraUSBController/AuraMainboardController.cpp b/Controllers/AuraUSBController/AuraMainboardController.cpp index d52145c1d..eea9d1f41 100644 --- a/Controllers/AuraUSBController/AuraMainboardController.cpp +++ b/Controllers/AuraUSBController/AuraMainboardController.cpp @@ -12,6 +12,7 @@ AuraMainboardController::AuraMainboardController(hid_device* dev_handle) : AuraUSBController(dev_handle), mode(AURA_MODE_DIRECT) { + channel_count = 5; } AuraMainboardController::~AuraMainboardController() diff --git a/Controllers/AuraUSBController/AuraUSBController.cpp b/Controllers/AuraUSBController/AuraUSBController.cpp index 1265c2143..8831b4625 100644 --- a/Controllers/AuraUSBController/AuraUSBController.cpp +++ b/Controllers/AuraUSBController/AuraUSBController.cpp @@ -25,7 +25,7 @@ AuraUSBController::~AuraUSBController() unsigned int AuraUSBController::GetChannelCount() { - return( 5 ); + return( channel_count ); } std::string AuraUSBController::GetDeviceName() diff --git a/Controllers/AuraUSBController/AuraUSBController.h b/Controllers/AuraUSBController/AuraUSBController.h index 44af3dd6e..836fe84c8 100644 --- a/Controllers/AuraUSBController/AuraUSBController.h +++ b/Controllers/AuraUSBController/AuraUSBController.h @@ -68,9 +68,11 @@ public: protected: hid_device* dev; + unsigned int channel_count; + unsigned char config_table[60]; + private: char device_name[16]; - unsigned char config_table[60]; unsigned int led_count; void GetConfigTable();