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

Removed a duplication of charge limit notification

Browse Source
This commit is contained in:
Luke D. Jones
2023-06-25 21:15:27 +12:00
parent 81529b7374
commit 036a5018e0
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asusd/src/ctrl_platform.rs
View File

@@ -343,7 +343,7 @@ impl CtrlTask for CtrlPlatform {
platform1 platform1
.set_panel_overdrive(lock.panel_od) .set_panel_overdrive(lock.panel_od)
.map_err(|err| { .map_err(|err| {
warn!("CtrlCharge: set_limit {}", err); warn!("CtrlCharge: panel_od {}", err);
err err
}) })
.ok(); .ok();
@@ -360,7 +360,7 @@ impl CtrlTask for CtrlPlatform {
platform2 platform2
.set_panel_overdrive(lock.panel_od) .set_panel_overdrive(lock.panel_od)
.map_err(|err| { .map_err(|err| {
warn!("CtrlCharge: set_limit {}", err); warn!("CtrlCharge: panel_od {}", err);
err err
}) })
.ok(); .ok();

8
asusd/src/ctrl_power.rs
View File

@@ -14,7 +14,7 @@ use zbus::{dbus_interface, Connection, SignalContext};
use crate::config::Config; use crate::config::Config;
use crate::error::RogError; use crate::error::RogError;
use crate::{task_watch_item, CtrlTask, GetSupported}; use crate::{CtrlTask, GetSupported};
const ZBUS_PATH: &str = "/org/asuslinux/Power"; const ZBUS_PATH: &str = "/org/asuslinux/Power";
const NVIDIA_POWERD: &str = "nvidia-powerd.service"; const NVIDIA_POWERD: &str = "nvidia-powerd.service";
@@ -120,7 +120,7 @@ impl crate::Reloadable for CtrlPower {
} }
impl CtrlPower { impl CtrlPower {
task_watch_item!(charge_control_end_threshold power); // task_watch_item!(charge_control_end_threshold power);
pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> { pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> {
Ok(CtrlPower { Ok(CtrlPower {
@@ -211,8 +211,8 @@ impl CtrlTask for CtrlPower {
.await; .await;
let config = self.config.clone(); let config = self.config.clone();
self.watch_charge_control_end_threshold(signal_ctxt.clone()) // self.watch_charge_control_end_threshold(signal_ctxt.clone())
.await?; // .await?;
let ctrl = self.clone(); let ctrl = self.clone();
tokio::spawn(async move { tokio::spawn(async move {

1
asusd/src/lib.rs
View File

@@ -51,6 +51,7 @@ const CONFIG_PATH_BASE: &str = "/etc/asusd/";
/// task_watch_item!(gpu_mux_mode platform); /// task_watch_item!(gpu_mux_mode platform);
/// } /// }
/// ``` /// ```
/// // TODO: this is kind of useless if it can't trigger some action
#[macro_export] #[macro_export]
macro_rules! task_watch_item { macro_rules! task_watch_item {
($name:ident $self_inner:ident) => { ($name:ident $self_inner:ident) => {