This commit is contained in:
Luke Jones
2025-02-16 09:38:33 +13:00
parent 5fb0e26331
commit 7f12f62ad5
4 changed files with 260 additions and 141 deletions

382
Cargo.lock generated
View File

@@ -18,6 +18,98 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
[[package]]
name = "accesskit"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a"
[[package]]
name = "accesskit_atspi_common"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c5dd55e6e94949498698daf4d48fb5659e824d7abec0d394089656ceaf99d4f"
dependencies = [
"accesskit",
"accesskit_consumer",
"atspi-common",
"serde",
"thiserror",
"zvariant 4.2.0",
]
[[package]]
name = "accesskit_consumer"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f47983a1084940ba9a39c077a8c63e55c619388be5476ac04c804cfbd1e63459"
dependencies = [
"accesskit",
"hashbrown 0.15.2",
"immutable-chunkmap",
]
[[package]]
name = "accesskit_macos"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7329821f3bd1101e03a7d2e03bd339e3ac0dc64c70b4c9f9ae1949e3ba8dece1"
dependencies = [
"accesskit",
"accesskit_consumer",
"hashbrown 0.15.2",
"objc2 0.5.2",
"objc2-app-kit 0.2.2",
"objc2-foundation 0.2.2",
]
[[package]]
name = "accesskit_unix"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcee751cc20d88678c33edaf9c07e8b693cd02819fe89053776f5313492273f5"
dependencies = [
"accesskit",
"accesskit_atspi_common",
"async-channel",
"async-executor",
"async-task",
"atspi",
"futures-lite",
"futures-util",
"serde",
"zbus 4.4.0",
]
[[package]]
name = "accesskit_windows"
version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24fcd5d23d70670992b823e735e859374d694a3d12bfd8dd32bd3bd8bedb5d81"
dependencies = [
"accesskit",
"accesskit_consumer",
"hashbrown 0.15.2",
"paste",
"static_assertions",
"windows 0.58.0",
"windows-core 0.58.0",
]
[[package]]
name = "accesskit_winit"
version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6a48dad5530b6deb9fc7a52cc6c3bf72cdd9eb8157ac9d32d69f2427a5e879"
dependencies = [
"accesskit",
"accesskit_macos",
"accesskit_unix",
"accesskit_windows",
"raw-window-handle",
"winit",
]
[[package]]
name = "addr2line"
version = "0.24.2"
@@ -424,6 +516,57 @@ version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "atspi"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be534b16650e35237bb1ed189ba2aab86ce65e88cc84c66f4935ba38575cecbf"
dependencies = [
"atspi-common",
"atspi-connection",
"atspi-proxies",
]
[[package]]
name = "atspi-common"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1909ed2dc01d0a17505d89311d192518507e8a056a48148e3598fef5e7bb6ba7"
dependencies = [
"enumflags2",
"serde",
"static_assertions",
"zbus 4.4.0",
"zbus-lockstep",
"zbus-lockstep-macros",
"zbus_names 3.0.0",
"zvariant 4.2.0",
]
[[package]]
name = "atspi-connection"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "430c5960624a4baaa511c9c0fcc2218e3b58f5dbcc47e6190cafee344b873333"
dependencies = [
"atspi-common",
"atspi-proxies",
"futures-lite",
"zbus 4.4.0",
]
[[package]]
name = "atspi-proxies"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5e6c5de3e524cf967569722446bcd458d5032348554d9a17d7d72b041ab7496"
dependencies = [
"atspi-common",
"serde",
"zbus 4.4.0",
"zvariant 4.2.0",
]
[[package]]
name = "auto_enums"
version = "0.8.7"
@@ -1094,18 +1237,6 @@ dependencies = [
"libc",
]
[[package]]
name = "core-text"
version = "20.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
dependencies = [
"core-foundation 0.9.4",
"core-graphics 0.23.2",
"foreign-types",
"libc",
]
[[package]]
name = "core_maths"
version = "0.1.0"
@@ -1351,6 +1482,19 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
[[package]]
name = "drm"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1"
dependencies = [
"bitflags 2.8.0",
"bytemuck",
"drm-ffi 0.8.0",
"drm-fourcc",
"rustix",
]
[[package]]
name = "drm"
version = "0.14.1"
@@ -1359,19 +1503,29 @@ checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f"
dependencies = [
"bitflags 2.8.0",
"bytemuck",
"drm-ffi",
"drm-ffi 0.9.0",
"drm-fourcc",
"libc",
"rustix",
]
[[package]]
name = "drm-ffi"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53"
dependencies = [
"drm-sys 0.7.0",
"rustix",
]
[[package]]
name = "drm-ffi"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b"
dependencies = [
"drm-sys",
"drm-sys 0.8.0",
"rustix",
]
@@ -1383,26 +1537,22 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
[[package]]
name = "drm-sys"
version = "0.8.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c"
checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986"
dependencies = [
"libc",
"linux-raw-sys 0.6.5",
]
[[package]]
name = "dwrote"
version = "0.11.2"
name = "drm-sys"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70182709525a3632b2ba96b6569225467b18ecb4a77f46d255f713a6bebf05fd"
checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c"
dependencies = [
"lazy_static",
"libc",
"serde",
"serde_derive",
"winapi",
"wio",
"linux-raw-sys 0.6.5",
]
[[package]]
@@ -1527,29 +1677,6 @@ dependencies = [
"simd-adler32",
]
[[package]]
name = "femtovg"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9bec3fb78abd18f7bbbde01f22f467c47c5a9c043e791802f82da0cf16066d1"
dependencies = [
"bitflags 2.8.0",
"bytemuck",
"fnv",
"glow",
"image",
"imgref",
"log",
"lru",
"rgb",
"rustybuzz 0.20.1",
"slotmap",
"unicode-bidi",
"unicode-segmentation",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "field-offset"
version = "0.3.6"
@@ -1594,6 +1721,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
[[package]]
name = "fontconfig-parser"
version = "0.5.7"
@@ -1773,7 +1906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce852e998d3ca5e4a97014fb31c940dc5ef344ec7d364984525fd11e8a547e6a"
dependencies = [
"bitflags 2.8.0",
"drm",
"drm 0.14.1",
"drm-fourcc",
"gbm-sys",
"libc",
@@ -2252,6 +2385,9 @@ name = "hashbrown"
version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
dependencies = [
"foldhash",
]
[[package]]
name = "hdrhistogram"
@@ -2416,13 +2552,14 @@ version = "1.10.0"
source = "git+https://github.com/slint-ui/slint.git#2a5e35a5e808b390e8d4a623d61deba01ef6e1b4"
dependencies = [
"calloop 0.14.2",
"drm",
"drm 0.14.1",
"gbm",
"glutin",
"i-slint-common",
"i-slint-core",
"i-slint-renderer-femtovg",
"i-slint-renderer-skia",
"input",
"memmap2",
"nix",
"raw-window-handle",
"xkbcommon",
@@ -2439,6 +2576,7 @@ dependencies = [
"i-slint-common",
"i-slint-core",
"i-slint-core-macros",
"i-slint-renderer-skia",
]
[[package]]
@@ -2446,6 +2584,8 @@ name = "i-slint-backend-winit"
version = "1.10.0"
source = "git+https://github.com/slint-ui/slint.git#2a5e35a5e808b390e8d4a623d61deba01ef6e1b4"
dependencies = [
"accesskit",
"accesskit_winit",
"cfg-if",
"cfg_aliases",
"copypasta",
@@ -2456,7 +2596,6 @@ dependencies = [
"i-slint-common",
"i-slint-core",
"i-slint-core-macros",
"i-slint-renderer-femtovg",
"i-slint-renderer-skia",
"lyon_path",
"muda",
@@ -2568,35 +2707,6 @@ dependencies = [
"syn 2.0.96",
]
[[package]]
name = "i-slint-renderer-femtovg"
version = "1.10.0"
source = "git+https://github.com/slint-ui/slint.git#2a5e35a5e808b390e8d4a623d61deba01ef6e1b4"
dependencies = [
"cfg-if",
"const-field-offset",
"core-foundation 0.9.4",
"core-text",
"derive_more",
"dwrote",
"femtovg",
"glow",
"i-slint-common",
"i-slint-core",
"i-slint-core-macros",
"imgref",
"lyon_path",
"pin-weak",
"rgb",
"scoped-tls-hkt",
"ttf-parser 0.25.1",
"unicode-script",
"unicode-segmentation",
"wasm-bindgen",
"web-sys",
"winapi",
]
[[package]]
name = "i-slint-renderer-skia"
version = "1.10.0"
@@ -2837,6 +2947,15 @@ version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0263a3d970d5c054ed9312c0057b4f3bde9c0b33836d3637361d4a9e6e7a408"
[[package]]
name = "immutable-chunkmap"
version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12f97096f508d54f8f8ab8957862eee2ccd628847b6217af1a335e1c44dee578"
dependencies = [
"arrayvec",
]
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -3253,12 +3372,6 @@ dependencies = [
"imgref",
]
[[package]]
name = "lru"
version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
[[package]]
name = "lyon_algorithms"
version = "1.0.5"
@@ -4328,6 +4441,16 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quick-xml"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
dependencies = [
"memchr",
"serde",
]
[[package]]
name = "quick-xml"
version = "0.31.0"
@@ -4790,26 +4913,8 @@ dependencies = [
"log",
"smallvec",
"ttf-parser 0.24.1",
"unicode-bidi-mirroring 0.3.0",
"unicode-ccc 0.3.0",
"unicode-properties",
"unicode-script",
]
[[package]]
name = "rustybuzz"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
dependencies = [
"bitflags 2.8.0",
"bytemuck",
"core_maths",
"log",
"smallvec",
"ttf-parser 0.25.1",
"unicode-bidi-mirroring 0.4.0",
"unicode-ccc 0.4.0",
"unicode-bidi-mirroring",
"unicode-ccc",
"unicode-properties",
"unicode-script",
]
@@ -5063,7 +5168,6 @@ dependencies = [
"i-slint-backend-selector",
"i-slint-core",
"i-slint-core-macros",
"i-slint-renderer-femtovg",
"num-traits",
"once_cell",
"pin-weak",
@@ -5201,6 +5305,7 @@ dependencies = [
"bytemuck",
"cfg_aliases",
"core-graphics 0.24.0",
"drm 0.12.0",
"fastrand",
"foreign-types",
"js-sys",
@@ -5805,9 +5910,6 @@ name = "ttf-parser"
version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
dependencies = [
"core_maths",
]
[[package]]
name = "typed-index-collections"
@@ -5892,24 +5994,12 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f"
[[package]]
name = "unicode-bidi-mirroring"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dfa6e8c60bb66d49db113e0125ee8711b7647b5579dc7f5f19c42357ed039fe"
[[package]]
name = "unicode-ccc"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42"
[[package]]
name = "unicode-ccc"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e"
[[package]]
name = "unicode-ident"
version = "1.0.16"
@@ -5978,7 +6068,7 @@ dependencies = [
"log",
"pico-args",
"roxmltree",
"rustybuzz 0.18.0",
"rustybuzz",
"simplecss",
"siphasher",
"strict-num",
@@ -6849,15 +6939,6 @@ dependencies = [
"memchr",
]
[[package]]
name = "wio"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5"
dependencies = [
"winapi",
]
[[package]]
name = "wit-bindgen-rt"
version = "0.33.0"
@@ -7098,6 +7179,30 @@ dependencies = [
"zvariant 5.2.0",
]
[[package]]
name = "zbus-lockstep"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ca2c5dceb099bddaade154055c926bb8ae507a18756ba1d8963fd7b51d8ed1d"
dependencies = [
"zbus_xml",
"zvariant 4.2.0",
]
[[package]]
name = "zbus-lockstep-macros"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "709ab20fc57cb22af85be7b360239563209258430bccf38d8b979c5a2ae3ecce"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
"zbus-lockstep",
"zbus_xml",
"zvariant 4.2.0",
]
[[package]]
name = "zbus_macros"
version = "4.4.0"
@@ -7149,6 +7254,19 @@ dependencies = [
"zvariant 5.2.0",
]
[[package]]
name = "zbus_xml"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab3f374552b954f6abb4bd6ce979e6c9b38fb9d0cd7cc68a7d796e70c9f3a233"
dependencies = [
"quick-xml 0.30.0",
"serde",
"static_assertions",
"zbus_names 3.0.0",
"zvariant 4.2.0",
]
[[package]]
name = "zerocopy"
version = "0.7.35"

View File

@@ -48,7 +48,7 @@ The LED controller (e.g, aura) enables setting many of the factory modes availab
#### Supported laptops
There are over 60 supported laptops as of 01-01-2023. Please see [the rog-aura crate readme for further details](/rog-aura/README.md).
There are over 80 supported laptops as of 01-01-2023. Please see [the rog-aura crate readme for further details](/rog-aura/README.md).
### Charge control
@@ -420,13 +420,13 @@ To switch to next/previous Aura modes you will need to bind both the aura keys (
**Next**
```
asusctl led-mode -n
asusctl aura -n
```
**Previous**
```
asusctl led-mode -p
asusctl aura -p
```
To switch Fan/Thermal profiles you need to bind the Fn+F5 key to `asusctl profile -n`.

View File

@@ -49,11 +49,12 @@ versions.workspace = true
git = "https://github.com/slint-ui/slint.git"
default-features = false
features = [
"gettext",
"compat-1-2",
"gettext",
"accessibility",
"backend-winit-wayland",
"renderer-winit-femtovg",
# "renderer-skia-opengl",
# "renderer-femtovg",
"renderer-skia-opengl",
]
[build-dependencies.slint-build]

View File

@@ -111,21 +111,21 @@ pub fn setup_fan_curve_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {
let Ok(balanced) = fans
.fan_curve_data(PlatformProfile::Balanced)
.await
.map_err(|e| error!("{e:}"))
.map_err(|e| error!("Couldn't get balanced data: {e:}"))
else {
return;
};
let Ok(perf) = fans
.fan_curve_data(PlatformProfile::Performance)
.await
.map_err(|e| error!("{e:}"))
.map_err(|e| error!("Couldn't get performance data: {e:}"))
else {
return;
};
let Ok(quiet) = fans
.fan_curve_data(PlatformProfile::Quiet)
.await
.map_err(|e| error!("{e:}"))
.map_err(|e| error!("Couldn't get quiet data: {e:}"))
else {
return;
};