Merge branch 'fix-z13-2025-1' into 'devel'

Fixes for Asus z13 2025

See merge request asus-linux/asusctl!245

asusd/src/aura_laptop/mod.rs

@@ -25,6 +25,30 @@ pub struct Aura {
 impl Aura {
     /// Initialise the device if required.
     pub async fn do_initialization(&self) -> Result<(), RogError> {
+        if let Some(hid) = &self.hid {
+            let hid = hid.lock().await;
+            let init_1: [u8; 2] = [
+                0x5d, 0xb9,
+            ];
+            let init_2 = b"]ASUS Tech.Inc.";
+            let init_3: [u8; 6] = [
+                0x5d, 0x05, 0x20, 0x31, 0, 0x1a,
+            ];
+
+            hid.write_bytes(&init_1)?;
+            hid.write_bytes(init_2)?;
+            hid.write_bytes(&init_3)?;
+
+            let config = self.config.lock().await;
+            if config.support_data.device_name.contains("GZ30")
+                || config.support_data.device_name.contains("Z13")
+            {
+                let z13_init: [u8; 4] = [
+                    0x5d, 0xc0, 0x03, 0x01,
+                ];
+                hid.write_bytes(&z13_init)?;
+            }
+        }
         Ok(())
     }
 
@@ -152,9 +176,54 @@ impl Aura {
                 }
             }
 
-            let bytes = config.enabled.to_bytes(config.led_type);
+            let mut enabled = config.enabled.clone();
+            if config.support_data.device_name.contains("GZ30")
+                || config.support_data.device_name.contains("Z13")
+            {
+                let logo_state = enabled
+                    .states
+                    .iter()
+                    .find(|s| s.zone == PowerZones::Logo)
+                    .cloned();
+                if let Some(logo) = logo_state {
+                    let mut lid_found = false;
+                    let mut bar_found = false;
+
+                    for s in enabled.states.iter_mut() {
+                        if s.zone == PowerZones::Lid {
+                            s.boot = logo.boot;
+                            s.awake = logo.awake;
+                            s.sleep = logo.sleep;
+                            s.shutdown = logo.shutdown;
+                            lid_found = true;
+                        }
+                        if s.zone == PowerZones::Lightbar {
+                            s.boot = logo.boot;
+                            s.awake = logo.awake;
+                            s.sleep = logo.sleep;
+                            s.shutdown = logo.shutdown;
+                            bar_found = true;
+                        }
+                    }
+
+                    if !lid_found {
+                        let mut new_state = logo;
+                        new_state.zone = PowerZones::Lid;
+                        enabled.states.push(new_state.clone());
+                        new_state.zone = PowerZones::Lightbar;
+                        enabled.states.push(new_state);
+                    } else if !bar_found {
+                        // Lid found but not bar?
+                        let mut new_state = logo;
+                        new_state.zone = PowerZones::Lightbar;
+                        enabled.states.push(new_state);
+                    }
+                }
+            }
+
+            let bytes = enabled.to_bytes(config.led_type);
             let msg = [
-                0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3],
+                0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3], 0xff,
             ];
             hid_raw.write_bytes(&msg)?;
         }

rog-aura/data/aura_support.ron

@@ -980,6 +980,24 @@
         advanced_type: r#None,
         power_zones: [Keyboard],
     ),
