diff --git a/CHANGELOG.md b/CHANGELOG.md index 121529e2..afedf046 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [1.0.2] - 2020-08-13 +### Changed +- Bugfixes to led brightness watcher +- Bufixes to await/async tasks + ## [1.0.1] - 2020-08-13 + - Fix small deadlock with awaits ## [1.0.0] - 2020-08-13 + - Major fork and refactor to use asus-hid patch for ASUS N-Key device diff --git a/Cargo.lock b/Cargo.lock index 3a2d9218..2780b3f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,7 +30,7 @@ dependencies = [ [[package]] name = "asus-nb-ctrl" -version = "1.0.1" +version = "1.0.2" dependencies = [ "asus-nb", "async-trait", diff --git a/asus-nb-ctrl/Cargo.toml b/asus-nb-ctrl/Cargo.toml index af71d596..bce819fa 100644 --- a/asus-nb-ctrl/Cargo.toml +++ b/asus-nb-ctrl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "asus-nb-ctrl" -version = "1.0.1" +version = "1.0.2" license = "MPL-2.0" readme = "README.md" authors = ["Luke "] diff --git a/asus-nb-ctrl/src/ctrl_fan_cpu.rs b/asus-nb-ctrl/src/ctrl_fan_cpu.rs index 7fd96069..0f13da74 100644 --- a/asus-nb-ctrl/src/ctrl_fan_cpu.rs +++ b/asus-nb-ctrl/src/ctrl_fan_cpu.rs @@ -49,12 +49,11 @@ impl crate::Controller for CtrlFanAndCPU { // need to watch file path tokio::spawn(async move { loop { + tokio::time::delay_for(std::time::Duration::from_millis(100)).await; let mut lock = gate2.lock().await; - if let Ok(mut config) = config.try_lock() { - lock.fan_mode_check_change(&mut config) - .unwrap_or_else(|err| warn!("{:?}", err)); - } - tokio::time::delay_for(std::time::Duration::from_millis(500)).await; + let mut config = config.lock().await; + lock.fan_mode_check_change(&mut config) + .unwrap_or_else(|err| warn!("{:?}", err)); } }), ] diff --git a/asus-nb-ctrl/src/ctrl_leds.rs b/asus-nb-ctrl/src/ctrl_leds.rs index 31245619..f02d5bd7 100644 --- a/asus-nb-ctrl/src/ctrl_leds.rs +++ b/asus-nb-ctrl/src/ctrl_leds.rs @@ -76,12 +76,11 @@ impl crate::Controller for CtrlKbdBacklight { }), tokio::spawn(async move { loop { + tokio::time::delay_for(std::time::Duration::from_millis(100)).await; let mut lock = gate2.lock().await; - if let Ok(mut config) = config.try_lock() { - lock.let_bright_check_change(&mut config) - .unwrap_or_else(|err| warn!("{:?}", err)); - } - tokio::time::delay_for(std::time::Duration::from_millis(500)).await; + let mut config = config.lock().await; + lock.let_bright_check_change(&mut config) + .unwrap_or_else(|err| warn!("{:?}", err)); } }), ] @@ -191,7 +190,7 @@ impl CtrlKbdBacklight { let mut buf = [0u8; 1]; file.read_exact(&mut buf)?; if let Some(num) = char::from(buf[0]).to_digit(10) { - if config.power_profile != num as u8 { + if config.kbd_led_brightness != num as u8 { config.read(); config.kbd_led_brightness = num as u8; config.write(); diff --git a/asus-nb-ctrl/src/lib.rs b/asus-nb-ctrl/src/lib.rs index b19747b0..c58d0c32 100644 --- a/asus-nb-ctrl/src/lib.rs +++ b/asus-nb-ctrl/src/lib.rs @@ -23,7 +23,7 @@ use std::sync::Arc; use tokio::sync::{mpsc::Receiver, Mutex}; use tokio::task::JoinHandle; -pub static VERSION: &str = "1.0.1"; +pub static VERSION: &str = "1.0.2"; use ::dbus::{nonblock::SyncConnection, tree::Signal};