diff --git a/Controllers/A4TechController/RGBController_BloodyMouse.cpp b/Controllers/A4TechController/RGBController_BloodyMouse.cpp index c926c8a5..230c629c 100644 --- a/Controllers/A4TechController/RGBController_BloodyMouse.cpp +++ b/Controllers/A4TechController/RGBController_BloodyMouse.cpp @@ -168,11 +168,6 @@ void RGBController_BloodyMouse::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_BloodyMouse::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_BloodyMouse::DeviceUpdateMode() { /*---------------------------------------------------------*\ diff --git a/Controllers/A4TechController/RGBController_BloodyMouse.h b/Controllers/A4TechController/RGBController_BloodyMouse.h index 757b8d9a..c2ba6005 100644 --- a/Controllers/A4TechController/RGBController_BloodyMouse.h +++ b/Controllers/A4TechController/RGBController_BloodyMouse.h @@ -34,7 +34,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp index 3b7a7ac6..f3c286e8 100644 --- a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp +++ b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp @@ -236,11 +236,6 @@ void RGBController_AMDWraithPrism::UpdateSingleLED(int led) UpdateZoneLEDs(led); } -void RGBController_AMDWraithPrism::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AMDWraithPrism::DeviceUpdateMode() { bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM); diff --git a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h index 5dfa6d2b..3d8d3181 100644 --- a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h +++ b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.h @@ -25,7 +25,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp index 9e227515..aca538dc 100755 --- a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp +++ b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp @@ -336,11 +336,6 @@ unsigned char RGBController_PolychromeUSB::GetDeviceMode(unsigned char zone) return(active_mode); } -void RGBController_PolychromeUSB::SetCustomMode() -{ - active_mode = POLYCHROME_USB_MODE_DIRECT; -} - void RGBController_PolychromeUSB::DeviceUpdateMode() { for(unsigned int zone_idx = 0; zone_idx < zones.size(); zone_idx++) diff --git a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.h b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.h index 27cfc050..21aabd8d 100755 --- a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.h +++ b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.h @@ -25,7 +25,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.cpp b/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.cpp index 4fe4cf2c..f662ee62 100644 --- a/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.cpp +++ b/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.cpp @@ -26,14 +26,14 @@ RGBController_ASRockASRRGBSMBus::RGBController_ASRockASRRGBSMBus(ASRockASRRGBSMBusController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = controller->GetDeviceName(); - vendor = "ASRock"; - version = controller->GetFirmwareVersion(); - type = DEVICE_TYPE_MOTHERBOARD; - description = "ASRock ASR RGB LED Device"; - location = controller->GetDeviceLocation(); + name = controller->GetDeviceName(); + vendor = "ASRock"; + version = controller->GetFirmwareVersion(); + type = DEVICE_TYPE_MOTHERBOARD; + description = "ASRock ASR RGB LED Device"; + location = controller->GetDeviceLocation(); mode Off; Off.name = "Off"; @@ -196,11 +196,6 @@ void RGBController_ASRockASRRGBSMBus::UpdateSingleLED(int led) controller->SetColorsAndSpeed(led, red, grn, blu); } -void RGBController_ASRockASRRGBSMBus::SetCustomMode() -{ - active_mode = 1; -} - void RGBController_ASRockASRRGBSMBus::DeviceUpdateMode() { diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h b/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h index b663390e..bcf16090 100644 --- a/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h +++ b/Controllers/ASRockSMBusController/RGBController_ASRockASRRGBSMBus.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.cpp b/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.cpp index 18b8da59..57f9e5f0 100644 --- a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.cpp +++ b/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.cpp @@ -38,14 +38,14 @@ static const char* polychrome_v1_zone_names[] = RGBController_ASRockPolychromeV1SMBus::RGBController_ASRockPolychromeV1SMBus(ASRockPolychromeV1SMBusController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = controller->GetDeviceName(); - vendor = "ASRock"; - version = controller->GetFirmwareVersion(); - type = DEVICE_TYPE_MOTHERBOARD; - description = "ASRock Polychrome v1 Device"; - location = controller->GetDeviceLocation(); + name = controller->GetDeviceName(); + vendor = "ASRock"; + version = controller->GetFirmwareVersion(); + type = DEVICE_TYPE_MOTHERBOARD; + description = "ASRock Polychrome v1 Device"; + location = controller->GetDeviceLocation(); mode Off; @@ -329,11 +329,6 @@ void RGBController_ASRockPolychromeV1SMBus::UpdateSingleLED(int zone) controller->SetColorsAndSpeed(zoneIndexMap[zone], red, grn, blu); } -void RGBController_ASRockPolychromeV1SMBus::SetCustomMode() -{ - active_mode = getModeIndex(POLYCHROME_V1_MODE_STATIC); -} - void RGBController_ASRockPolychromeV1SMBus::DeviceUpdateMode() { LOG_TRACE("[%s] DeviceUpdateMode()", name.c_str()); diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h b/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h index 63544e87..7304d0f1 100644 --- a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h +++ b/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV1SMBus.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.cpp b/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.cpp index 8012f99f..0693e026 100644 --- a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.cpp +++ b/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.cpp @@ -33,14 +33,14 @@ static const char* polychrome_v2_zone_names[] = RGBController_ASRockPolychromeV2SMBus::RGBController_ASRockPolychromeV2SMBus(ASRockPolychromeV2SMBusController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = controller->GetDeviceName(); - vendor = "ASRock"; - version = controller->GetFirmwareVersion(); - type = DEVICE_TYPE_MOTHERBOARD; - description = "ASRock Polychrome v2 Device"; - location = controller->GetDeviceLocation(); + name = controller->GetDeviceName(); + vendor = "ASRock"; + version = controller->GetFirmwareVersion(); + type = DEVICE_TYPE_MOTHERBOARD; + description = "ASRock Polychrome v2 Device"; + location = controller->GetDeviceLocation(); mode Off; @@ -316,11 +316,6 @@ void RGBController_ASRockPolychromeV2SMBus::UpdateSingleLED(int led) controller->SetColorsAndSpeed(led, red, grn, blu); } -void RGBController_ASRockPolychromeV2SMBus::SetCustomMode() -{ - active_mode = 1; -} - void RGBController_ASRockPolychromeV2SMBus::DeviceUpdateMode() { diff --git a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h b/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h index 9cdba5c4..e35a856f 100644 --- a/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h +++ b/Controllers/ASRockSMBusController/RGBController_ASRockPolychromeV2SMBus.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AlienwareController/RGBController_Alienware.cpp b/Controllers/AlienwareController/RGBController_Alienware.cpp index 362edf3e..55f7b056 100644 --- a/Controllers/AlienwareController/RGBController_Alienware.cpp +++ b/Controllers/AlienwareController/RGBController_Alienware.cpp @@ -179,11 +179,6 @@ void RGBController_Alienware::UpdateSingleLED(int led) UpdateZoneLEDs(led); } -void RGBController_Alienware::SetCustomMode() -{ - active_mode = 0; -} - static bool modes_eq(const mode& mode1, const mode& mode2) { return( ( mode1.name == mode2.name ) diff --git a/Controllers/AlienwareController/RGBController_Alienware.h b/Controllers/AlienwareController/RGBController_Alienware.h index 8bf21b0e..a3850a08 100644 --- a/Controllers/AlienwareController/RGBController_Alienware.h +++ b/Controllers/AlienwareController/RGBController_Alienware.h @@ -29,8 +29,6 @@ public: void DeviceUpdateMode(); - void SetCustomMode(); - private: AlienwareController* controller; std::chrono::steady_clock::time_point last_packet_ts; diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp index 61e1b63d..1477e422 100644 --- a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp +++ b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp @@ -171,21 +171,21 @@ static const led_type led_names[] = RGBController_AlienwareAW510K::RGBController_AlienwareAW510K(AlienwareAW510KController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "Alienware AW510K Keyboard Device"; - vendor = "Alienware"; - type = DEVICE_TYPE_KEYBOARD; - description = "Alienware AW510K Keyboard Device"; - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = "Alienware AW510K Keyboard Device"; + vendor = "Alienware"; + type = DEVICE_TYPE_KEYBOARD; + description = "Alienware AW510K Keyboard Device"; + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); - mode Direct_Per_LED; - Direct_Per_LED.name = "Direct"; - Direct_Per_LED.value = ALIENWARE_AW510K_MODE_DIRECT_PER_LED; - Direct_Per_LED.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Direct_Per_LED.color_mode = MODE_COLORS_PER_LED; - modes.push_back(Direct_Per_LED); + mode Direct; + Direct.name = "Direct"; + Direct.value = ALIENWARE_AW510K_MODE_DIRECT_PER_LED; + Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Direct.color_mode = MODE_COLORS_PER_LED; + modes.push_back(Direct); mode Static; Static.name = "Static"; @@ -403,11 +403,6 @@ void RGBController_AlienwareAW510K::UpdateSingleLED(int led) controller->UpdateSingleLED(leds[led].value, RGBGetRValue(colors[led]), RGBGetGValue(colors[led]), RGBGetBValue(colors[led])); } -void RGBController_AlienwareAW510K::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AlienwareAW510K::DeviceUpdateMode() { if(active_mode == 0xFFFF) diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h index e7c8c265..00c6f3ff 100644 --- a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h +++ b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp b/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp index 4b04b9a4..790fd827 100644 --- a/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp +++ b/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp @@ -236,11 +236,6 @@ void RGBController_AnnePro2::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_AnnePro2::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AnnePro2::DeviceUpdateMode() { diff --git a/Controllers/AnnePro2Controller/RGBController_AnnePro2.h b/Controllers/AnnePro2Controller/RGBController_AnnePro2.h index e564eee4..06dedf98 100644 --- a/Controllers/AnnePro2Controller/RGBController_AnnePro2.h +++ b/Controllers/AnnePro2Controller/RGBController_AnnePro2.h @@ -24,7 +24,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp index ab690793..8de1e3de 100644 --- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp @@ -44,39 +44,39 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* controller_pt void RGBController_AuraCore::SetupKeyboard() { - name = "ASUS Aura Keyboard"; - vendor = "ASUS"; - type = DEVICE_TYPE_KEYBOARD; - description = "ASUS Aura Core Device"; + name = "ASUS Aura Keyboard"; + vendor = "ASUS"; + type = DEVICE_TYPE_KEYBOARD; + description = "ASUS Aura Core Device"; mode Static; - Static.name = "Static"; - Static.value = AURA_CORE_MODE_STATIC; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Static"; + Static.value = AURA_CORE_MODE_STATIC; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); mode Breathing; - Breathing.name = "Breathing"; - Breathing.value = AURA_CORE_MODE_BREATHING; - Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Breathing.color_mode = MODE_COLORS_PER_LED; + Breathing.name = "Breathing"; + Breathing.value = AURA_CORE_MODE_BREATHING; + Breathing.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Breathing.color_mode = MODE_COLORS_PER_LED; modes.push_back(Breathing); mode ColorCycle; - ColorCycle.name = "Color Cycle"; - ColorCycle.value = AURA_CORE_MODE_SPECTRUM_CYCLE; - ColorCycle.flags = 0; - ColorCycle.color_mode = MODE_COLORS_NONE; + ColorCycle.name = "Color Cycle"; + ColorCycle.value = AURA_CORE_MODE_SPECTRUM_CYCLE; + ColorCycle.flags = 0; + ColorCycle.color_mode = MODE_COLORS_NONE; modes.push_back(ColorCycle); } void RGBController_AuraCore::SetupGA15DH() { - name = "ASUS Aura GA15DH"; - vendor = "ASUS"; - type = DEVICE_TYPE_LEDSTRIP; - description = "ASUS Aura Core Device"; + name = "ASUS Aura GA15DH"; + vendor = "ASUS"; + type = DEVICE_TYPE_LEDSTRIP; + description = "ASUS Aura Core Device"; mode Static; Static.name = "Static"; @@ -160,10 +160,10 @@ void RGBController_AuraCore::SetupGA15DH() modes.push_back(Irradiation); mode Direct; - Static.name = "Direct"; - Static.value = AURA_CORE_MODE_DIRECT; - Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; - Static.color_mode = MODE_COLORS_PER_LED; + Static.name = "Direct"; + Static.value = AURA_CORE_MODE_DIRECT; + Static.flags = MODE_FLAG_HAS_PER_LED_COLOR; + Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); } @@ -312,11 +312,6 @@ void RGBController_AuraCore::UpdateSingleLED(int led) controller->SendApply(); } -void RGBController_AuraCore::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AuraCore::DeviceUpdateMode() { if(modes[active_mode].value == AURA_CORE_MODE_DIRECT) diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h index 9961e1b6..67f94f1c 100644 --- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.h @@ -27,7 +27,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.cpp b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.cpp index bd78f0f2..8a6f2765 100644 --- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.cpp +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.cpp @@ -475,11 +475,6 @@ void RGBController_AsusAuraCoreLaptop::UpdateSingleLED(int led) controller->SetLedsDirect(colour); } -void RGBController_AsusAuraCoreLaptop::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AsusAuraCoreLaptop::DeviceUpdateMode() { mode set_mode = modes[active_mode]; diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.h b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.h index 126cbb56..6c18aa10 100644 --- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.h +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCoreLaptop.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp index 8eee3b08..e1985a44 100644 --- a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp +++ b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp @@ -183,11 +183,6 @@ void RGBController_AuraGPU::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_AuraGPU::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AuraGPU::DeviceUpdateMode() { int new_mode = modes[active_mode].value; diff --git a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h index bbad8553..ee76b3b5 100644 --- a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h +++ b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.h @@ -25,7 +25,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp index 536bf6f2..ba20cb8e 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp @@ -177,12 +177,6 @@ void RGBController_AuraHeadsetStand::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_AuraHeadsetStand::SetCustomMode() -{ - active_mode = 0; -} - - void RGBController_AuraHeadsetStand::DeviceUpdateMode() { unsigned char red = 0; diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.h index 2e84e866..2be21a5c 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.h @@ -35,7 +35,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp index 9b017314..95280e5c 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp @@ -527,11 +527,6 @@ void RGBController_AuraKeyboard::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_AuraKeyboard::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AuraKeyboard::DeviceUpdateMode() { diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h index b4c296c8..ded09cf6 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.h @@ -48,7 +48,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp index 82508a2b..f4e1ef8d 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp @@ -112,12 +112,6 @@ void RGBController_AuraMonitor::UpdateSingleLED(int led) controller->ApplyChanges(); } -void RGBController_AuraMonitor::SetCustomMode() -{ - active_mode = 0; -} - - void RGBController_AuraMonitor::DeviceUpdateMode() { /*---------------------------------------------------------*\ diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.h index 4d0fd3e7..783d0a29 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.h @@ -25,7 +25,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp index 3b4c4393..0b852fbd 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp @@ -221,11 +221,6 @@ void RGBController_AuraMouse::UpdateSingleLED(int led) controller->SendUpdate(leds[led].value, modes[active_mode].value, red, grn, blu, 0, false, 0, modes[active_mode].brightness); } -void RGBController_AuraMouse::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AuraMouse::DeviceUpdateMode() { if(modes[active_mode].color_mode == MODE_COLORS_PER_LED) diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h index 980f31bd..183bcad7 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.h @@ -25,7 +25,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp index 4e0e9c05..442803e2 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp @@ -22,15 +22,15 @@ RGBController_AuraMousemat::RGBController_AuraMousemat(AuraMousematController* controller_ptr) { - controller = controller_ptr; + controller = controller_ptr; - name = "ASUS Aura Mousemat"; - vendor = "ASUS"; - type = DEVICE_TYPE_MOUSEMAT; - description = "ASUS Aura Mousemat Device"; - version = controller->GetVersion(); - location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + name = "ASUS Aura Mousemat"; + vendor = "ASUS"; + type = DEVICE_TYPE_MOUSEMAT; + description = "ASUS Aura Mousemat Device"; + version = controller->GetVersion(); + location = controller->GetDeviceLocation(); + serial = controller->GetSerialString(); mode Direct; Direct.name = "Direct"; @@ -230,11 +230,6 @@ void RGBController_AuraMousemat::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_AuraMousemat::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AuraMousemat::DeviceUpdateMode() { if(modes[active_mode].value == AURA_MOUSEMAT_MODE_DIRECT) diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.h index c4db1744..62242e5d 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.h @@ -43,7 +43,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.cpp index 7faa14c7..4f8b5532 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.cpp @@ -194,11 +194,6 @@ void RGBController_AsusAuraRyuoAIO::UpdateSingleLED(int led) UpdateZoneLEDs(GetLED_Zone(led)); } -void RGBController_AsusAuraRyuoAIO::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AsusAuraRyuoAIO::DeviceUpdateMode() { RGBColor colour = (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) ? modes[active_mode].colors[0] : 0; diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.h index 15141a74..91133967 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraRyuoAIO.h @@ -27,8 +27,8 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); + private: int GetDeviceMode(); int GetLED_Zone(int led_idx); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp index 2458438a..2b88eb02 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp @@ -129,11 +129,6 @@ void RGBController_AuraStrixEvolve::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_AuraStrixEvolve::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AuraStrixEvolve::DeviceUpdateMode() { unsigned char red = RGBGetRValue(colors[0]); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.h index 61514682..43a88df8 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.h @@ -32,7 +32,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp index 016a6c3e..bcdf2378 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp @@ -271,11 +271,6 @@ void RGBController_AuraTUFKeyboard::UpdateSingleLED(int led) controller->UpdateSingleLed(led, red, green, blue); } -void RGBController_AuraTUFKeyboard::SetCustomMode() -{ - active_mode = 0; -} - void RGBController_AuraTUFKeyboard::DeviceUpdateMode() { unsigned char color_mode; diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.h index 532bb07b..df122f42 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.h @@ -35,7 +35,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); void DeviceSaveMode(); diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp index fe7f4bbf..a103323d 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp @@ -249,11 +249,6 @@ void RGBController_AuraUSB::UpdateSingleLED(int led) controller->SetChannelLEDs(channel, zones[channel].colors, zones[channel].leds_count); } -void RGBController_AuraUSB::SetCustomMode() -{ - -} - void RGBController_AuraUSB::DeviceUpdateMode() { initializedMode = true; diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h index 6cc95c7e..d72320b9 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.h @@ -27,7 +27,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp b/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp index 526cca86..485b54ce 100644 --- a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp @@ -196,18 +196,6 @@ void RGBController_ROGStrixLC_Controller::UpdateSingleLED(int led) UpdateZoneLEDs(GetLED_Zone(led)); } -void RGBController_ROGStrixLC_Controller::SetCustomMode() -{ - for(std::size_t mode_idx = 0; mode_idx < modes.size() ; mode_idx++) - { - if (modes[mode_idx].value == ROGSTRIXLC_CONTROLLER_MODE_DIRECT) - { - active_mode = mode_idx; - break; - } - } -} - void RGBController_ROGStrixLC_Controller::DeviceUpdateMode() { RGBColor colour = (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) ? modes[active_mode].colors[0] : 0; diff --git a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.h b/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.h index 90fc0e7b..5f5c27d2 100644 --- a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.h +++ b/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.h @@ -27,7 +27,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: int GetDeviceMode(); diff --git a/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.cpp b/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.cpp index 203fbf1a..c3318114 100644 --- a/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.cpp +++ b/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.cpp @@ -115,11 +115,6 @@ void RGBController_StrixClaw::UpdateSingleLED(int /*led*/) } -void RGBController_StrixClaw::SetCustomMode() -{ - -} - void RGBController_StrixClaw::DeviceUpdateMode() { if(modes[active_mode].value == 0) diff --git a/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.h b/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.h index 52ff170e..1da0f858 100644 --- a/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.h +++ b/Controllers/AsusLegacyUSBController/RGBController_AsusStrixClaw.h @@ -26,7 +26,6 @@ public: void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led); - void SetCustomMode(); void DeviceUpdateMode(); private: diff --git a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp index e117e11e..52cf0955 100644 --- a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp +++ b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp @@ -141,11 +141,6 @@ void RGBController_AsusTUFLaptopWMI::UpdateSingleLED(int /*led*/) DeviceUpdateLEDs(); } -void RGBController_AsusTUFLaptopWMI::SetCustomMode() -{ - SetMode(0); -} - void RGBController_AsusTUFLaptopWMI::DeviceUpdateMode() { DeviceUpdateLEDs(); diff --git a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.h b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.h index 611e5d9d..ca164fb8 100644 --- a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.h +++ b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.h @@ -20,8 +20,6 @@ public: void UpdateSingleLED(int led) override; void DeviceUpdateMode() override; - - void SetCustomMode() override; }; #endif