+    (
+        device_name: "GZ302",
+        product_id: "18c6",
+        layout_name: "",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Logo],
+    ),
+    (
+        device_name: "GZ302",
+        product_id: "1a30",
+        layout_name: "ga401q",
+        basic_modes: [Static, Breathe, Pulse],
+        basic_zones: [],
+        advanced_type: r#None,
+        power_zones: [Keyboard],
+    ),
     (
         device_name: "RC71L",
         product_id: "",

rog-aura/src/keyboard/power.rs

@@ -123,7 +123,8 @@ impl AuraPowerState {
                     | ((self.shutdown as u32) << 7)
             }
             PowerZones::Lightbar => {
-                ((self.boot as u32) << (7 + 2))
+                ((self.awake as u32) << (7 + 1))
+                    | ((self.boot as u32) << (7 + 2))
                     | ((self.awake as u32) << (7 + 3))
                     | ((self.sleep as u32) << (7 + 4))
                     | ((self.shutdown as u32) << (7 + 5))
@@ -133,12 +134,20 @@ impl AuraPowerState {
                     | ((self.awake as u32) << (15 + 2))
                     | ((self.sleep as u32) << (15 + 3))
                     | ((self.shutdown as u32) << (15 + 4))
+                    | ((self.boot as u32) << (15 + 5))
+                    | ((self.awake as u32) << (15 + 6))
+                    | ((self.sleep as u32) << (15 + 7))
+                    | ((self.shutdown as u32) << (15 + 8))
             }
             PowerZones::RearGlow => {
                 ((self.boot as u32) << (23 + 1))
                     | ((self.awake as u32) << (23 + 2))
                     | ((self.sleep as u32) << (23 + 3))
                     | ((self.shutdown as u32) << (23 + 4))
+                    | ((self.boot as u32) << (23 + 5))
+                    | ((self.awake as u32) << (23 + 6))
+                    | ((self.sleep as u32) << (23 + 7))
+                    | ((self.shutdown as u32) << (23 + 8))
             }
             PowerZones::None | PowerZones::KeyboardAndLightbar => 0,
         }
@@ -618,19 +627,19 @@ mod test {
         assert_eq!(shut_keyb_, "10000000, 00000000, 00000000, 00000000");
         //
         assert_eq!(boot_bar__, "00000000, 00000010, 00000000, 00000000");
-        assert_eq!(awake_bar_, "00000000, 00000100, 00000000, 00000000");
+        assert_eq!(awake_bar_, "00000000, 00000101, 00000000, 00000000");
         assert_eq!(sleep_bar_, "00000000, 00001000, 00000000, 00000000");
         assert_eq!(shut_bar__, "00000000, 00010000, 00000000, 00000000");
         //
-        assert_eq!(boot_lid__, "00000000, 00000000, 00000001, 00000000");
-        assert_eq!(awake_lid_, "00000000, 00000000, 00000010, 00000000");
-        assert_eq!(sleep_lid_, "00000000, 00000000, 00000100, 00000000");
-        assert_eq!(shut_lid__, "00000000, 00000000, 00001000, 00000000");
+        assert_eq!(boot_lid__, "00000000, 00000000, 00010001, 00000000");
+        assert_eq!(awake_lid_, "00000000, 00000000, 00100010, 00000000");
+        assert_eq!(sleep_lid_, "00000000, 00000000, 01000100, 00000000");
+        assert_eq!(shut_lid__, "00000000, 00000000, 10001000, 00000000");
         //
-        assert_eq!(boot_rear_, "00000000, 00000000, 00000000, 00000001");
-        assert_eq!(awake_rear, "00000000, 00000000, 00000000, 00000010");
-        assert_eq!(sleep_rear, "00000000, 00000000, 00000000, 00000100");
-        assert_eq!(shut_rear_, "00000000, 00000000, 00000000, 00001000");
+        assert_eq!(boot_rear_, "00000000, 00000000, 00000000, 00010001");
+        assert_eq!(awake_rear, "00000000, 00000000, 00000000, 00100010");
+        assert_eq!(sleep_rear, "00000000, 00000000, 00000000, 01000100");
+        assert_eq!(shut_rear_, "00000000, 00000000, 00000000, 10001000");
 
         // All on
         let byte1 = to_binary_string_post2021(&LaptopAuraPower {
@@ -657,6 +666,6 @@ mod test {
                 },
             ],
         });
-        assert_eq!(byte1, "11111111, 00011110, 00001111, 00001111");
+        assert_eq!(byte1, "11111111, 00011111, 11111111, 11111111");
     }
 }

rog-aura/src/lib.rs

@@ -106,10 +106,10 @@ impl From<&str> for AuraDeviceType {
         match s.to_lowercase().trim_start_matches("0x") {
             "tuf" => AuraDeviceType::LaptopKeyboardTuf,
             "1932" => AuraDeviceType::ScsiExtDisk,
-            "1866" | "18c6" | "1869" | "1854" => Self::LaptopKeyboardPre2021,
+            "1866" | "1869" | "1854" => Self::LaptopKeyboardPre2021,
             "1abe" | "1b4c" => Self::Ally,
             "19b3" | "193b" => Self::AnimeOrSlash,
-            "19b6" => Self::LaptopKeyboard2021,
+            "19b6" | "1a30" | "18c6" => Self::LaptopKeyboard2021,
             _ => Self::Unknown,
         }
     }

rog-control-center/src/ui/mod.rs

@@ -1,6 +1,7 @@
 pub mod setup_anime;
 pub mod setup_aura;
 pub mod setup_fans;
+pub mod setup_gpu;
 pub mod setup_system;
 
 use std::sync::atomic::{AtomicU64, Ordering};
@@ -162,9 +163,12 @@ pub fn setup_window(
         setup_anime_page(&ui, config.clone());
     }
     if available.contains(&"xyz.ljones.FanCurves".to_string()) {
-        setup_fan_curve_page(&ui, config);
+        setup_fan_curve_page(&ui, config.clone());
     }
 
+    // Populate GPU page choices and callbacks
+    setup_gpu::setup_gpu_page(&ui);
+
     ui
 }
 

rog-control-center/src/ui/setup_gpu.rs

