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

Merge branch 'devel'

Browse Source
This commit is contained in:
Denis Benato
2025-11-18 22:36:27 +01:00
parent d1c7385146 d324b1bce5
commit eb0d9514b5
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
asusctl/src/main.rs
View File

@@ -9,7 +9,7 @@ use aura_cli::{LedPowerCommand1, LedPowerCommand2};
use dmi_id::DMIID; use dmi_id::DMIID;
use fan_curve_cli::FanCurveCommand; use fan_curve_cli::FanCurveCommand;
use gumdrop::{Opt, Options}; use gumdrop::{Opt, Options};
use log::{error, info}; use log::{error, info, LevelFilter};
use rog_anime::usb::get_anime_type; use rog_anime::usb::get_anime_type;
use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType, Vec2}; use rog_anime::{AnimTime, AnimeDataBuffer, AnimeDiagonal, AnimeGif, AnimeImage, AnimeType, Vec2};
use rog_aura::keyboard::{AuraPowerState, LaptopAuraPower}; use rog_aura::keyboard::{AuraPowerState, LaptopAuraPower};
@@ -44,12 +44,16 @@ mod scsi_cli;
mod slash_cli; mod slash_cli;
fn main() { fn main() {
// Ensure tracing spans are quiet by default unless user overrides
if std::env::var_os("RUST_LOG").is_none() {
std::env::set_var("RUST_LOG", "warn,tracing=error,zbus=error");
}
let mut logger = env_logger::Builder::new(); let mut logger = env_logger::Builder::new();
logger logger
.parse_default_env() .parse_default_env()
.target(env_logger::Target::Stdout) .filter_level(LevelFilter::Info)
.target(env_logger::Target::Stderr)
.format_timestamp(None) .format_timestamp(None)
.filter_level(log::LevelFilter::Debug)
.init(); .init();
let self_version = env!("CARGO_PKG_VERSION"); let self_version = env!("CARGO_PKG_VERSION");

9
rog-control-center/src/main.rs
View File

@@ -24,11 +24,16 @@ use tokio::runtime::Runtime;
#[tokio::main] #[tokio::main]
async fn main() -> Result<()> { async fn main() -> Result<()> {
// Ensure tracing spans are quiet by default unless user overrides
if std::env::var_os("RUST_LOG").is_none() {
std::env::set_var("RUST_LOG", "warn,tracing=error,zbus=error");
}
let mut logger = env_logger::Builder::new(); let mut logger = env_logger::Builder::new();
logger logger
.filter_level(LevelFilter::Warn)
.parse_default_env() .parse_default_env()
.target(env_logger::Target::Stdout) .filter_level(LevelFilter::Info)
.parse_default_env()
.target(env_logger::Target::Stderr)
.format_timestamp(None) .format_timestamp(None)
.init(); .init();

4
rog-control-center/src/zbus_proxies.rs
View File

@@ -89,7 +89,7 @@ where
} }
} }
if paths.len() > 1 { if paths.len() > 1 {
println!("Multiple asusd interfaces devices found"); log::warn!("Multiple asusd interfaces devices found");
} }
if !paths.is_empty() { if !paths.is_empty() {
let mut ctrl = Vec::new(); let mut ctrl = Vec::new();
@@ -129,7 +129,7 @@ where
} }
} }
if paths.len() > 1 { if paths.len() > 1 {
println!("Multiple asusd interfaces devices found"); log::warn!("Multiple asusd interfaces devices found");
} }
if !paths.is_empty() { if !paths.is_empty() {
let mut ctrl = Vec::new(); let mut ctrl = Vec::new();