mirror/OpenRGB
1
0
Fork 0
mirror of https://github.com/CalcProgrammer1/OpenRGB.git synced 2025-12-23 23:37:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove apply register variable, fix ROG Strix 3070 name

Browse Source
This commit is contained in:
Adam Honse
2021-11-18 14:50:46 -06:00
parent 4f3f134381
commit 1dcc09445b
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Controllers/ENESMBusController/ENESMBusController.cpp
View File

@@ -78,7 +78,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT;
effect_reg = ENE_REG_COLORS_EFFECT;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V1;
}
// DIMM_LED-0102 - First generation DRAM controller (Trident Z RGB)
@@ -86,7 +85,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT;
effect_reg = ENE_REG_COLORS_EFFECT;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V1;
}
// AUDA0-E6K5-0101 - Second generation DRAM controller (Geil Super Luce)
@@ -94,7 +92,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT_V2;
effect_reg = ENE_REG_COLORS_EFFECT_V2;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V1;
}
// AUMA0-E6K5-0106 - Second generation motherboard controller
@@ -102,7 +99,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT_V2;
effect_reg = ENE_REG_COLORS_EFFECT_V2;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V2;
}
// AUMA0-E6K5-0105 - Second generation motherboard controller
@@ -110,7 +106,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT_V2;
effect_reg = ENE_REG_COLORS_EFFECT_V2;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V2;
}
// AUMA0-E6K5-0104 - Second generation motherboard controller
@@ -118,7 +113,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT_V2;
effect_reg = ENE_REG_COLORS_EFFECT_V2;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V2;
}
// AUMA0-E8K4-0101 - First generation motherboard controller
@@ -126,7 +120,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT;
effect_reg = ENE_REG_COLORS_EFFECT;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V1;
}
// AUMA0-E6K5-0107 - Second generation GPU controller
@@ -134,7 +127,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT_V2;
effect_reg = ENE_REG_COLORS_EFFECT_V2;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V2;
// Read LED count from configuration table
@@ -145,7 +137,6 @@ ENESMBusController::ENESMBusController(i2c_smbus_interface* bus, ene_dev_id dev)
{
direct_reg = ENE_REG_COLORS_DIRECT;
effect_reg = ENE_REG_COLORS_EFFECT;
apply_reg = ENE_REG_APPLY;
channel_cfg = ENE_CONFIG_CHANNEL_V1;
}
}
@@ -262,7 +253,7 @@ unsigned char ENESMBusController::GetLEDBlueEffect(unsigned int led)
void ENESMBusController::SaveMode()
{
ENERegisterWrite(apply_reg, ENE_SAVE_VAL);
ENERegisterWrite(ENE_REG_APPLY, ENE_SAVE_VAL);
}
void ENESMBusController::SetAllColorsDirect(unsigned char red, unsigned char green, unsigned char blue)
@@ -294,7 +285,7 @@ void ENESMBusController::SetAllColorsEffect(unsigned char red, unsigned char gre
ENERegisterWriteBlock(effect_reg, colors, led_count * 3);
ENERegisterWrite(apply_reg, ENE_APPLY_VAL);
ENERegisterWrite(ENE_REG_APPLY, ENE_APPLY_VAL);
delete[] colors;
}
@@ -302,7 +293,7 @@ void ENESMBusController::SetAllColorsEffect(unsigned char red, unsigned char gre
void ENESMBusController::SetDirect(unsigned char direct)
{
ENERegisterWrite(ENE_REG_DIRECT, direct);
ENERegisterWrite(apply_reg, ENE_APPLY_VAL);
ENERegisterWrite(ENE_REG_APPLY, ENE_APPLY_VAL);
}
void ENESMBusController::SetLEDColorDirect(unsigned int led, unsigned char red, unsigned char green, unsigned char blue)
@@ -318,7 +309,7 @@ void ENESMBusController::SetLEDColorEffect(unsigned int led, unsigned char red,
ENERegisterWriteBlock(effect_reg + (3 * led), colors, 3);
ENERegisterWrite(apply_reg, ENE_APPLY_VAL);
ENERegisterWrite(ENE_REG_APPLY, ENE_APPLY_VAL);
}
void ENESMBusController::SetMode(unsigned char mode, unsigned char speed, unsigned char direction)
@@ -326,7 +317,7 @@ void ENESMBusController::SetMode(unsigned char mode, unsigned char speed, unsign
ENERegisterWrite(ENE_REG_MODE, mode);
ENERegisterWrite(ENE_REG_SPEED, speed);
ENERegisterWrite(ENE_REG_DIRECTION, direction);
ENERegisterWrite(apply_reg, ENE_APPLY_VAL);
ENERegisterWrite(ENE_REG_APPLY, ENE_APPLY_VAL);
}
void ENESMBusController::UpdateDeviceName()

2
Controllers/ENESMBusController/ENESMBusController.h
View File

@@ -33,7 +33,6 @@ enum
ENE_REG_SPEED = 0x8022, /* Speed Control Register */
ENE_REG_DIRECTION = 0x8023, /* Direction Control Register */
ENE_REG_APPLY = 0x80A0, /* Apply Changes Register */
ENE_REG_APPLY_0107 = 0x802F, /* Apply Changes Register (0107) */
ENE_REG_SLOT_INDEX = 0x80F8, /* Slot Index Register (RAM only) */
ENE_REG_I2C_ADDRESS = 0x80F9, /* I2C Address Register (RAM only) */
ENE_REG_COLORS_DIRECT_V2 = 0x8100, /* Direct Colors (v2) 30 bytes */
@@ -134,7 +133,6 @@ private:
unsigned int led_count;
ene_register direct_reg;
ene_register effect_reg;
ene_register apply_reg;
unsigned char channel_cfg;
i2c_smbus_interface * bus;
ene_dev_id dev;

4
Controllers/ENESMBusController/ENESMBusControllerDetect.cpp
View File

@@ -77,7 +77,7 @@ typedef struct
static const gpu_pci_device device_list[] =
{
{ NVIDIA_VEN, NVIDIA_RTX3070_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_RTX_3070, 0x67, "ASUS 3070" },
{ NVIDIA_VEN, NVIDIA_RTX3070_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_RTX_3070_OC, 0x67, "ASUS ROG STRIX 3070 OC" },
{ NVIDIA_VEN, NVIDIA_RTX3090_DEV, ASUS_SUB_VEN, ASUS_ROG_STRIX_RTX_3090_024G_GAMING, 0x67, "ASUS ROG STRIX 3090 024G GAMING" },
};
@@ -333,7 +333,7 @@ void DetectENESMBusGPUControllers(std::vector<i2c_smbus_interface*> &busses)
rgb_controller->name = device_list[dev_idx].name;
rgb_controller->type = DEVICE_TYPE_GPU;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
else

2
pci_ids/pci_ids.h
View File

@@ -133,7 +133,7 @@
#define ASUS_RX570_STRIX_O4G_GAMING_OC 0x04C2
#define ASUS_RX580_STRIX_GAMING_OC 0x0517
#define ASUS_RX580_STRIX_GAMING_TOP 0x0519
#define ASUS_ROG_STRIX_RTX_3070 0x87B8
#define ASUS_ROG_STRIX_RTX_3070_OC 0x87B8
#define ASUS_ROG_STRIX_RTX_3090_024G_GAMING 0x87AF
/*-----------------------------------------------------*\