diff --git a/Controllers/E131Controller/RGBController_E131.cpp b/Controllers/E131Controller/RGBController_E131.cpp index badf8dc4..bde23f66 100644 --- a/Controllers/E131Controller/RGBController_E131.cpp +++ b/Controllers/E131Controller/RGBController_E131.cpp @@ -450,11 +450,6 @@ void RGBController_E131::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_E131::SetCustomMode() -{ - -} - void RGBController_E131::DeviceUpdateMode() { diff --git a/Controllers/E131Controller/RGBController_E131.h b/Controllers/E131Controller/RGBController_E131.h index 3cd06c3d..62b13501 100644 --- a/Controllers/E131Controller/RGBController_E131.h +++ b/Controllers/E131Controller/RGBController_E131.h @@ -69,7 +69,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void KeepaliveThreadFunction(); diff --git a/Controllers/EKController/RGBController_EKController.cpp b/Controllers/EKController/RGBController_EKController.cpp index a88c6054..81a7c17c 100644 --- a/Controllers/EKController/RGBController_EKController.cpp +++ b/Controllers/EKController/RGBController_EKController.cpp @@ -175,11 +175,6 @@ void RGBController_EKController::UpdateSingleLED(int led) UpdateZoneLEDs(led); } -void RGBController_EKController::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_EKController::DeviceUpdateMode() { controller->SetMode(modes[active_mode].value, modes[active_mode].speed); diff --git a/Controllers/EKController/RGBController_EKController.h b/Controllers/EKController/RGBController_EKController.h index 09549d88..1b4b50aa 100644 --- a/Controllers/EKController/RGBController_EKController.h +++ b/Controllers/EKController/RGBController_EKController.h @@ -26,8 +26,8 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); + private: EKController* controller; }; diff --git a/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp index 26e50c24..81a7fa83 100644 --- a/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp +++ b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp @@ -301,11 +301,6 @@ void RGBController_EVGAGPUv3::UpdateSingleLED(int /*led*/ led) DeviceUpdateLEDs(); } -void RGBController_EVGAGPUv3::SetCustomMode() -{ - active_mode = getModeIndex(EVGA_GPU_V3_MODE_STATIC); -} - void RGBController_EVGAGPUv3::DeviceUpdateMode() { /* Update all zone modes in a loop, each one with a packet to be use with per zone control diff --git a/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.h b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.h index 4fa7e7b2..94a14b47 100644 --- a/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.h +++ b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp b/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp index 93501532..122df0be 100644 --- a/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp +++ b/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp @@ -139,11 +139,6 @@ void RGBController_EVGAGP102::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_EVGAGP102::SetCustomMode() -{ - active_mode = 1; -} - void RGBController_EVGAGP102::DeviceUpdateMode() { for (int i = 0; i < evga.size(); i++) diff --git a/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.h b/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.h index e7000c45..59edf12d 100644 --- a/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.h +++ b/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp b/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp index d1c44f67..f01b7693 100644 --- a/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp +++ b/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp @@ -142,11 +142,6 @@ void RGBController_EVGAGPUv1::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_EVGAGPUv1::SetCustomMode() -{ - active_mode = 1; -} - void RGBController_EVGAGPUv1::DeviceUpdateMode() { evga->SetMode((unsigned char)modes[(unsigned int)active_mode].value); diff --git a/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.h b/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.h index a40ac1f1..716b0dfa 100644 --- a/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.h +++ b/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp index e5b8c56b..f93b4e52 100644 --- a/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp +++ b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp @@ -198,11 +198,6 @@ void RGBController_EVGAGPUv2::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_EVGAGPUv2::SetCustomMode() -{ - active_mode = getModeIndex(EVGA_GPU_V2_RGB_MODE_STATIC); -} - void RGBController_EVGAGPUv2::DeviceUpdateMode() { /*---------------------------------------------------------*\ diff --git a/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.h b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.h index 20c48523..31b8876b 100644 --- a/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.h +++ b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp b/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp index 0597a833..61eeb416 100644 --- a/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp +++ b/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp @@ -500,11 +500,6 @@ void RGBController_EVGAKeyboard::UpdateSingleLED(int led) controller->SetLedsDirect(colour); } -void RGBController_EVGAKeyboard::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_EVGAKeyboard::DeviceUpdateMode() { /*---------------------------------------------------------*\ diff --git a/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.h b/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.h index 60864254..368d008b 100644 --- a/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.h +++ b/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.h @@ -24,9 +24,9 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); + private: uint8_t current_mode; diff --git a/Controllers/EVGAUSBController/RGBController_EVGAMouse.cpp b/Controllers/EVGAUSBController/RGBController_EVGAMouse.cpp index eb9414ae..1f391ab2 100644 --- a/Controllers/EVGAUSBController/RGBController_EVGAMouse.cpp +++ b/Controllers/EVGAUSBController/RGBController_EVGAMouse.cpp @@ -205,14 +205,6 @@ void RGBController_EVGAMouse::UpdateSingleLED(int led) controller->SetLed(led, modes[active_mode].brightness, modes[active_mode].speed, colors[led]); } -void RGBController_EVGAMouse::SetCustomMode() -{ - /*-------------------------------------------------*\ - | Static lets OpenRGB set device LEDs individually. | - \*-------------------------------------------------*/ - active_mode = EVGA_PERIPHERAL_MODE_STATIC; -} - void RGBController_EVGAMouse::DeviceUpdateMode() { controller->SetMode(modes[active_mode].value); diff --git a/Controllers/EVGAUSBController/RGBController_EVGAMouse.h b/Controllers/EVGAUSBController/RGBController_EVGAMouse.h index 4da0a1c4..e070684d 100644 --- a/Controllers/EVGAUSBController/RGBController_EVGAMouse.h +++ b/Controllers/EVGAUSBController/RGBController_EVGAMouse.h @@ -30,9 +30,9 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); + private: void Init_Controller(); int GetDeviceMode(); diff --git a/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp b/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp index 570605e6..f64152a4 100644 --- a/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp +++ b/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp @@ -299,11 +299,6 @@ void RGBController_EVisionKeyboard::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_EVisionKeyboard::SetCustomMode() -{ - -} - void RGBController_EVisionKeyboard::DeviceUpdateMode() { unsigned char red = 0x00; diff --git a/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.h b/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.h index e9791d75..6622b8cc 100644 --- a/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.h +++ b/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.h @@ -25,7 +25,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/EspurnaController/RGBController_Espurna.cpp b/Controllers/EspurnaController/RGBController_Espurna.cpp index 37724fed..b5436ef3 100644 --- a/Controllers/EspurnaController/RGBController_Espurna.cpp +++ b/Controllers/EspurnaController/RGBController_Espurna.cpp @@ -84,11 +84,6 @@ void RGBController_Espurna::UpdateSingleLED(int /*led*/) controller->SetLEDs(colors); } -void RGBController_Espurna::SetCustomMode() -{ - -} - void RGBController_Espurna::DeviceUpdateMode() { diff --git a/Controllers/EspurnaController/RGBController_Espurna.h b/Controllers/EspurnaController/RGBController_Espurna.h index ee932f72..28f5d722 100644 --- a/Controllers/EspurnaController/RGBController_Espurna.h +++ b/Controllers/EspurnaController/RGBController_Espurna.h @@ -24,7 +24,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: