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

Update changelog

Browse Source
This commit is contained in:
Luke D. Jones
2022-06-24 23:12:04 +12:00
parent 5311972345
commit e95986b830
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased ] ## [Unreleased ]
### Changed
- Refactor LED and AniMe tasks
- Reload keyboard brightness on resume from sleep/hiber
## [4.1.1] - 2022-06-21 ## [4.1.1] - 2022-06-21
### Changed ### Changed
- Fixes to anime matrix system thread cancelation - Fixes to anime matrix system thread cancelation

23
daemon/src/ctrl_anime/mod.rs
View File

@@ -319,15 +319,16 @@ impl crate::CtrlTask for CtrlAnimeTask {
.await .await
.expect("CtrlAnimeTask could not create ManagerProxy"); .expect("CtrlAnimeTask could not create ManagerProxy");
let load_save = |start: bool, lock: MutexGuard<CtrlAnime>, inner: Arc<Mutex<CtrlAnime>>| { let run_action =
if start { |start: bool, lock: MutexGuard<CtrlAnime>, inner: Arc<Mutex<CtrlAnime>>| {
info!("CtrlAnimeTask running sleep animation"); if start {
CtrlAnime::run_thread(inner.clone(), lock.cache.shutdown.clone(), true); info!("CtrlAnimeTask running sleep animation");
} else { CtrlAnime::run_thread(inner.clone(), lock.cache.shutdown.clone(), true);
info!("CtrlAnimeTask running wake animation"); } else {
CtrlAnime::run_thread(inner.clone(), lock.cache.wake.clone(), true); info!("CtrlAnimeTask running wake animation");
} CtrlAnime::run_thread(inner.clone(), lock.cache.wake.clone(), true);
}; }
};
let inner = self.inner.clone(); let inner = self.inner.clone();
executor executor
@@ -340,7 +341,7 @@ impl crate::CtrlTask for CtrlAnimeTask {
// other threads - it is possible to end up with deadlocks otherwise. // other threads - it is possible to end up with deadlocks otherwise.
loop { loop {
if let Ok(lock) = inner.clone().try_lock() { if let Ok(lock) = inner.clone().try_lock() {
load_save(args.start, lock, inner.clone()); run_action(args.start, lock, inner.clone());
break; break;
} }
} }
@@ -364,7 +365,7 @@ impl crate::CtrlTask for CtrlAnimeTask {
if let Ok(args) = event.args() { if let Ok(args) = event.args() {
loop { loop {
if let Ok(lock) = inner.clone().try_lock() { if let Ok(lock) = inner.clone().try_lock() {
load_save(args.start, lock, inner.clone()); run_action(args.start, lock, inner.clone());
} }
} }
} }