Bugfixes

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

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",

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 <luke@ljones.dev>"]

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() {
+                    let mut config = config.lock().await;
-                        lock.fan_mode_check_change(&mut config)
+                    lock.fan_mode_check_change(&mut config)
-                            .unwrap_or_else(|err| warn!("{:?}", err));
+                        .unwrap_or_else(|err| warn!("{:?}", err));
-                    }
-                    tokio::time::delay_for(std::time::Duration::from_millis(500)).await;
                 }
             }),
         ]

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() {
+                    let mut config = config.lock().await;
-                        lock.let_bright_check_change(&mut config)
+                    lock.let_bright_check_change(&mut config)
-                            .unwrap_or_else(|err| warn!("{:?}", err));
+                        .unwrap_or_else(|err| warn!("{:?}", err));
-                    }
-                    tokio::time::delay_for(std::time::Duration::from_millis(500)).await;
                 }
             }),
         ]
@@ -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();

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};