gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-01-22 09:23:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update all cargo.toml. Support G713P

Browse Source
This commit is contained in:
Luke D. Jones
2024-05-06 09:45:35 +12:00
parent f5d5681b49
commit bc92fa11f9
22 changed files with 129 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- Support the G713P keyboard
### Changed
- Update all `Cargo.toml`
## [v6.0.0]
### Important note

13
Cargo.toml
View File

@@ -27,6 +27,13 @@ resolver = "2"
[workspace.package]
version = "6.0.0"
rust-version = "1.77"
license = "MPL-2.0"
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
repository = "https://gitlab.com/asus-linux/asusctl"
homepage = "https://gitlab.com/asus-linux/asusctl"
description = "Laptop feature control for ASUS ROG laptops and others"
edition = "2021"
[workspace.dependencies]
tokio = { version = "^1.36.0", default-features = false, features = [
@@ -77,11 +84,13 @@ lto = "fat"
debug = false
opt-level = 3
panic = "abort"
codegen-units = 1
#codegen-units = 1
[profile.dev]
opt-level = 1
codegen-units = 16
[profile.dev.package."*"]
opt-level = 1
[profile.bench]
debug = false

11
asusctl/Cargo.toml
View File

@@ -1,9 +1,12 @@
[package]
name = "asusctl"
license = "MPL-2.0"
authors = ["Luke D Jones <luke@ljones.dev>"]
edition = "2021"
license.workspace = true
version.workspace = true
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[dependencies]
rog_anime = { path = "../rog-anime" }
@@ -27,4 +30,4 @@ glam.workspace = true
rog_dbus = { path = "../rog-dbus" }
tokio.workspace = true
cargo-husky.workspace = true
cargo-husky.workspace = true

1
asusctl/src/aura_cli.rs
View File

@@ -87,6 +87,7 @@ impl FromStr for LedBrightness {
}
}
}
#[allow(clippy::to_string_trait_impl)]
impl ToString for LedBrightness {
fn to_string(&self) -> String {
let s = match self.level {

12
asusd-user/Cargo.toml
View File

@@ -1,10 +1,12 @@
[package]
name = "asusd-user"
license = "MPL-2.0"
license.workspace = true
version.workspace = true
authors = ["Luke D Jones <luke@ljones.dev>"]
edition = "2021"
description = "Usermode daemon for user settings, anime, per-key lighting"
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[[bin]]
name = "asusd-user"
@@ -32,4 +34,4 @@ log.workspace = true
env_logger.workspace = true
[dev-dependencies]
cargo-husky.workspace = true
cargo-husky.workspace = true

14
asusd/Cargo.toml
View File

@@ -1,13 +1,13 @@
[package]
name = "asusd"
license = "MPL-2.0"
license.workspace = true
version.workspace = true
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
description = "A daemon app for ASUS GX502 and similar laptops to control missing features"
edition = "2021"
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
description.workspace = true
edition.workspace = true
[[bin]]
name = "asusd"

7
asusd/src/config.rs
View File

@@ -31,18 +31,25 @@ pub struct Config {
/// The energy_performance_preference for this throttle/platform profile
pub throttle_performance_epp: CPUEPP,
/// Defaults to `None` if not supported
#[serde(skip_serializing_if = "Option::is_none", default)]
pub ppt_pl1_spl: Option<u8>,
/// Defaults to `None` if not supported
#[serde(skip_serializing_if = "Option::is_none", default)]
pub ppt_pl2_sppt: Option<u8>,
/// Defaults to `None` if not supported
#[serde(skip_serializing_if = "Option::is_none", default)]
pub ppt_fppt: Option<u8>,
/// Defaults to `None` if not supported
#[serde(skip_serializing_if = "Option::is_none", default)]
pub ppt_apu_sppt: Option<u8>,
/// Defaults to `None` if not supported
#[serde(skip_serializing_if = "Option::is_none", default)]
pub ppt_platform_sppt: Option<u8>,
/// Defaults to `None` if not supported
#[serde(skip_serializing_if = "Option::is_none", default)]
pub nv_dynamic_boost: Option<u8>,
/// Defaults to `None` if not supported
#[serde(skip_serializing_if = "Option::is_none", default)]
pub nv_temp_target: Option<u8>,
/// Temporary state for AC/Batt
#[serde(skip)]

1
asusd/src/ctrl_aura/config.rs
View File

@@ -16,6 +16,7 @@ pub struct AuraConfig {
pub brightness: LedBrightness,
pub current_mode: AuraModeNum,
pub builtins: BTreeMap<AuraModeNum, AuraEffect>,
#[serde(skip_serializing_if = "Option::is_none", default)]
pub multizone: Option<BTreeMap<AuraModeNum, Vec<AuraEffect>>>,
pub multizone_on: bool,
pub enabled: LaptopAuraPower,

11
config-traits/Cargo.toml
View File

@@ -1,9 +1,12 @@
[package]
name = "config-traits"
license = "MPL-2.0"
authors = ["Luke D Jones <luke@ljones.dev>"]
edition = "2021"
license.workspace = true
version.workspace = true
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[dependencies]
serde.workspace = true
@@ -15,4 +18,4 @@ ron.workspace = true
log.workspace = true
[dev-dependencies]
cargo-husky.workspace = true
cargo-husky.workspace = true

8
cpuctl/Cargo.toml
View File

@@ -1,7 +1,11 @@
[package]
name = "cpuctl"
license = "MPL-2.0"
edition = "2021"
license.workspace = true
version.workspace = true
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[dependencies]

9
dmi-id/Cargo.toml
View File

@@ -1,8 +1,13 @@
[package]
name = "dmi_id"
edition = "2021"
license.workspace = true
version.workspace = true
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[dependencies]
log.workspace = true
udev.workspace = true
udev.workspace = true

14
rog-anime/Cargo.toml
View File

@@ -1,15 +1,15 @@
[package]
name = "rog_anime"
license = "MPL-2.0"
license.workspace = true
version.workspace = true
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
documentation = "https://docs.rs/rog-anime"
description = "Types useful for translating images and other data for display on the ASUS AniMe Matrix display"
keywords = ["ROG", "ASUS", "AniMe"]
edition = "2021"
exclude = ["data"]
[features]
@@ -38,4 +38,4 @@ zbus = { workspace = true, optional = true }
dmi_id = { path = "../dmi-id", optional = true }
[dev-dependencies]
cargo-husky.workspace = true
cargo-husky.workspace = true

9
rog-aura/data/aura_support.ron
View File

@@ -323,6 +323,15 @@
advanced_type: PerKey,
power_zones: [Keyboard],
),
(
device_name: "G713P",
product_id: "",
layout_name: "ga401q",
basic_modes: [Static, Breathe, Strobe, Rainbow, Pulse],
basic_zones: [Key1, Key2, Key3, Key4],
advanced_type: None,
power_zones: [Keyboard],
),
(
device_name: "G713QM",
product_id: "",

9
rog-control-center/Cargo.toml
View File

@@ -1,9 +1,12 @@
[package]
name = "rog-control-center"
license = "MPL-2.0"
license.workspace = true
version.workspace = true
authors = ["Luke D. Jones <luke@ljones.dev>"]
edition = "2021"
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[features]
#default = ["mocking"]

4
rog-control-center/src/notify.rs
View File

@@ -61,8 +61,8 @@ pub fn start_notifications(config: Arc<Mutex<Config>>) -> Result<()> {
let mut ac = String::new();
let mut bat = String::new();
if let Ok(config) = config_copy.lock() {
ac = config.ac_command.clone();
bat = config.bat_command.clone();
ac.clone_from(&config.ac_command);
bat.clone_from(&config.bat_command);
}
if p == 0 && p != last_state {

2
rog-control-center/translations/en/rog-control-center.po
View File

@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2024-05-05 08:22+0000\n"
"POT-Creation-Date: 2024-05-05 21:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

14
rog-dbus/Cargo.toml
View File

@@ -1,13 +1,13 @@
[package]
name = "rog_dbus"
license.workspace = true
version.workspace = true
license = "MPL-2.0"
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
description = "dbus interface methods for asusctl"
edition = "2021"
[dependencies]
asusd = { path = "../asusd" }
@@ -19,4 +19,4 @@ rog_platform = { path = "../rog-platform" }
zbus.workspace = true
[dev-dependencies]
cargo-husky.workspace = true
cargo-husky.workspace = true

10
rog-platform/Cargo.toml
View File

@@ -1,8 +1,12 @@
[package]
name = "rog_platform"
license = "MPL-2.0"
license.workspace = true
version.workspace = true
edition = "2021"
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[dependencies]
log.workspace = true
@@ -18,4 +22,4 @@ rusb.workspace = true
[dev-dependencies]
cargo-husky.workspace = true
rog_aura = { path = "../rog-aura" }
rog_aura = { path = "../rog-aura" }

2
rog-platform/src/usb_raw.rs
View File

@@ -27,7 +27,7 @@ impl USBRaw {
device: &Device<rusb::GlobalContext>,
) -> Result<DeviceHandle<rusb::GlobalContext>> {
// We don't expect this ID to ever change
let mut device = device.open()?;
let device = device.open()?;
device.reset()?;
device.set_auto_detach_kernel_driver(true)?;
device.claim_interface(0)?;

11
rog-profiles/Cargo.toml
View File

@@ -1,9 +1,12 @@
[package]
name = "rog_profiles"
license = "MPL-2.0"
license.workspace = true
version.workspace = true
authors = ["Luke D. Jones <luke@ljones.dev>"]
edition = "2021"
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[features]
default = ["dbus"]
@@ -20,4 +23,4 @@ rog_platform = { path = "../rog-platform" }
zbus = { workspace = true, optional = true }
[dev-dependencies]
cargo-husky.workspace = true
cargo-husky.workspace = true

13
rog-slash/Cargo.toml
View File

@@ -1,14 +1,15 @@
[package]
name = "rog_slash"
license = "MPL-2.0"
license.workspace = true
version.workspace = true
authors = ["Luke <luke@ljones.dev>"]
repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
documentation = "https://docs.rs/rog-slash"
description = "ASUS Slash display"
keywords = ["ROG", "ASUS", "AniMe", "Slash"]
edition = "2021"
exclude = ["data"]
[features]
@@ -37,4 +38,4 @@ zbus = { workspace = true, optional = true }
dmi_id = { path = "../dmi-id", optional = true }
[dev-dependencies]
cargo-husky.workspace = true
cargo-husky.workspace = true

14
simulators/Cargo.toml
View File

@@ -1,14 +1,12 @@
[package]
name = "rog_simulators"
license = "MPL-2.0"
license.workspace = true
version.workspace = true
readme = "README.md"
authors = ["Luke <luke@ljones.dev>"]
repository = "https://gitlab.com/asus-linux/asus-nb-ctrl"
homepage = "https://gitlab.com/asus-linux/asus-nb-ctrl"
documentation = "https://docs.rs/rog-anime"
edition = "2021"
exclude = ["data"]
readme.workspace = true
authors.workspace = true
repository.workspace = true
homepage.workspace = true
edition.workspace = true
[[bin]]
name = "anime_sim"