diff --git a/rog-control-center/src/ui/setup_system.rs b/rog-control-center/src/ui/setup_system.rs index fb41168c..c0953417 100644 --- a/rog-control-center/src/ui/setup_system.rs +++ b/rog-control-center/src/ui/setup_system.rs @@ -40,10 +40,6 @@ pub fn setup_system_page(ui: &MainWindow, _config: Arc>) { ui.global::().set_platform_profile(-1); ui.global::().set_panel_overdrive(-1); ui.global::().set_boot_sound(-1); - ui.global::().set_kbd_leds_awake(-1); - ui.global::().set_kbd_leds_sleep(-1); - ui.global::().set_kbd_leds_boot(-1); - ui.global::().set_kbd_leds_shutdown(-1); ui.global::().set_screen_auto_brightness(-1); ui.global::().set_mcu_powersave(-1); ui.global::().set_mini_led_mode(-1); @@ -673,26 +669,6 @@ pub fn setup_system_page_callbacks(ui: &MainWindow, _states: Arc>) setup_callback!(boot_sound, handle, attr, i32); setup_external!(boot_sound, i32, handle, attr, value) } - FirmwareAttribute::KbdLedsAwake => { - init_property!(kbd_leds_awake, handle, value, i32); - setup_callback!(kbd_leds_awake, handle, attr, i32); - setup_external!(kbd_leds_awake, i32, handle, attr, value) - } - FirmwareAttribute::KbdLedsSleep => { - init_property!(kbd_leds_sleep, handle, value, i32); - setup_callback!(kbd_leds_sleep, handle, attr, i32); - setup_external!(kbd_leds_sleep, i32, handle, attr, value) - } - FirmwareAttribute::KbdLedsBoot => { - init_property!(kbd_leds_boot, handle, value, i32); - setup_callback!(kbd_leds_boot, handle, attr, i32); - setup_external!(kbd_leds_boot, i32, handle, attr, value) - } - FirmwareAttribute::KbdLedsShutdown => { - init_property!(kbd_leds_shutdown, handle, value, i32); - setup_callback!(kbd_leds_shutdown, handle, attr, i32); - setup_external!(kbd_leds_shutdown, i32, handle, attr, value) - } FirmwareAttribute::ScreenAutoBrightness => { init_property!(screen_auto_brightness, handle, value, i32); setup_callback!(screen_auto_brightness, handle, attr, i32); diff --git a/rog-control-center/ui/pages/system.slint b/rog-control-center/ui/pages/system.slint index fb1ae9ae..5a4ab43e 100644 --- a/rog-control-center/ui/pages/system.slint +++ b/rog-control-center/ui/pages/system.slint @@ -51,14 +51,6 @@ export global SystemPageData { callback cb_panel_overdrive(int); in-out property boot_sound; callback cb_boot_sound(int); - in-out property kbd_leds_awake; - callback cb_kbd_leds_awake(int); - in-out property kbd_leds_sleep; - callback cb_kbd_leds_sleep(int); - in-out property kbd_leds_boot; - callback cb_kbd_leds_boot(int); - in-out property kbd_leds_shutdown; - callback cb_kbd_leds_shutdown(int); in-out property screen_auto_brightness; callback cb_screen_auto_brightness(int); in-out property mcu_powersave; @@ -252,66 +244,6 @@ export component PageSystem inherits Rectangle { } } - if SystemPageData.kbd_leds_awake != -1 || - SystemPageData.kbd_leds_sleep != -1 || - SystemPageData.kbd_leds_boot != -1 || - SystemPageData.kbd_leds_shutdown != -1: VerticalLayout { - padding: 0px; - spacing: 0px; - alignment: LayoutAlignment.start; - Rectangle { - background: Palette.alternate-background; - border-color: Palette.border; - border-width: 1px; - border-radius: 2px; - height: 40px; - Text { - font-size: 16px; - color: Palette.control-foreground; - horizontal-alignment: TextHorizontalAlignment.center; - text: @tr("Keyboard Power Management"); - } - } - - GroupBox { - - HorizontalLayout { - spacing: 10px; - if SystemPageData.kbd_leds_awake != -1: SystemToggleInt { - text: @tr("Keyboard Awake Effect"); - checked_int <=> SystemPageData.kbd_leds_awake; - toggled => { - SystemPageData.cb_kbd_leds_awake(SystemPageData.kbd_leds_awake) - } - } - - if SystemPageData.kbd_leds_sleep != -1: SystemToggleInt { - text: @tr("Keyboard Sleep Effect"); - checked_int <=> SystemPageData.kbd_leds_sleep; - toggled => { - SystemPageData.cb_kbd_leds_sleep(SystemPageData.kbd_leds_sleep) - } - } - - if SystemPageData.kbd_leds_boot != -1: SystemToggleInt { - text: @tr("Keyboard Boot Effect"); - checked_int <=> SystemPageData.kbd_leds_boot; - toggled => { - SystemPageData.cb_kbd_leds_boot(SystemPageData.kbd_leds_boot) - } - } - - if SystemPageData.kbd_leds_shutdown != -1: SystemToggleInt { - text: @tr("Keyboard Shutdown Effect"); - checked_int <=> SystemPageData.kbd_leds_shutdown; - toggled => { - SystemPageData.cb_kbd_leds_shutdown(SystemPageData.kbd_leds_shutdown) - } - } - } - } - } - Rectangle { background: Palette.alternate-background; border-color: Palette.border; diff --git a/rog-platform/src/asus_armoury.rs b/rog-platform/src/asus_armoury.rs index f7a387af..a9d60fca 100644 --- a/rog-platform/src/asus_armoury.rs +++ b/rog-platform/src/asus_armoury.rs @@ -257,7 +257,6 @@ impl FirmwareAttributes { pub enum FirmwareAttributeType { #[default] Immediate, - TUFKeyboard, Ppt, Gpu, Bios, @@ -346,11 +345,6 @@ define_attribute_getters!( panel_hd_mode: Immediate, panel_od: Immediate, - kbd_leds_awake: TUFKeyboard, - kbd_leds_sleep: TUFKeyboard, - kbd_leds_boot: TUFKeyboard, - kbd_leds_shutdown: TUFKeyboard, - charge_mode: Immediate, } ); @@ -400,10 +394,6 @@ pub enum FirmwareAttribute { PptEnabled = 24, None = 25, ScreenAutoBrightness = 26, - KbdLedsAwake = 27, - KbdLedsSleep = 28, - KbdLedsBoot = 29, - KbdLedsShutdown = 30, } impl From<&str> for FirmwareAttribute { @@ -425,10 +415,6 @@ impl From<&str> for FirmwareAttribute { "nv_tgp" => Self::DgpuTgp, "charge_mode" => Self::ChargeMode, "boot_sound" => Self::BootSound, - "kbd_leds_awake" => Self::KbdLedsAwake, - "kbd_leds_sleep" => Self::KbdLedsSleep, - "kbd_leds_boot" => Self::KbdLedsBoot, - "kbd_leds_shutdown" => Self::KbdLedsShutdown, "mcu_powersave" => Self::McuPowersave, "panel_overdrive" => Self::PanelOverdrive, "panel_hd_mode" => Self::PanelHdMode, @@ -474,10 +460,6 @@ impl From for &str { FirmwareAttribute::DgpuDisable => "dgpu_disable", FirmwareAttribute::GpuMuxMode => "gpu_mux_mode", FirmwareAttribute::MiniLedMode => "mini_led_mode", - FirmwareAttribute::KbdLedsAwake => "kbd_leds_awake", - FirmwareAttribute::KbdLedsSleep => "kbd_leds_sleep", - FirmwareAttribute::KbdLedsBoot => "kbd_leds_boot", - FirmwareAttribute::KbdLedsShutdown => "kbd_leds_shutdown", FirmwareAttribute::PendingReboot => "pending_reboot", FirmwareAttribute::ScreenAutoBrightness => "screen_auto_brightness", FirmwareAttribute::None => "none",