diff --git a/Controllers/PNYLovelaceGPUController/PNYLovelaceGPUControllerDetect.cpp b/Controllers/PNYLovelaceGPUController/PNYLovelaceGPUControllerDetect.cpp index 82240b13..b7ca4681 100644 --- a/Controllers/PNYLovelaceGPUController/PNYLovelaceGPUControllerDetect.cpp +++ b/Controllers/PNYLovelaceGPUController/PNYLovelaceGPUControllerDetect.cpp @@ -35,6 +35,7 @@ void DetectPNYLovelaceGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, ResourceManager::get()->RegisterRGBController(rgb_controller); } /* DetectPNYLovelaceGPUControllers() */ +REGISTER_I2C_PCI_DETECTOR("PNY 4070TI XLR8 VERTO Epic-X", DetectPNYLovelaceGPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV, PNY_SUB_VEN, PNY_RTX_4070TI_XLR8_VERTO_EPIC_X_SUB_DEV, 0x60); REGISTER_I2C_PCI_DETECTOR("PNY 4070TI XLR8 VERTO REV1", DetectPNYLovelaceGPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV, PNY_SUB_VEN, PNY_RTX_4070TI_XLR8_VERTO_REV1_SUB_DEV, 0x60); REGISTER_I2C_PCI_DETECTOR("PNY 4070TI XLR8 VERTO REV2", DetectPNYLovelaceGPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV, PNY_SUB_VEN, PNY_RTX_4070TI_XLR8_VERTO_REV2_SUB_DEV, 0x60); REGISTER_I2C_PCI_DETECTOR("PNY 4070TI XLR8 VERTO OC", DetectPNYLovelaceGPUControllers, NVIDIA_VEN, NVIDIA_RTX4070TI_DEV, PNY_SUB_VEN, PNY_RTX_4070TI_XLR8_VERTO_OC_SUB_DEV, 0x60); diff --git a/Controllers/PNYLovelaceGPUController/RGBController_PNYLovelaceGPU.cpp b/Controllers/PNYLovelaceGPUController/RGBController_PNYLovelaceGPU.cpp index 2bca8089..83eaeff7 100644 --- a/Controllers/PNYLovelaceGPUController/RGBController_PNYLovelaceGPU.cpp +++ b/Controllers/PNYLovelaceGPUController/RGBController_PNYLovelaceGPU.cpp @@ -28,16 +28,8 @@ RGBController_PNYLovelaceGPU::RGBController_PNYLovelaceGPU(PNYLovelaceGPUControl vendor = "PNY"; description = "PNY RGB GPU Device"; location = controller->GetDeviceLocation(); - type = DEVICE_TYPE_GPU; - mode Off; - Off.name = "Off"; - Off.value = PNY_GPU_MODE_OFF; - Off.flags = 0; - Off.color_mode = MODE_COLORS_NONE; - modes.push_back(Off); - mode Direct; Direct.name = "Direct"; Direct.value = PNY_GPU_MODE_STATIC; @@ -46,16 +38,16 @@ RGBController_PNYLovelaceGPU::RGBController_PNYLovelaceGPU(PNYLovelaceGPUControl modes.push_back(Direct); mode Cycle; - Cycle.name = "Cycle"; - Cycle.value = PNY_GPU_MODE_CYCLE; - Cycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; - Cycle.speed = 0x89; - Cycle.speed_min = 0; - Cycle.speed_max = 0xB2; - Cycle.brightness = 0xFF; - Cycle.brightness_min = 0; - Cycle.brightness_max = 0xFF; - Cycle.color_mode = MODE_COLORS_NONE; + Cycle.name = "Cycle"; + Cycle.value = PNY_GPU_MODE_CYCLE; + Cycle.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; + Cycle.speed = 0x89; + Cycle.speed_min = 0; + Cycle.speed_max = 0xB2; + Cycle.brightness = 0xFF; + Cycle.brightness_min = 0; + Cycle.brightness_max = 0xFF; + Cycle.color_mode = MODE_COLORS_NONE; modes.push_back(Cycle); mode Breath; @@ -72,34 +64,41 @@ RGBController_PNYLovelaceGPU::RGBController_PNYLovelaceGPU(PNYLovelaceGPUControl modes.push_back(Breath); mode Wave; - Wave.name = "Wave"; - Wave.value = PNY_GPU_MODE_WAVE; - Wave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; - Wave.speed = 0x60; - Wave.speed_min = 0; - Wave.speed_max = 0xBF; - Wave.brightness = 0xFF; - Wave.brightness_min = 0; - Wave.brightness_max = 0xFF; - Wave.color_mode = MODE_COLORS_NONE; + Wave.name = "Wave"; + Wave.value = PNY_GPU_MODE_WAVE; + Wave.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS; + Wave.speed = 0x60; + Wave.speed_min = 0; + Wave.speed_max = 0xBF; + Wave.brightness = 0xFF; + Wave.brightness_min = 0; + Wave.brightness_max = 0xFF; + Wave.color_mode = MODE_COLORS_NONE; modes.push_back(Wave); mode Flash; - Flash.name = "Flash"; - Flash.value = PNY_GPU_MODE_FLASH; - Flash.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; - Flash.speed = 0x27; - Flash.speed_min = 0; - Flash.speed_max = 0x4D; - Flash.brightness = 0xFF; - Flash.brightness_min = 0; - Flash.brightness_max = 0xFF; - Flash.colors_min = 1; - Flash.colors_max = 1; + Flash.name = "Flash"; + Flash.value = PNY_GPU_MODE_FLASH; + Flash.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR; + Flash.speed = 0x27; + Flash.speed_min = 0; + Flash.speed_max = 0x4D; + Flash.brightness = 0xFF; + Flash.brightness_min = 0; + Flash.brightness_max = 0xFF; + Flash.colors_min = 1; + Flash.colors_max = 1; Flash.colors.resize(1); - Flash.color_mode = MODE_COLORS_MODE_SPECIFIC; + Flash.color_mode = MODE_COLORS_MODE_SPECIFIC; modes.push_back(Flash); + mode Off; + Off.name = "Off"; + Off.value = PNY_GPU_MODE_OFF; + Off.flags = 0; + Off.color_mode = MODE_COLORS_NONE; + modes.push_back(Off); + SetupZones(); // Initialize active mode @@ -115,7 +114,7 @@ void RGBController_PNYLovelaceGPU::SetupZones() new_zone->name = "GPU Zone"; new_zone->type = ZONE_TYPE_SINGLE; - new_zone->leds_min = 1; + new_zone->leds_min = 3; new_zone->leds_max = 3; new_zone->leds_count = 3; new_zone->matrix_map = NULL; diff --git a/pci_ids/pci_ids.h b/pci_ids/pci_ids.h index 47cf5935..5fb038e2 100644 --- a/pci_ids/pci_ids.h +++ b/pci_ids/pci_ids.h @@ -632,6 +632,7 @@ #define PNY_RTX_3090_XLR8_REVEL_EPIC_X_SUB_DEV 0x136A #define PNY_RTX_3060TI_XLR8_REVEL_EPIC_X_SUB_DEV 0x1389 #define PNY_RTX_2060_XLR8_OC_SUB_DEV 0x1363 +#define PNY_RTX_4070TI_XLR8_VERTO_EPIC_X_SUB_DEV 0x13D4 #define PNY_RTX_4070TI_XLR8_VERTO_REV1_SUB_DEV 0x13B1 #define PNY_RTX_4070TI_XLR8_VERTO_REV2_SUB_DEV 0x13D5 #define PNY_RTX_4070TI_XLR8_VERTO_OC_SUB_DEV 0x13B2