Update config & dbus parts, cleanup deps, device power states

- Add extra config options and dbus methods
- Add power state signals for anime and led
- Refactor to use channels for dbus signal handler send/recv
- Split out profiles independant parts to a rog-profiles crate
- Cleanup dependencies
- Fix some dbus Supported issues
This commit is contained in:
Luke D. Jones
2021-05-22 13:00:11 +12:00
parent ba03e8feb8
commit 2b58e259de
69 changed files with 1241 additions and 1096 deletions

115
Cargo.lock generated
View File

@@ -36,6 +36,7 @@ dependencies = [
"daemon",
"notify-rust",
"rog_dbus",
"rog_profiles",
"rog_types",
"serde_json",
]
@@ -44,15 +45,15 @@ dependencies = [
name = "asusctl"
version = "3.5.0"
dependencies = [
"daemon",
"gif",
"glam",
"gumdrop",
"rog_anime",
"rog_aura",
"rog_dbus",
"rog_fan_curve",
"rog_profiles",
"rog_types",
"serde_json",
"tinybmp",
"yansi-term",
]
@@ -206,16 +207,16 @@ dependencies = [
[[package]]
name = "daemon"
version = "3.5.2"
version = "3.6.0"
dependencies = [
"env_logger",
"intel-pstate",
"log",
"logind-zbus",
"rog_anime",
"rog_aura",
"rog_dbus",
"rog_fan_curve",
"rog_profiles",
"rog_types",
"rusb",
"serde",
@@ -226,6 +227,7 @@ dependencies = [
"udev",
"zbus",
"zvariant",
"zvariant_derive",
]
[[package]]
@@ -320,20 +322,6 @@ dependencies = [
"termcolor",
]
[[package]]
name = "err-derive"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4"
dependencies = [
"proc-macro-error",
"proc-macro2",
"quote 1.0.9",
"rustversion",
"syn 1.0.69",
"synstructure",
]
[[package]]
name = "fastrand"
version = "1.4.0"
@@ -526,12 +514,12 @@ dependencies = [
[[package]]
name = "intel-pstate"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0e7f68d8a6d149a5b2195ab645923c63ee35928fff58895b3c1d21541afe90c"
checksum = "0dbd48c2f4886e44c137f4acb6ba3cf8df15154a2c996a65ee5e57c54a04c01f"
dependencies = [
"err-derive",
"smart-default",
"thiserror",
]
[[package]]
@@ -803,30 +791,6 @@ dependencies = [
"toml",
]
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote 1.0.9",
"syn 1.0.69",
"version_check",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"version_check",
]
[[package]]
name = "proc-macro-hack"
version = "0.5.19"
@@ -907,31 +871,28 @@ dependencies = [
"png_pong",
"serde",
"serde_derive",
"zbus",
"zvariant",
"zvariant_derive",
]
[[package]]
name = "rog_aura"
version = "1.0.1"
version = "1.1.0"
dependencies = [
"serde",
"serde_derive",
"zbus",
"zvariant",
"zvariant_derive",
]
[[package]]
name = "rog_dbus"
version = "3.2.0"
version = "3.4.0"
dependencies = [
"rog_anime",
"rog_aura",
"rog_fan_curve",
"rog_profiles",
"rog_types",
"serde_json",
"zbus",
"zbus_macros",
"zvariant",
@@ -946,13 +907,23 @@ dependencies = [
"serde",
]
[[package]]
name = "rog_profiles"
version = "0.1.0"
dependencies = [
"intel-pstate",
"rog_fan_curve",
"serde",
"serde_derive",
"zvariant",
"zvariant_derive",
]
[[package]]
name = "rog_types"
version = "3.2.0"
dependencies = [
"gumdrop",
"rog_aura",
"rog_fan_curve",
"serde",
"serde_derive",
"zvariant",
@@ -981,12 +952,6 @@ dependencies = [
"crossbeam-utils",
]
[[package]]
name = "rustversion"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
[[package]]
name = "ryu"
version = "1.0.5"
@@ -1115,18 +1080,6 @@ dependencies = [
"unicode-xid 0.0.4",
]
[[package]]
name = "synstructure"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.69",
"unicode-xid 0.2.1",
]
[[package]]
name = "sysfs-class"
version = "0.1.3"
@@ -1145,6 +1098,26 @@ dependencies = [
"winapi-util",
]
[[package]]
name = "thiserror"
version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.69",
]
[[package]]
name = "time"
version = "0.1.44"