mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2026-03-30 20:01:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Several improvements to the controller

Browse Source 
Corrected syntax errors
Corrected logical errors
Readability improvements
Build no longer segfaults changing zone
This commit is contained in:
Chris
2020-04-22 03:03:32 +10:00
committed by Adam Honse
parent 984c6bb7f5
commit 0703bcd0a8
4 changed files with 99 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
Controllers/CoolerMasterController/CMMP750Controller.cpp
View File

@@ -12,21 +12,29 @@
#include <stdio.h>
#include <stdlib.h>
CMMP750Controller::CMMP750Controller(libusb_device_handle* dev_handle)
CMMP750Controller::CMMP750Controller(libusb_device_handle* dev_handle, unsigned int _inAddr, unsigned int _outAddr, int _interface)
{
dev = dev_handle;
inAddr = 0x82;
outAddr = 0x03;
inAddr = _inAddr;
outAddr = _outAddr;
interface = _interface;
strcpy(device_name, "CoolerMaster MP750");
libusb_device* device = libusb_get_device(dev);
int bus = libusb_get_bus_number(device);
int bus_addr = libusb_get_device_address(device);
int port = libusb_get_port_number(device);
location = "Bus: " + std::to_string(bus) + " Addr: " + std::to_string(bus_addr) + " Port: " + std::to_string(port);
current_mode = MP750_MODE_BREATHING;
current_speed = 0x80;
strcpy(device_name, "Cooler Master MP750");
current_mode = MP750_MODE_STATIC;
current_speed = MP750_SPEED_NORMAL;
}
CMMP750Controller::~CMMP750Controller()
{
libusb_release_interface(dev, interface);
libusb_attach_kernel_driver(dev, interface);
}
char* CMMP750Controller::GetDeviceName()
@@ -34,55 +42,59 @@ char* CMMP750Controller::GetDeviceName()
return device_name;
}
char* CMMP750Controller::GetSerial()
{
return serial;
}
std::string CMMP750Controller::GetLocation()
{
return location;
}
void CMMP750Controller::SetMode(unsigned char mode, unsigned char speed)
{
int actual = 0;
unsigned char buffer[6] = { 0x00 };
int buffer_size = (sizeof(buffer) / sizeof(buffer[0]));
for(int i = 0; i < buffer_size; i++)
{
buffer[i] = colour_mode_data[mode][i];
}
current_mode = mode;
current_speed = speed;
if(mode > 3)
{ //If the mode is random colours set SPEED at BYTE2
buffer[2] = speed;
}
else
{ //Otherwise SPEED is BYTE5
buffer[2] = current_red;
buffer[3] = current_green;
buffer[4] = current_blue;
buffer[5] = speed;
}
libusb_interrupt_transfer(dev, outAddr, buffer, buffer_size, &actual, 0);
libusb_interrupt_transfer(dev, inAddr, buffer, buffer_size, &actual, 0);
SendUpdate();
}
void CMMP750Controller::SetColor(unsigned char red, unsigned char green, unsigned char blue)
{
current_red = red;
current_green = green;
current_blue = blue;
SendUpdate();
}
void CMMP750Controller::SendUpdate()
{
int actual = 0;
unsigned char buffer[6] = { 0x00 };
unsigned char buffer[0x40] = { 0x00 };
int buffer_size = (sizeof(buffer) / sizeof(buffer[0]));
for(int i=0; i < buffer_size; i++)
for(int i = 0; i < CM_COLOUR_MODE_DATA_SIZE; i++)
{
buffer[i] = colour_mode_data[current_mode][i];
}
if(current_mode > 3)
{ //If the mode is random colours set SPEED at BYTE2
buffer[2] = current_speed;
if(current_mode > MP750_MODE_BREATHING)
{
//If the mode is random colours set SPEED at BYTE2
buffer[CM_RED_BYTE] = speed_mode_data[current_mode][current_speed];
}
else
{ //Otherwise SPEED is BYTE5
buffer[2] = red;
buffer[3] = green;
buffer[4] = blue;
buffer[5] = current_speed;
{
//Otherwise SPEED is BYTE5
buffer[CM_RED_BYTE] = current_red;
buffer[CM_GREEN_BYTE] = current_green;
buffer[CM_BLUE_BYTE] = current_blue;
buffer[CM_SPEED_BYTE] = speed_mode_data[current_mode][current_speed];
}
libusb_interrupt_transfer(dev, outAddr, buffer, buffer_size, &actual, 0);
libusb_interrupt_transfer(dev, inAddr, buffer, buffer_size, &actual, 0);
//Nothing will be done with the "actual" transfer length
libusb_interrupt_transfer(dev, outAddr, buffer, buffer_size, nullptr, CM_INTERRUPT_TIMEOUT);
}