diff --git a/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp b/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp index 66f41b04..022f9f89 100644 --- a/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp +++ b/Controllers/NZXTHue2Controller/NZXTHue2ControllerDetect.cpp @@ -19,11 +19,13 @@ static void spawn_hue(hid_device_info* info, const std::string& name, int rgb_channels, int fan_channels) { hid_device* dev = hid_open_path(info->path); + if(dev) { - NZXTHue2Controller* controller = new NZXTHue2Controller(dev, rgb_channels, fan_channels, info->path); + NZXTHue2Controller* controller = new NZXTHue2Controller(dev, rgb_channels, fan_channels, info->path); RGBController_NZXTHue2* rgb_controller = new RGBController_NZXTHue2(controller); - rgb_controller->name = name; + rgb_controller->name = name; + ResourceManager::get()->RegisterRGBController(rgb_controller); } } diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp index f281370a..072dc24f 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp @@ -9,17 +9,17 @@ #include "RGBController_NZXTHue2.h" -RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr) +RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* controller_ptr) { - hue2 = hue2_ptr; + controller = controller_ptr; name = "NZXT Hue 2"; vendor = "NZXT"; type = DEVICE_TYPE_LEDSTRIP; description = "NZXT Hue 2 Device"; - version = hue2->GetFirmwareVersion(); - location = hue2->GetLocation(); - serial = hue2->GetSerialString(); + version = controller->GetFirmwareVersion(); + location = controller->GetLocation(); + serial = controller->GetSerialString(); mode Direct; Direct.name = "Direct"; @@ -194,7 +194,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr) RGBController_NZXTHue2::~RGBController_NZXTHue2() { - delete hue2; + delete controller; } void RGBController_NZXTHue2::SetupZones() @@ -202,7 +202,7 @@ void RGBController_NZXTHue2::SetupZones() /*-------------------------------------------------*\ | Set up zones | \*-------------------------------------------------*/ - for(unsigned int zone_idx = 0; zone_idx < hue2->GetNumRGBChannels(); zone_idx++) + for(unsigned int zone_idx = 0; zone_idx < controller->GetNumRGBChannels(); zone_idx++) { zone* new_zone = new zone; @@ -211,7 +211,7 @@ void RGBController_NZXTHue2::SetupZones() new_zone->type = ZONE_TYPE_LINEAR; new_zone->leds_min = 0; new_zone->leds_max = 40; - new_zone->leds_count = hue2->channel_leds[zone_idx]; + new_zone->leds_count = controller->channel_leds[zone_idx]; new_zone->matrix_map = NULL; zones.push_back(*new_zone); @@ -247,20 +247,20 @@ void RGBController_NZXTHue2::DeviceUpdateLEDs() { for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++) { - hue2->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); + controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); } } void RGBController_NZXTHue2::UpdateZoneLEDs(int zone) { - hue2->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count); + controller->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count); } void RGBController_NZXTHue2::UpdateSingleLED(int led) { unsigned int zone_idx = leds[led].value; - hue2->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); + controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); } void RGBController_NZXTHue2::SetCustomMode() @@ -291,7 +291,7 @@ void RGBController_NZXTHue2::DeviceUpdateMode() colors = &modes[active_mode].colors[0]; } - hue2->SetChannelEffect + controller->SetChannelEffect ( zone_idx, modes[active_mode].value, diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h index a3e4201c..298a16ac 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h @@ -13,7 +13,7 @@ class RGBController_NZXTHue2 : public RGBController { public: - RGBController_NZXTHue2(NZXTHue2Controller* hue2_ptr); + RGBController_NZXTHue2(NZXTHue2Controller* controller_ptr); ~RGBController_NZXTHue2(); void SetupZones(); @@ -28,7 +28,7 @@ public: void DeviceUpdateMode(); private: - NZXTHue2Controller* hue2; + NZXTHue2Controller* controller; std::vector leds_channel; std::vector zones_channel; }; diff --git a/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp b/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp index 31aad00c..acab5efc 100644 --- a/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp +++ b/Controllers/NZXTHuePlusController/NZXTHuePlusControllerDetect.cpp @@ -18,21 +18,17 @@ void DetectNZXTHuePlusControllers(std::vector &rgb_controllers) { - size_t i; - HuePlusController* new_hueplus; - RGBController_HuePlus* new_controller; - std::vector ports = find_usb_serial_port(NZXT_HUE_PLUS_VID, NZXT_HUE_PLUS_PID); - for (i = 0; i < ports.size(); i++) + for(unsigned int i = 0; i < ports.size(); i++) { - if( *ports[i] != "" ) + if(*ports[i] != "") { - new_hueplus = new HuePlusController(); - new_hueplus->Initialize((char *)ports[i]->c_str()); + HuePlusController* controller = new HuePlusController(); + controller->Initialize((char *)ports[i]->c_str()); + RGBController_HuePlus* rgb_controller = new RGBController_HuePlus(controller); - new_controller = new RGBController_HuePlus(new_hueplus); - rgb_controllers.push_back(new_controller); + ResourceManager::get()->RegisterRGBController(rgb_controller); } } } /* DetectHuePlusControllers() */ diff --git a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp index f25215b5..8f5af2a6 100644 --- a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp @@ -9,15 +9,15 @@ #include "RGBController_NZXTHuePlus.h" -RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr) +RGBController_HuePlus::RGBController_HuePlus(HuePlusController* controller_ptr) { - hueplus = hueplus_ptr; + controller = controller_ptr; name = "NZXT Hue+"; vendor = "NZXT"; type = DEVICE_TYPE_LEDSTRIP; description = "NZXT Hue+ Device"; - location = hueplus->GetLocation(); + location = controller->GetLocation(); mode Direct; Direct.name = "Direct"; @@ -163,7 +163,7 @@ RGBController_HuePlus::RGBController_HuePlus(HuePlusController* hueplus_ptr) RGBController_HuePlus::~RGBController_HuePlus() { - delete hueplus; + delete controller; } void RGBController_HuePlus::SetupZones() @@ -243,20 +243,20 @@ void RGBController_HuePlus::DeviceUpdateLEDs() { for(std::size_t zone_idx = 0; zone_idx < zones.size(); zone_idx++) { - hueplus->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); + controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); } } void RGBController_HuePlus::UpdateZoneLEDs(int zone) { - hueplus->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count); + controller->SetChannelLEDs(zone, zones[zone].colors, zones[zone].leds_count); } void RGBController_HuePlus::UpdateSingleLED(int led) { unsigned int zone_idx = leds[led].value; - hueplus->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); + controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); } void RGBController_HuePlus::SetCustomMode() @@ -287,7 +287,7 @@ void RGBController_HuePlus::DeviceUpdateMode() colors = &modes[active_mode].colors[0]; } - hueplus->SetChannelEffect + controller->SetChannelEffect ( zone_idx, modes[active_mode].value, diff --git a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h index b6b67489..9146d85a 100644 --- a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h @@ -14,7 +14,7 @@ class RGBController_HuePlus : public RGBController { public: - RGBController_HuePlus(HuePlusController* hueplus_ptr); + RGBController_HuePlus(HuePlusController* controller_ptr); ~RGBController_HuePlus(); void SetupZones(); @@ -29,7 +29,7 @@ public: void DeviceUpdateMode(); private: - HuePlusController* hueplus; + HuePlusController* controller; std::vector leds_channel; std::vector zones_channel; }; diff --git a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp index 0e6eae8d..6308e13a 100644 --- a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp +++ b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp @@ -10,17 +10,17 @@ #include -RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* nzxtkraken_ptr) +RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* controller_ptr) { - nzxtkraken = nzxtkraken_ptr; + controller = controller_ptr; name = "NZXT Kraken X/M"; vendor = "NZXT"; type = DEVICE_TYPE_COOLER; description = "NZXT Kraken X42/X52/X62/X72/M22"; - version = nzxtkraken->GetFirmwareVersion(); - location = nzxtkraken->GetLocation(); - serial = nzxtkraken->GetSerialString(); + version = controller->GetFirmwareVersion(); + location = controller->GetLocation(); + serial = controller->GetSerialString(); mode Direct; Direct.name = "Direct"; @@ -190,7 +190,7 @@ RGBController_NZXTKraken::RGBController_NZXTKraken(NZXTKrakenController* nzxtkra RGBController_NZXTKraken::~RGBController_NZXTKraken() { - delete nzxtkraken; + delete controller; } void RGBController_NZXTKraken::SetupZones() @@ -295,7 +295,7 @@ void RGBController_NZXTKraken::UpdateChannel(NZXTKrakenChannel_t channel, int zo std::vector> update_colors = GetColors(zone, channel_mode); for(std::size_t idx = 0; idx < update_colors.size(); ++idx) { - nzxtkraken->UpdateEffect( + controller->UpdateEffect( channel, channel_mode.value, direction, diff --git a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h index 87da89dc..c69746e4 100644 --- a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h +++ b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h @@ -15,7 +15,7 @@ class RGBController_NZXTKraken : public RGBController { public: - RGBController_NZXTKraken(NZXTKrakenController* nzxtkraken_ptr); + RGBController_NZXTKraken(NZXTKrakenController* controller_ptr); ~RGBController_NZXTKraken(); void SetupZones(); @@ -43,7 +43,7 @@ private: const mode& channel_mode ); - NZXTKrakenController* nzxtkraken; + NZXTKrakenController* controller; std::set logo_modes; int default_mode; };