gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix one super silly bug

Browse Source 
closes #30
This commit is contained in:
Luke D Jones
2020-10-22 08:14:21 +13:00
parent a23c51e5db
commit 6ce32c1cab
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -29,7 +29,7 @@ checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
[[package]] [[package]]
name = "asus-nb" name = "asus-nb"
version = "2.0.4" version = "2.0.5"
dependencies = [ dependencies = [
"ctrl-gfx", "ctrl-gfx",
"dbus", "dbus",
@@ -191,7 +191,7 @@ dependencies = [
[[package]] [[package]]
name = "ctrl-gfx" name = "ctrl-gfx"
version = "2.1.1" version = "2.1.3"
dependencies = [ dependencies = [
"log", "log",
"sysfs-class", "sysfs-class",

44
asus-nb-ctrl/src/daemon.rs
View File

@@ -80,34 +80,34 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
} }
} }
match CtrlGraphics::new() { if enable_gfx_switching {
Ok(mut ctrl) => { match CtrlGraphics::new() {
ctrl.reload() Ok(mut ctrl) => {
.unwrap_or_else(|err| warn!("Gfx controller: {}", err)); ctrl.reload()
ctrl.add_to_server(&mut object_server); .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
} ctrl.add_to_server(&mut object_server);
Err(err) => { }
error!("Gfx control: {}", err); Err(err) => {
error!("Gfx control: {}", err);
}
} }
} }
// Collect tasks for task thread // Collect tasks for task thread
let mut tasks: Vec<Arc<Mutex<dyn CtrlTask + Send>>> = Vec::new(); let mut tasks: Vec<Arc<Mutex<dyn CtrlTask + Send>>> = Vec::new();
if enable_gfx_switching { match CtrlFanAndCPU::new(config.clone()) {
match CtrlFanAndCPU::new(config.clone()) { Ok(mut ctrl) => {
Ok(mut ctrl) => { ctrl.reload()
ctrl.reload() .unwrap_or_else(|err| warn!("Profile control: {}", err));
.unwrap_or_else(|err| warn!("Profile control: {}", err)); let tmp = Arc::new(Mutex::new(ctrl));
let tmp = Arc::new(Mutex::new(ctrl)); DbusFanAndCpu::new(tmp.clone()).add_to_server(&mut object_server);
DbusFanAndCpu::new(tmp.clone()).add_to_server(&mut object_server); tasks.push(tmp);
tasks.push(tmp); }
} Err(err) => {
Err(err) => { error!("Profile control: {}", err);
error!("Profile control: {}", err); }
} };
};
}
if let Some(laptop) = laptop { if let Some(laptop) = laptop {
let ctrl = CtrlKbdBacklight::new( let ctrl = CtrlKbdBacklight::new(

2
asus-nb/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "asus-nb" name = "asus-nb"
version = "2.0.4" version = "2.0.5"
license = "MPL-2.0" license = "MPL-2.0"
readme = "README.md" readme = "README.md"
authors = ["Luke <luke@ljones.dev>"] authors = ["Luke <luke@ljones.dev>"]

2
ctrl-gfx/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "ctrl-gfx" name = "ctrl-gfx"
version = "2.1.1" version = "2.1.3"
license = "MPL-2.0" license = "MPL-2.0"
readme = "README.md" readme = "README.md"
authors = ["Luke <luke@ljones.dev>"] authors = ["Luke <luke@ljones.dev>"]

2
data/asus-notify.service
View File

@@ -4,9 +4,9 @@ StartLimitInterval=200
StartLimitBurst=2 StartLimitBurst=2
[Service] [Service]
ExecStartPre=/usr/bin/sleep 2
ExecStart=/usr/bin/asus-notify ExecStart=/usr/bin/asus-notify
Restart=on-failure Restart=on-failure
Restart=always
RestartSec=1 RestartSec=1
Type=simple Type=simple