@@ -0,0 +1,182 @@
+use log::error;
+use rog_platform::asus_armoury::{AttrValue, FirmwareAttributes};
+use slint::{ComponentHandle, ModelRc, SharedString};
+
+use crate::{GPUPageData, MainWindow};
+
+// Populate GPU page choices and wire the `cb_set_gpu_mode` callback
+pub fn setup_gpu_page(ui: &MainWindow) {
+    let handle = ui.as_weak();
+
+    tokio::spawn(async move {
+        // Read available attributes
+        let attrs = FirmwareAttributes::new();
+        let gpu_mux_available = attrs
+            .gpu_mux_mode()
+            .map(|a| a.base_path_exists())
+            .unwrap_or(false);
+
+        // Prepare choice strings
+        let mut choices: Vec<SharedString> = Vec::new();
+        choices.push(SharedString::from("Integrated"));
+        if gpu_mux_available {
+            choices.push(SharedString::from("Ultimate"));
+        }
+        choices.push(SharedString::from("Hybrid"));
+
+        // Read current attribute values to initialise UI state
+        let current_dgpu = attrs
+            .dgpu_disable()
+            .and_then(|a| a.current_value().ok())
+            .unwrap_or(AttrValue::Integer(0));
+        let current_mux = attrs
+            .gpu_mux_mode()
+            .and_then(|a| a.current_value().ok())
+            .unwrap_or(AttrValue::Integer(1));
+
+        // Convert to UI-able values
+        let dgpu_disabled = matches!(current_dgpu, AttrValue::Integer(v) if v == 1);
+        // Determine initial index for gpu_mux_mode property
+        let initial_index: i32 = if gpu_mux_available {
+            // If mux attr says 0 -> Ultimate, else try dgpu to refine
+            match current_mux {
+                AttrValue::Integer(0) => 1, // Ultimate
+                _ => {
+                    match current_dgpu {
+                        AttrValue::Integer(1) => 0, // Integrated
+                        _ => 2,                     // Hybrid/Optimus fallback
+                    }
+                }
+            }
+        } else {
+            // Only Integrated / Hybrid
+            match current_dgpu {
+                AttrValue::Integer(1) => 0,
+                _ => 1,
+            }
+        };
+
+        let handle_copy = handle.clone();
+        if let Err(e) = handle.upgrade_in_event_loop(move |handle| {
+            let global = handle.global::<GPUPageData>();
+
+            // set choices model
+            let model: ModelRc<SharedString> = choices.as_slice().into();
+            global.set_gpu_modes_choises(model);
+            global.set_gpu_mux_available(gpu_mux_available);
+
+            // set initial state
+            global.set_dgpu_disabled(if dgpu_disabled { 1 } else { 0 });
+            global.set_gpu_mux_mode(initial_index);
+
+            // register callback
+            let handle_cb = handle_copy.clone();
+            global.on_cb_set_gpu_mode(move |index: i32| {
+                // show a blue toast informing user a reboot is required (auto-clears)
+                let toast_handle = handle_cb.clone();
+                crate::ui::show_toast(
+                    SharedString::from(
+                        "GPU mode change scheduled — reboot required for changes to apply.",
+                    ),
+                    SharedString::from("Failed to set GPU mode"),
+                    toast_handle.clone(),
+                    Ok(()),
+                );
+
+                let handle_next = handle_cb.clone();
+                tokio::spawn(async move {
+                    let attrs = FirmwareAttributes::new();
+                    let mux_avail = attrs
+                        .gpu_mux_mode()
+                        .map(|a| a.base_path_exists())
+                        .unwrap_or(false);
+
+                    // helper to set attribute ignoring errors
+                    if mux_avail {
+                        match index {
+                            0 => {
+                                // Integrated
+                                if let Some(attr) = attrs.dgpu_disable() {
+                                    let _ = attr.set_current_value(&AttrValue::Integer(1));
+                                }
+                                if let Some(attr) = attrs.gpu_mux_mode() {
+                                    let _ = attr.set_current_value(&AttrValue::Integer(1));
+                                }
+                            }
+                            1 => {
+                                // Ultimate
+                                if let Some(attr) = attrs.dgpu_disable() {
+                                    let _ = attr.set_current_value(&AttrValue::Integer(0));
+                                }
+                                if let Some(attr) = attrs.gpu_mux_mode() {
+                                    let _ = attr.set_current_value(&AttrValue::Integer(0));
+                                }
+                            }
+                            2 => {
+                                // Dynamic
+                                if let Some(attr) = attrs.dgpu_disable() {
+                                    let _ = attr.set_current_value(&AttrValue::Integer(0));
+                                }
+                                if let Some(attr) = attrs.gpu_mux_mode() {
+                                    let _ = attr.set_current_value(&AttrValue::Integer(1));
+                                }
+                            }
+                            _ => {}
+                        }
+                    } else {
+                        match index {
+                            0 => {
+                                if let Some(attr) = attrs.dgpu_disable() {
+                                    let _ = attr.set_current_value(&AttrValue::Integer(1));
+                                }
+                            }
+                            1 => {
+                                if let Some(attr) = attrs.dgpu_disable() {
+                                    let _ = attr.set_current_value(&AttrValue::Integer(0));
+                                }
+                            }
+                            _ => {}
+                        }
+                    };
+
+                    // After attempting write(s), refresh UI from attributes
+                    let attrs2 = FirmwareAttributes::new();
+                    let cur_dgpu = attrs2
+                        .dgpu_disable()
+                        .and_then(|a| a.current_value().ok())
+                        .unwrap_or(AttrValue::Integer(0));
+                    let cur_mux = attrs2
+                        .gpu_mux_mode()
+                        .and_then(|a| a.current_value().ok())
+                        .unwrap_or(AttrValue::Integer(1));
+
+                    let dgpu_disabled = matches!(cur_dgpu, AttrValue::Integer(v) if v == 1);
+                    let new_index: i32 = if mux_avail {
+                        match cur_mux {
+                            AttrValue::Integer(0) => 1,
+                            _ => match cur_dgpu {
+                                AttrValue::Integer(1) => 0,
+                                _ => 2,
+                            },
+                        }
+                    } else {
+                        match cur_dgpu {
+                            AttrValue::Integer(1) => 0,
+                            _ => 1,
+                        }
+                    };
+
+                    if let Err(e) = handle_next.upgrade_in_event_loop(move |h| {
+                        let g = h.global::<GPUPageData>();
+                        g.set_dgpu_disabled(if dgpu_disabled { 1 } else { 0 });
+                        g.set_gpu_mux_mode(new_index);
+                    }) {
+                        error!("setup_gpu callback: upgrade_in_event_loop: {e:?}");
+                    }
+                });
+            });
+        }) {
+            error!("setup_gpu_page: upgrade_in_event_loop: {e:?}");
+        }
+    });
+}

