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

Remove dbg statements

Browse Source
This commit is contained in:
Luke D. Jones
2024-03-11 12:53:38 +13:00
parent 67b97f1d43
commit c7b1624313
4 changed files with 93 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
asusd/src/ctrl_platform.rs
View File

@@ -34,28 +34,14 @@ macro_rules! platform_get_value {
}) })
}) })
} else { } else {
info!("RogPlatform: {} not supported", $prop_name); debug!("RogPlatform: getting {} not supported", $prop_name);
return Err(FdoErr::NotSupported(format!("RogPlatform: {} not supported", $prop_name))); return Err(FdoErr::NotSupported(format!("RogPlatform: {} not supported", $prop_name)));
} }
}) })
} }
} }
macro_rules! platform_get_value_if_some { macro_rules! platform_set_value {
($self:ident, $property:tt, $prop_name:literal, $default:expr) => {
concat_idents::concat_idents!(has = has_, $property {
if $self.platform.has() {
let lock = $self.config.lock().await;
Ok(lock.$property.unwrap_or($default))
} else {
info!("RogPlatform: {} not supported", $prop_name);
return Err(FdoErr::NotSupported(format!("RogPlatform: {} not supported", $prop_name)));
}
})
}
}
macro_rules! platform_set_bool {
($self:ident, $property:tt, $prop_name:literal, $new_value:expr) => { ($self:ident, $property:tt, $prop_name:literal, $new_value:expr) => {
concat_idents::concat_idents!(has = has_, $property { concat_idents::concat_idents!(has = has_, $property {
if $self.platform.has() { if $self.platform.has() {
@@ -70,40 +56,32 @@ macro_rules! platform_set_bool {
lock.write(); lock.write();
Ok(()) Ok(())
} else { } else {
info!("RogPlatform: {} not supported", $prop_name); debug!("RogPlatform: {} not supported", $prop_name);
Err(FdoErr::NotSupported(format!("RogPlatform: {} not supported", $prop_name))) Err(FdoErr::NotSupported(format!("RogPlatform: {} not supported", $prop_name)))
} }
}) })
} }
} }
/// Intended only for setting platform object values where the value isn't macro_rules! platform_ppt_set_value {
/// retained across boots ($self:ident, $property:tt, $prop_name:literal, $new_value:expr) => {
macro_rules! platform_set_with_min_max { concat_idents::concat_idents!(has = has_, $property {
($self:ident, $property:tt, $prop_name:literal, $new_value:expr, $min_value:expr, $max_value:expr) => { if $self.platform.has() {
if !($min_value..=$max_value).contains(&$new_value) { concat_idents::concat_idents!(set = set_, $property {
Err(FdoErr::Failed( $self.platform.set($new_value).map_err(|err| {
format!("RogPlatform: {} value not in range {}=..={}", $prop_name, $min_value, $max_value) error!("RogPlatform: {} {err}", $prop_name);
)) FdoErr::NotSupported(format!("RogPlatform: {} {err}", $prop_name))
} else { })?;
concat_idents::concat_idents!(has = has_, $property { });
if $self.platform.has() { let mut lock = $self.config.lock().await;
concat_idents::concat_idents!(set = set_, $property { lock.$property = Some($new_value);
$self.platform.set($new_value).map_err(|err| { lock.write();
error!("RogPlatform: {} {err}", $prop_name); Ok(())
FdoErr::NotSupported(format!("RogPlatform: {} {err}", $prop_name)) } else {
})?; debug!("RogPlatform: ppt: setting {} not supported", $prop_name);
}); Err(FdoErr::NotSupported(format!("RogPlatform: {} not supported", $prop_name)))
let mut lock = $self.config.lock().await; }
lock.$property = Some($new_value); })
lock.write();
} else {
error!("RogPlatform: {} not supported", $prop_name);
return Err(FdoErr::NotSupported(format!("RogPlatform: {} not supported", $prop_name)));
}
});
Ok(())
}
} }
} }
@@ -567,7 +545,7 @@ impl CtrlPlatform {
#[zbus(property)] #[zbus(property)]
async fn set_panel_od(&mut self, overdrive: bool) -> Result<(), FdoErr> { async fn set_panel_od(&mut self, overdrive: bool) -> Result<(), FdoErr> {
platform_set_bool!(self, panel_od, "panel_od", overdrive)?; platform_set_value!(self, panel_od, "panel_od", overdrive)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -581,7 +559,7 @@ impl CtrlPlatform {
#[zbus(property)] #[zbus(property)]
async fn set_boot_sound(&mut self, on: bool) -> Result<(), FdoErr> { async fn set_boot_sound(&mut self, on: bool) -> Result<(), FdoErr> {
platform_set_bool!(self, boot_sound, "boot_sound", on)?; platform_set_value!(self, boot_sound, "boot_sound", on)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -595,7 +573,7 @@ impl CtrlPlatform {
#[zbus(property)] #[zbus(property)]
async fn set_mini_led_mode(&mut self, on: bool) -> Result<(), FdoErr> { async fn set_mini_led_mode(&mut self, on: bool) -> Result<(), FdoErr> {
platform_set_bool!(self, mini_led_mode, "mini_led_mode", on)?; platform_set_value!(self, mini_led_mode, "mini_led_mode", on)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -616,12 +594,12 @@ impl CtrlPlatform {
/// * min=5, max=250 /// * min=5, max=250
#[zbus(property)] #[zbus(property)]
async fn ppt_pl1_spl(&self) -> Result<u8, FdoErr> { async fn ppt_pl1_spl(&self) -> Result<u8, FdoErr> {
platform_get_value_if_some!(self, ppt_pl1_spl, "ppt_pl1_spl", 5) platform_get_value!(self, ppt_pl1_spl, "ppt_pl1_spl")
} }
#[zbus(property)] #[zbus(property)]
async fn set_ppt_pl1_spl(&mut self, value: u8) -> Result<(), FdoErr> { async fn set_ppt_pl1_spl(&mut self, value: u8) -> Result<(), FdoErr> {
platform_set_with_min_max!(self, ppt_pl1_spl, "ppt_pl1_spl", value, 5, 250)?; platform_ppt_set_value!(self, ppt_pl1_spl, "ppt_pl1_spl", value)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -631,12 +609,12 @@ impl CtrlPlatform {
/// * min=5, max=250 /// * min=5, max=250
#[zbus(property)] #[zbus(property)]
async fn ppt_pl2_sppt(&self) -> Result<u8, FdoErr> { async fn ppt_pl2_sppt(&self) -> Result<u8, FdoErr> {
platform_get_value_if_some!(self, ppt_pl2_sppt, "ppt_pl2_sppt", 5) platform_get_value!(self, ppt_pl2_sppt, "ppt_pl2_sppt")
} }
#[zbus(property)] #[zbus(property)]
async fn set_ppt_pl2_sppt(&mut self, value: u8) -> Result<(), FdoErr> { async fn set_ppt_pl2_sppt(&mut self, value: u8) -> Result<(), FdoErr> {
platform_set_with_min_max!(self, ppt_pl2_sppt, "ppt_pl2_sppt", value, 5, 250)?; platform_ppt_set_value!(self, ppt_pl2_sppt, "ppt_pl2_sppt", value)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -645,12 +623,12 @@ impl CtrlPlatform {
/// * min=5, max=250 /// * min=5, max=250
#[zbus(property)] #[zbus(property)]
async fn ppt_fppt(&self) -> Result<u8, FdoErr> { async fn ppt_fppt(&self) -> Result<u8, FdoErr> {
platform_get_value_if_some!(self, ppt_fppt, "ppt_fppt", 5) platform_get_value!(self, ppt_fppt, "ppt_fppt")
} }
#[zbus(property)] #[zbus(property)]
async fn set_ppt_fppt(&mut self, value: u8) -> Result<(), FdoErr> { async fn set_ppt_fppt(&mut self, value: u8) -> Result<(), FdoErr> {
platform_set_with_min_max!(self, ppt_fppt, "ppt_fppt", value, 5, 250)?; platform_ppt_set_value!(self, ppt_fppt, "ppt_fppt", value)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -659,12 +637,12 @@ impl CtrlPlatform {
/// * min=5, max=130 /// * min=5, max=130
#[zbus(property)] #[zbus(property)]
async fn ppt_apu_sppt(&self) -> Result<u8, FdoErr> { async fn ppt_apu_sppt(&self) -> Result<u8, FdoErr> {
platform_get_value_if_some!(self, ppt_apu_sppt, "ppt_apu_sppt", 5) platform_get_value!(self, ppt_apu_sppt, "ppt_apu_sppt")
} }
#[zbus(property)] #[zbus(property)]
async fn set_ppt_apu_sppt(&mut self, value: u8) -> Result<(), FdoErr> { async fn set_ppt_apu_sppt(&mut self, value: u8) -> Result<(), FdoErr> {
platform_set_with_min_max!(self, ppt_apu_sppt, "ppt_apu_sppt", value, 5, 130)?; platform_ppt_set_value!(self, ppt_apu_sppt, "ppt_apu_sppt", value)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -673,12 +651,12 @@ impl CtrlPlatform {
/// * min=5, max=130 /// * min=5, max=130
#[zbus(property)] #[zbus(property)]
async fn ppt_platform_sppt(&self) -> Result<u8, FdoErr> { async fn ppt_platform_sppt(&self) -> Result<u8, FdoErr> {
platform_get_value_if_some!(self, ppt_platform_sppt, "ppt_platform_sppt", 5) platform_get_value!(self, ppt_platform_sppt, "ppt_platform_sppt")
} }
#[zbus(property)] #[zbus(property)]
async fn set_ppt_platform_sppt(&mut self, value: u8) -> Result<(), FdoErr> { async fn set_ppt_platform_sppt(&mut self, value: u8) -> Result<(), FdoErr> {
platform_set_with_min_max!(self, ppt_platform_sppt, "ppt_platform_sppt", value, 5, 130)?; platform_ppt_set_value!(self, ppt_platform_sppt, "ppt_platform_sppt", value)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -687,12 +665,12 @@ impl CtrlPlatform {
/// * min=5, max=25 /// * min=5, max=25
#[zbus(property)] #[zbus(property)]
async fn nv_dynamic_boost(&self) -> Result<u8, FdoErr> { async fn nv_dynamic_boost(&self) -> Result<u8, FdoErr> {
platform_get_value_if_some!(self, nv_dynamic_boost, "nv_dynamic_boost", 5) platform_get_value!(self, nv_dynamic_boost, "nv_dynamic_boost")
} }
#[zbus(property)] #[zbus(property)]
async fn set_nv_dynamic_boost(&mut self, value: u8) -> Result<(), FdoErr> { async fn set_nv_dynamic_boost(&mut self, value: u8) -> Result<(), FdoErr> {
platform_set_with_min_max!(self, nv_dynamic_boost, "nv_dynamic_boost", value, 5, 25)?; platform_ppt_set_value!(self, nv_dynamic_boost, "nv_dynamic_boost", value)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -701,12 +679,12 @@ impl CtrlPlatform {
/// * min=75, max=87 /// * min=75, max=87
#[zbus(property)] #[zbus(property)]
async fn nv_temp_target(&self) -> Result<u8, FdoErr> { async fn nv_temp_target(&self) -> Result<u8, FdoErr> {
platform_get_value_if_some!(self, nv_temp_target, "nv_temp_target", 5) platform_get_value!(self, nv_temp_target, "nv_temp_target")
} }
#[zbus(property)] #[zbus(property)]
async fn set_nv_temp_target(&mut self, value: u8) -> Result<(), FdoErr> { async fn set_nv_temp_target(&mut self, value: u8) -> Result<(), FdoErr> {
platform_set_with_min_max!(self, nv_temp_target, "nv_temp_target", value, 5, 87)?; platform_ppt_set_value!(self, nv_temp_target, "nv_temp_target", value)?;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -737,36 +715,39 @@ impl ReloadAndNotify for CtrlPlatform {
.await?; .await?;
} }
if self.platform.has_panel_od() && config.panel_od != data.panel_od {
self.platform.set_panel_od(data.panel_od)?;
self.panel_od_changed(signal_context).await?;
}
if self.platform.has_boot_sound() && config.panel_od != data.panel_od {
self.platform.set_boot_sound(data.panel_od)?;
self.boot_sound_changed(signal_context).await?;
}
if self.platform.has_mini_led_mode() && config.mini_led_mode != data.mini_led_mode {
self.platform.set_mini_led_mode(data.mini_led_mode)?;
self.mini_led_mode_changed(signal_context).await?;
}
if self.platform.has_throttle_thermal_policy() if self.platform.has_throttle_thermal_policy()
&& config.throttle_policy_linked_epp != data.throttle_policy_linked_epp && config.throttle_policy_linked_epp != data.throttle_policy_linked_epp
{ {
// TODO: extra stuff // TODO: extra stuff
} }
macro_rules! reload_and_notify {
($property:tt, $prop_name:literal) => {
concat_idents::concat_idents!(has = has_, $property {
if self.platform.has() && config.$property != data.$property {
concat_idents::concat_idents!(set = set_, $property {
self.platform
.set(data.$property)?;});
concat_idents::concat_idents!(changed = $property, _changed {
self.changed(signal_context).await?;});
}
})
}
}
reload_and_notify!(mini_led_mode, "mini_led_mode");
reload_and_notify!(panel_od, "panel_od");
reload_and_notify!(boot_sound, "boot_sound");
// reload_and_notify!(throttle_thermal_policy, "throttle_thermal_policy");
macro_rules! ppt_reload_and_notify { macro_rules! ppt_reload_and_notify {
($property:tt, $prop_name:literal) => { ($property:tt, $prop_name:literal) => {
concat_idents::concat_idents!(has = has_, $property { concat_idents::concat_idents!(has = has_, $property {
if self.platform.has() && config.$property != data.$property { if self.platform.has() && config.$property != data.$property {
concat_idents::concat_idents!(set = set_, $property { concat_idents::concat_idents!(set = set_, $property {
self.platform self.platform
.set_ppt_pl1_spl(data.$property.unwrap_or_default())?;}); .set(data.$property.unwrap_or_default())?;});
concat_idents::concat_idents!(changed = $property, _changed { concat_idents::concat_idents!(changed = $property, _changed {
self.ppt_pl1_spl_changed(signal_context).await?;}); self.changed(signal_context).await?;});
} }
}) })
} }
@@ -788,15 +769,40 @@ impl ReloadAndNotify for CtrlPlatform {
impl crate::Reloadable for CtrlPlatform { impl crate::Reloadable for CtrlPlatform {
async fn reload(&mut self) -> Result<(), RogError> { async fn reload(&mut self) -> Result<(), RogError> {
if self.platform.has_panel_od() { macro_rules! reload {
self.platform ($property:tt, $prop_name:literal) => {
.set_panel_od(self.config.lock().await.panel_od)?; concat_idents::concat_idents!(has = has_, $property {
} if self.platform.has() {
concat_idents::concat_idents!(set = set_, $property {
self.platform
.set(self.config.lock().await.$property)?;});
if self.platform.has_mini_led_mode() { }
self.platform })
.set_mini_led_mode(self.config.lock().await.mini_led_mode)?; }
} }
reload!(mini_led_mode, "mini_led_mode");
reload!(panel_od, "panel_od");
reload!(boot_sound, "boot_sound");
macro_rules! ppt_reload {
($property:tt, $prop_name:literal) => {
concat_idents::concat_idents!(has = has_, $property {
if self.platform.has() {
concat_idents::concat_idents!(set = set_, $property {
self.platform
.set(self.config.lock().await.$property.unwrap_or_default())?;});
}
})
}
}
ppt_reload!(ppt_pl1_spl, "ppt_pl1_spl");
ppt_reload!(ppt_pl2_sppt, "ppt_pl2_sppt");
ppt_reload!(ppt_fppt, "ppt_fppt");
ppt_reload!(ppt_apu_sppt, "ppt_apu_sppt");
ppt_reload!(ppt_platform_sppt, "ppt_platform_sppt");
ppt_reload!(nv_dynamic_boost, "nv_dynamic_boost");
ppt_reload!(nv_temp_target, "nv_temp_target");
if self.power.has_charge_control_end_threshold() { if self.power.has_charge_control_end_threshold() {
self.power.set_charge_control_end_threshold( self.power.set_charge_control_end_threshold(

1
rog-control-center/src/update_and_notify.rs
View File

@@ -443,7 +443,6 @@ pub fn start_notifications(
.unwrap(); .unwrap();
if let Ok(mode) = proxy.mode().await { if let Ok(mode) = proxy.mode().await {
dbg!(&mode);
if let Ok(mut lock) = page_states1.lock() { if let Ok(mut lock) = page_states1.lock() {
lock.gfx_state.mode = mode; lock.gfx_state.mode = mode;
lock.gfx_state.has_supergfx = true; lock.gfx_state.has_supergfx = true;

2
rog-control-center/translations/en/rog-control-center.po
View File

@@ -2,7 +2,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2024-03-10 08:12+0000\n" "POT-Creation-Date: 2024-03-10 10:29+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

2
rog-control-center/ui/widgets/sidebar.slint
View File

@@ -1,7 +1,7 @@
// Copyright © SixtyFPS GmbH <info@slint.dev> // Copyright © SixtyFPS GmbH <info@slint.dev>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
import { StyleMetrics } from "std-widgets.slint"; import { StyleMetrics, Palette } from "std-widgets.slint";
component SideBarItem inherits Rectangle { component SideBarItem inherits Rectangle {
padding: 10px; padding: 10px;