jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Patriot Viper Steel detection and clean up Patriot Viper detection

Browse source
This commit is contained in:
Adam Honse 2023-03-25 15:27:57 -05:00
parent 71a3d5355b
commit cf46a8e724
2 changed files with 78 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Controllers/PatriotViperController/PatriotViperControllerDetect.cpp
View file

@ -51,10 +51,7 @@ bool TestForPatriotViperController(i2c_smbus_interface* bus, unsigned char addre
void DetectPatriotViperControllers(std::vector<i2c_smbus_interface*> &busses)
{
PatriotViperController* new_viper;
RGBController_PatriotViper* new_controller;
for (unsigned int bus = 0; bus < busses.size(); bus++)
for(unsigned int bus = 0; bus < busses.size(); bus++)
{
unsigned char slots_valid = 0x00;
@ -105,9 +102,9 @@ void DetectPatriotViperControllers(std::vector<i2c_smbus_interface*> &busses)
if(slots_valid != 0)
{
new_viper = new PatriotViperController(busses[bus], 0x77, slots_valid);
new_controller = new RGBController_PatriotViper(new_viper);
ResourceManager::get()->RegisterRGBController(new_controller);
PatriotViperController* controller = new PatriotViperController(busses[bus], 0x77, slots_valid);
RGBController_PatriotViper* rgb_controller = new RGBController_PatriotViper(controller);
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}
}

82
Controllers/PatriotViperSteelController/PatriotViperSteelControllerDetect.cpp
View file

@ -12,6 +12,32 @@
using namespace std::chrono_literals;
#define PATRIOT_CONTROLLER_NAME "Patriot Viper Steel"
/******************************************************************************************\
* *
* TestForPatriotViperSteelController *
* *
* Tests the given address to see if a Patriot Viper Steel controller exists there. *
* *
\******************************************************************************************/
bool TestForPatriotViperSteelController(i2c_smbus_interface* bus, unsigned char address)
{
bool pass = false;
int res = bus->i2c_smbus_write_quick(address, I2C_SMBUS_WRITE);
LOG_DEBUG("[%s] Writing at address %02X, res=%02X", PATRIOT_CONTROLLER_NAME, address, res);
if (res >= 0)
{
pass = true;
}
return(pass);
} /* TestForPatriotViperSteelController() */
/******************************************************************************************\
* *
* DetectPatriotViperSteelControllers *
@ -27,19 +53,59 @@ void DetectPatriotViperSteelControllers(std::vector<i2c_smbus_interface *> &buss
{
for(unsigned int bus = 0; bus < busses.size(); bus++)
{
unsigned char slots_valid = 0x00;
IF_DRAM_SMBUS(busses[bus]->pci_vendor, busses[bus]->pci_device)
{
std::this_thread::sleep_for(1ms);
// Check for Patriot Viper Steel controller at 0x77
LOG_DEBUG("[%s] Testing bus %d at address 0x77", PATRIOT_CONTROLLER_NAME, bus);
if((busses[bus]->i2c_smbus_read_byte_data(0x20, 0x1D) == 0x0F)
&&(busses[bus]->i2c_smbus_read_byte_data(0x20, 0x1E) == 0x0C)
&&(busses[bus]->i2c_smbus_read_byte_data(0x20, 0x39) == 0x0F)
&&(busses[bus]->i2c_smbus_read_byte_data(0x20, 0x3A) == 0x0C))
if(TestForPatriotViperSteelController(busses[bus], 0x77))
{
PatriotViperSteelController* controller = new PatriotViperSteelController(busses[bus], 0x77);
RGBController_PatriotViperSteel* rgb_controller = new RGBController_PatriotViperSteel(controller);
for(int slot_addr = 0x50; slot_addr <= 0x57; slot_addr++)
{
// Test for Patriot Viper Steel RGB SPD at slot_addr
// This test was copied from PatriotViperControllerDetect
// Tests SPD addresses in order: 0x00, 0x40, 0x41, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68
ResourceManager::get()->RegisterRGBController(rgb_controller);
busses[bus]->i2c_smbus_write_byte_data(0x36, 0x00, 0xFF);
std::this_thread::sleep_for(1ms);
int res = busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x00);
LOG_DEBUG("[%s] Trying to read 0x%02X RAM module data at 0x00 expect: 0x23 res: %02X", PATRIOT_CONTROLLER_NAME, slot_addr, res);
if(res == 0x23)
{
busses[bus]->i2c_smbus_write_byte_data(0x37, 0x00, 0xFF);
std::this_thread::sleep_for(1ms);
if((busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x40) == 0xFF)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x41) == 0xFF)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x61) == 0x50)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x62) == 0x44)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x63) == 0x41)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x64) == 0x31)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x65) == 0x00)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x66) == 0x00)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x67) == 0x00)
&&(busses[bus]->i2c_smbus_read_byte_data(slot_addr, 0x68) == 0x00))
{
LOG_DEBUG("[%s] The 0x%02X RAM module detected", PATRIOT_CONTROLLER_NAME, slot_addr);
slots_valid |= (1 << (slot_addr - 0x50));
}
}
std::this_thread::sleep_for(1ms);
}
if(slots_valid != 0)
{
PatriotViperSteelController* controller = new PatriotViperSteelController(busses[bus], 0x77);
RGBController_PatriotViperSteel* rgb_controller = new RGBController_PatriotViperSteel(controller);
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}
}
}