From d3e06b9124fceee07f73d73f017da6d867b25ffb Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 31 Aug 2026 22:24:24 -0500 Subject: [PATCH] Update CM Small ARGB name --- .../CMSmallARGBController/CMSmallARGBController.cpp | 11 +++-------- .../CMSmallARGBController/CMSmallARGBController.h | 10 ---------- .../RGBController_CMSmallARGBController.cpp | 6 +++--- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp index c5f3a3f2e..97771e14c 100644 --- a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp +++ b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.cpp @@ -13,11 +13,6 @@ #include "CMSmallARGBController.h" #include "StringUtils.h" -cm_small_argb_headers cm_small_argb_header_data[1] = -{ - { "CM Small ARGB", 0x01, true, 12 } -}; - CMSmallARGBController::CMSmallARGBController(hid_device* dev_handle, char *_path) { dev = dev_handle; @@ -240,9 +235,9 @@ void CMSmallARGBController::SendUpdate() hid_write(dev, buffer, buffer_size); - buffer[CM_SMALL_ARGB_COMMAND_BYTE] = 0x0b; - buffer[CM_SMALL_ARGB_FUNCTION_BYTE] = (false) ? 0x01 : 0x02; //This controls custom mode TODO - buffer[CM_SMALL_ARGB_ZONE_BYTE] = cm_small_argb_header_data[0].header; + buffer[CM_SMALL_ARGB_COMMAND_BYTE] = 0x0B; + buffer[CM_SMALL_ARGB_FUNCTION_BYTE] = 0x02; + buffer[CM_SMALL_ARGB_ZONE_BYTE] = 0x01; buffer[CM_SMALL_ARGB_MODE_BYTE] = current_mode; buffer[CM_SMALL_ARGB_SPEED_BYTE] = current_speed; buffer[CM_SMALL_ARGB_COLOUR_INDEX_BYTE] = (bool_random) ? 0x00 : 0x10; //This looks to still be the colour index and controls random colours diff --git a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h index af0edc9e1..2cb66d36b 100644 --- a/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h +++ b/Controllers/CoolerMasterController/CMSmallARGBController/CMSmallARGBController.h @@ -39,16 +39,6 @@ enum CM_SMALL_ARGB_BLUE_BYTE = 11, }; -struct cm_small_argb_headers -{ - const char* name; - unsigned char header; - bool digital; - unsigned int count; -}; - -extern cm_small_argb_headers cm_small_argb_header_data[1]; - enum { CM_SMALL_ARGB_MODE_SPECTRUM = 0x01, //Spectrum Mode diff --git a/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.cpp b/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.cpp index f4e18e101..a45476eb6 100644 --- a/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.cpp +++ b/Controllers/CoolerMasterController/CMSmallARGBController/RGBController_CMSmallARGBController.cpp @@ -28,10 +28,10 @@ RGBController_CMSmallARGBController::RGBController_CMSmallARGBController(CMSmall { controller = controller_ptr; - name = cm_small_argb_header_data[0].name; + name = controller->GetDeviceName(); vendor = "Cooler Master"; type = DEVICE_TYPE_LEDSTRIP; - description = controller->GetDeviceName(); + description = "Cooler Master Small ARGB Controller Device"; version = controller->GetVersion(); serial = controller->GetSerial(); location = controller->GetLocation(); @@ -289,7 +289,7 @@ void RGBController_CMSmallARGBController::DeviceConfigureZone(int zone_idx) { if((size_t)zone_idx < zones.size()) { - controller->SetLedCount(cm_small_argb_header_data[zone_idx].header, zones[zone_idx].leds_count); + controller->SetLedCount(1, zones[zone_idx].leds_count); SetupZones(); }