From bc1ba87e13adaac0a4005063cb43326d0803a793 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sun, 21 Aug 2022 16:04:10 -0500 Subject: [PATCH] Remove SetCustomMode from all controllers beginning with the letter N --- Controllers/N5312AController/RGBController_N5312A.cpp | 5 ----- Controllers/N5312AController/RGBController_N5312A.h | 3 ++- .../RGBController_NVIDIAIllumination.cpp | 5 ----- .../RGBController_NVIDIAIllumination.h | 11 +++-------- .../NZXTHue2Controller/RGBController_NZXTHue2.cpp | 5 ----- .../NZXTHue2Controller/RGBController_NZXTHue2.h | 2 -- .../RGBController_NZXTHuePlus.cpp | 5 ----- .../NZXTHuePlusController/RGBController_NZXTHuePlus.h | 2 -- .../NZXTKrakenController/RGBController_NZXTKraken.cpp | 5 ----- .../NZXTKrakenController/RGBController_NZXTKraken.h | 2 -- .../NanoleafController/RGBController_Nanoleaf.cpp | 5 ----- .../NanoleafController/RGBController_Nanoleaf.h | 1 - .../NvidiaESAController/RGBController_NvidiaESA.cpp | 5 ----- .../NvidiaESAController/RGBController_NvidiaESA.h | 3 ++- 14 files changed, 7 insertions(+), 52 deletions(-) diff --git a/Controllers/N5312AController/RGBController_N5312A.cpp b/Controllers/N5312AController/RGBController_N5312A.cpp index b06aec77..ce6621f1 100644 --- a/Controllers/N5312AController/RGBController_N5312A.cpp +++ b/Controllers/N5312AController/RGBController_N5312A.cpp @@ -131,11 +131,6 @@ void RGBController_N5312A::UpdateSingleLED(int led) UpdateZoneLEDs(led); } -void RGBController_N5312A::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_N5312A::DeviceUpdateMode() { const RGBColor& color = modes[active_mode].value == N5312A_OFF_MODE_VALUE ? 0 : colors[0]; diff --git a/Controllers/N5312AController/RGBController_N5312A.h b/Controllers/N5312AController/RGBController_N5312A.h index e49ff35b..e63f06de 100644 --- a/Controllers/N5312AController/RGBController_N5312A.h +++ b/Controllers/N5312AController/RGBController_N5312A.h @@ -20,11 +20,12 @@ public: void SetupZones(); void ResizeZone(int zone, int new_size); + void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); + void DeviceUpdateMode(); - void SetCustomMode(); private: N5312AController* controller; diff --git a/Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.cpp b/Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.cpp index bc77f25b..ba57f48f 100644 --- a/Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.cpp +++ b/Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.cpp @@ -164,11 +164,6 @@ uint8_t RGBController_NVIDIAIlluminationV1::getModeIndex(uint8_t mode_value) return 0; } -void RGBController_NVIDIAIlluminationV1::SetCustomMode() -{ - active_mode = getModeIndex(NVIDIA_ILLUMINATION_DIRECT); -} - void RGBController_NVIDIAIlluminationV1::DeviceUpdateMode() { DeviceUpdateLEDs(); diff --git a/Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.h b/Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.h index 0b92cb53..ba7d7160 100644 --- a/Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.h +++ b/Controllers/NVIDIAIlluminationController/RGBController_NVIDIAIllumination.h @@ -22,20 +22,15 @@ class RGBController_NVIDIAIlluminationV1 : public RGBController RGBController_NVIDIAIlluminationV1(NVIDIAIlluminationV1Controller* nvidia_founders_ptr); ~RGBController_NVIDIAIlluminationV1(); - void UpdateSingleLED(int led); - void SetupZones(); + void ResizeZone(int zone, int new_size); void DeviceUpdateLEDs(); - - void UpdateZoneLEDs(int); - - void SetCustomMode(); + void UpdateZoneLEDs(int zone); + void UpdateSingleLED(int led); void DeviceUpdateMode(); - void ResizeZone(int, int); - private: uint8_t getModeIndex(uint8_t mode_value); NVIDIAIlluminationV1Controller* controller; diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp index 3c9d4002..b50bec75 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp @@ -273,11 +273,6 @@ void RGBController_NZXTHue2::UpdateSingleLED(int led) controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); } -void RGBController_NZXTHue2::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_NZXTHue2::DeviceUpdateMode() { if(modes[active_mode].value == 0xFFFF) diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h index 298a16ac..0a9b0a21 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.h @@ -17,14 +17,12 @@ public: ~RGBController_NZXTHue2(); void SetupZones(); - void ResizeZone(int zone, int new_size); void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp index c86620f0..0ce79f40 100644 --- a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp @@ -269,11 +269,6 @@ void RGBController_HuePlus::UpdateSingleLED(int led) controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count); } -void RGBController_HuePlus::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_HuePlus::DeviceUpdateMode() { if(modes[active_mode].value == HUE_PLUS_MODE_FIXED) diff --git a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h index 9146d85a..f5a530c8 100644 --- a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.h @@ -18,14 +18,12 @@ public: ~RGBController_HuePlus(); void SetupZones(); - void ResizeZone(int zone, int new_size); void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp index 03a9e53b..60cd5d8d 100644 --- a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp +++ b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp @@ -355,11 +355,6 @@ void RGBController_NZXTKraken::UpdateSingleLED(int led) UpdateZoneLEDs(zone); } -void RGBController_NZXTKraken::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_NZXTKraken::DeviceUpdateMode() { DeviceUpdateLEDs(); diff --git a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h index c69746e4..d7c92fcc 100644 --- a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h +++ b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.h @@ -19,14 +19,12 @@ public: ~RGBController_NZXTKraken(); void SetupZones(); - void ResizeZone(int zone, int new_size); void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/NanoleafController/RGBController_Nanoleaf.cpp b/Controllers/NanoleafController/RGBController_Nanoleaf.cpp index 812ab20f..98fd6ad6 100644 --- a/Controllers/NanoleafController/RGBController_Nanoleaf.cpp +++ b/Controllers/NanoleafController/RGBController_Nanoleaf.cpp @@ -127,11 +127,6 @@ void RGBController_Nanoleaf::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_Nanoleaf::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_Nanoleaf::DeviceUpdateMode() { /*---------------------------------------------------------*\ diff --git a/Controllers/NanoleafController/RGBController_Nanoleaf.h b/Controllers/NanoleafController/RGBController_Nanoleaf.h index 11e4f236..82133149 100644 --- a/Controllers/NanoleafController/RGBController_Nanoleaf.h +++ b/Controllers/NanoleafController/RGBController_Nanoleaf.h @@ -24,7 +24,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp b/Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp index 7756c229..48efeb98 100644 --- a/Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp +++ b/Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp @@ -106,11 +106,6 @@ void RGBController_NvidiaESA::UpdateSingleLED(int /*led*/) UpdateZoneLEDs(0); } -void RGBController_NvidiaESA::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_NvidiaESA::DeviceUpdateMode() { DeviceUpdateLEDs(); diff --git a/Controllers/NvidiaESAController/RGBController_NvidiaESA.h b/Controllers/NvidiaESAController/RGBController_NvidiaESA.h index 36024f65..1fd8d8d7 100644 --- a/Controllers/NvidiaESAController/RGBController_NvidiaESA.h +++ b/Controllers/NvidiaESAController/RGBController_NvidiaESA.h @@ -20,11 +20,12 @@ public: void SetupZones(); void ResizeZone(int zone, int new_size); + void DeviceUpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); + void DeviceUpdateMode(); - void SetCustomMode(); private: NvidiaESAController* controller;