rog-control-center/ui/main_window.slint

@@ -7,7 +7,7 @@ import { PageFans } from "pages/fans.slint";
 import { PageAnime, AnimePageData } from "pages/anime.slint";
 import { RogItem } from "widgets/common.slint";
 import { PageAura } from "pages/aura.slint";
-import { PageGPU } from "pages/gpu.slint";
+import { PageGPU, GPUPageData } from "pages/gpu.slint";
 import { Node } from "widgets/graph.slint";
 export { Node }
 import { FanPageData, FanType, Profile } from "types/fan_types.slint";
@@ -16,7 +16,7 @@ import { AuraPageData, AuraDevType, LaptopAuraPower, AuraPowerState, PowerZones,
 export { AuraPageData, AuraDevType, LaptopAuraPower, AuraPowerState, PowerZones, AuraEffect }
 import { PageAppSettings, AppSettingsPageData } from "pages/app_settings.slint";
 
-export { AppSize, AttrMinMax, SystemPageData, AnimePageData, AppSettingsPageData }
+export { AppSize, AttrMinMax, SystemPageData, AnimePageData, AppSettingsPageData, GPUPageData }
 
 export component MainWindow inherits Window {
     title: "ROG Control";

rog-control-center/ui/pages/gpu.slint

@@ -8,10 +8,9 @@ export global GPUPageData {
     in-out property <int> gpu_mux_mode: 1; // 0 = Ultra/Discreet, 1 = Integrated/Optimus
     in-out property <int> dgpu_disabled: 0; // 1 == dGPU disabled
     in-out property <int> egpu_enabled: 0; // 1 == eGPU (XGMobile) enabled
-    in-out property <[string]> gpu_modes_choises: [@tr("Ultra"), @tr("Integrated")];
-    callback cb_gpu_mux_mode(int);
-    callback cb_dgpu_disabled(int);
-    callback cb_egpu_enabled(int);
+    in-out property <[string]> gpu_modes_choises: [@tr("Integrated"), @tr("Hybrid")];
+    in-out property <bool> gpu_mux_available: false;
+    callback cb_set_gpu_mode(int);
 }
 
 export component PageGPU inherits Rectangle {
@@ -21,14 +20,29 @@ export component PageGPU inherits Rectangle {
         VerticalLayout {
             padding: 10px;
             spacing: 10px;
-            SystemDropdown {
-                text: @tr("GPU mode");
-                current_index <=> GPUPageData.gpu_mux_mode;
-                current_value: GPUPageData.gpu_modes_choises[GPUPageData.gpu_mux_mode];
-                model <=> GPUPageData.gpu_modes_choises;
-                selected => {
-                    GPUPageData.cb_gpu_mux_mode(0);
-                    GPUPageData.cb_gpu_mux_mode(1);
+
+            HorizontalLayout {
+                padding-right: 10px;
+                padding-left: 10px;
+                alignment: LayoutAlignment.space-between;
+                Rectangle {
+                    height: 32px;
+                    Text {
+                        font-size: 16px;
+                        text: @tr("Note: Changes take effect after a reboot. The dropdown always shows the current mode.");
+                    }
+                }
+            }
+
+            HorizontalLayout {
+                SystemDropdown {
+                    text: @tr("GPU mode");
+                    model <=> GPUPageData.gpu_modes_choises;
+                    current_index <=> GPUPageData.gpu_mux_mode;
+                    current_value: GPUPageData.gpu_modes_choises[GPUPageData.gpu_mux_mode];
+                    selected => {
+                        GPUPageData.cb_set_gpu_mode(GPUPageData.gpu_mux_mode)
+                    }
                 }
             }
         }

rog-control-center/ui/pages/system.slint

@@ -634,7 +634,7 @@ export component PageSystem inherits Rectangle {
                         }
 
                         SystemDropdown {
-                            text: @tr("EPP for Quiet Policy");
+                            text: @tr("EPP for ") + SystemPageData.platform_profile_choices[2] + @tr(" Policy");
                             current_index <=> SystemPageData.profile_quiet_epp;
                             current_value: SystemPageData.energy_performance_choices[SystemPageData.profile_quiet_epp];
                             model <=> SystemPageData.energy_performance_choices;

rog-profiles/src/fan_curve_set.rs

@@ -162,7 +162,6 @@ impl CurveData {
     /// Write this curve to the device fan specified by `self.fan`
     pub fn write_to_device(&self, device: &mut Device) -> std::io::Result<()> {
         let pwm_num: char = self.fan.into();
-        let enable = if self.enabled { '1' } else { '2' };
 
         for (index, out) in self.pwm.iter().enumerate() {
             let pwm = pwm_str(pwm_num, index);
@@ -176,10 +175,20 @@ impl CurveData {
             device.set_attribute_value(&temp, out.to_string())?;
         }
 
-        // Enable must be done *after* all points are written pwm3_enable
+        // Note: pwm_enable is set by write_profile_curve_to_platform after all
+        // curves are written, because on some devices (e.g., ASUS Z13 2025)
+        // setting any pwm_enable to 2 resets ALL fan enables.
+        Ok(())
+    }
+
+    /// Set the enable state for this fan curve
+    pub fn set_enable(&self, device: &mut Device) -> std::io::Result<()> {
+        let pwm_num: char = self.fan.into();
+        let enable = if self.enabled { "1" } else { "2" };
+        let enable_attr = format!("pwm{pwm_num}_enable");
         device
-            .set_attribute_value(format!("pwm{pwm_num}_enable"), enable.to_string())
-            .map_err(|e| error!("Failed to set pwm{pwm_num}_enable to {enable}: {e:?}"))
+            .set_attribute_value(&enable_attr, enable.to_string())
+            .map_err(|e| error!("Failed to set {enable_attr} to {enable}: {e:?}"))
             .ok();
         Ok(())
     }

rog-profiles/src/lib.rs

@@ -181,15 +181,29 @@ impl FanCurveProfiles {
             PlatformProfile::Quiet | PlatformProfile::LowPower => &mut self.quiet,
             PlatformProfile::Custom => &mut self.custom,
         };
-        for fan in fans.iter().filter(|f| !f.enabled) {
-            debug!("write_profile_curve_to_platform: writing profile:{profile}, {fan:?}");
+
+        // First write all curve data (pwm/temp values) for all fans
+        for fan in fans.iter() {
+            debug!("write_profile_curve_to_platform: writing curve data for profile:{profile}, {fan:?}");
             fan.write_to_device(device)?;
         }
-        // Write enabled fans last because the kernel currently resets *all* if one is
-        // disabled
+
+        // Then set enables: disabled fans first, then enabled fans last.
+        // This order is important because on some devices (e.g., ASUS Z13 2025)
+        // setting any pwm_enable to 2 (disabled) resets ALL fan enables.
+        for fan in fans.iter().filter(|f| !f.enabled) {
+            debug!(
+                "write_profile_curve_to_platform: disabling fan for profile:{profile}, {:?}",
+                fan.fan
+            );
+            fan.set_enable(device)?;
+        }
         for fan in fans.iter().filter(|f| f.enabled) {
-            debug!("write_profile_curve_to_platform: writing profile:{profile}, {fan:?}");
-            fan.write_to_device(device)?;
+            debug!(
+                "write_profile_curve_to_platform: enabling fan for profile:{profile}, {:?}",
+                fan.fan
+            );
+            fan.set_enable(device)?;
         }
         Ok(())
     }