From fbdb0514d2eec2cc89b1bf4769498b108b52fae3 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Fri, 17 May 2024 10:18:54 +1200 Subject: [PATCH] Prep new release --- CHANGELOG.md | 3 ++ Cargo.lock | 30 +++++++++---------- Cargo.toml | 2 +- rog-control-center/src/notify.rs | 5 ++-- .../translations/en/rog-control-center.po | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac962820..46a883f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [v6.0.8] + ### Added - Add G512L laptop DB entry @@ -15,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fix - asusctl incorrectly assumes fan-curves unsupported. Now fixed. +- try to fix ROGCC using CPU time. ## [v6.0.7] diff --git a/Cargo.lock b/Cargo.lock index cba81655..6ffd52e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,7 +123,7 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "asusctl" -version = "6.0.7" +version = "6.0.8" dependencies = [ "asusd", "cargo-husky", @@ -141,14 +141,14 @@ dependencies = [ [[package]] name = "asusd" -version = "6.0.7" +version = "6.0.8" dependencies = [ "cargo-husky", "concat-idents", "config-traits", "dmi_id", "env_logger", - "futures-lite 2.3.0", + "futures-lite 1.13.0", "inotify", "log", "logind-zbus", @@ -167,7 +167,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "6.0.7" +version = "6.0.8" dependencies = [ "cargo-husky", "config-traits", @@ -834,7 +834,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "6.0.7" +version = "6.0.8" dependencies = [ "cargo-husky", "log", @@ -941,7 +941,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cpuctl" -version = "6.0.7" +version = "6.0.8" [[package]] name = "cpufeatures" @@ -1151,7 +1151,7 @@ dependencies = [ [[package]] name = "dmi_id" -version = "6.0.7" +version = "6.0.8" dependencies = [ "log", "udev 0.8.0", @@ -3378,7 +3378,7 @@ dependencies = [ [[package]] name = "rog-control-center" -version = "6.0.7" +version = "6.0.8" dependencies = [ "asusd", "betrayer", @@ -3410,7 +3410,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "6.0.7" +version = "6.0.8" dependencies = [ "cargo-husky", "dmi_id", @@ -3427,7 +3427,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "6.0.7" +version = "6.0.8" dependencies = [ "cargo-husky", "dmi_id", @@ -3441,7 +3441,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "6.0.7" +version = "6.0.8" dependencies = [ "asusd", "cargo-husky", @@ -3455,7 +3455,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "6.0.7" +version = "6.0.8" dependencies = [ "cargo-husky", "concat-idents", @@ -3470,7 +3470,7 @@ dependencies = [ [[package]] name = "rog_profiles" -version = "6.0.7" +version = "6.0.8" dependencies = [ "cargo-husky", "log", @@ -3484,7 +3484,7 @@ dependencies = [ [[package]] name = "rog_simulators" -version = "6.0.7" +version = "6.0.8" dependencies = [ "log", "rog_anime", @@ -3494,7 +3494,7 @@ dependencies = [ [[package]] name = "rog_slash" -version = "6.0.7" +version = "6.0.8" dependencies = [ "cargo-husky", "dmi_id", diff --git a/Cargo.toml b/Cargo.toml index 5a32d3ef..4f038390 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "6.0.7" +version = "6.0.8" rust-version = "1.77" license = "MPL-2.0" readme = "README.md" diff --git a/rog-control-center/src/notify.rs b/rog-control-center/src/notify.rs index 52b50360..addfd18c 100644 --- a/rog-control-center/src/notify.rs +++ b/rog-control-center/src/notify.rs @@ -20,7 +20,6 @@ use supergfxctl::pci_device::{GfxMode, GfxPower}; use supergfxctl::zbus_proxy::DaemonProxy as SuperProxy; use tokio::runtime::Runtime; use tokio::task::JoinHandle; -use tokio::time::sleep; use zbus::export::futures_util::StreamExt; use crate::config::Config; @@ -148,7 +147,7 @@ pub fn start_notifications( if dev.is_dgpu() { let enabled_notifications_copy = config.clone(); // Plain old thread is perfectly fine since most of this is potentially blocking - tokio::spawn(async move { + rt.spawn_blocking(move || { let mut last_status = GfxPower::Unknown; loop { if let Ok(status) = dev.get_runtime_status() { @@ -166,7 +165,7 @@ pub fn start_notifications( } last_status = status; } - sleep(Duration::from_millis(500)).await; + std::thread::sleep(Duration::from_millis(500)); } }); found_dgpu = true; diff --git a/rog-control-center/translations/en/rog-control-center.po b/rog-control-center/translations/en/rog-control-center.po index 7c44420d..3b66cefc 100644 --- a/rog-control-center/translations/en/rog-control-center.po +++ b/rog-control-center/translations/en/rog-control-center.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-05-16 21:35+0000\n" +"POT-Creation-Date: 2024-05-16 21:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"