diff --git a/asusctl/src/main.rs b/asusctl/src/main.rs index a5dbba59..9c0796a4 100644 --- a/asusctl/src/main.rs +++ b/asusctl/src/main.rs @@ -7,7 +7,13 @@ use daemon::{ }; use gumdrop::{Opt, Options}; use rog_dbus::AuraDbusClient; -use rog_types::{anime_matrix::{AniMeDataBuffer, FULL_PANE_LEN}, aura_modes::{self, AuraEffect, AuraModeNum}, cli_options::{AniMeActions, AniMeStatusValue}, gfx_vendors::GfxVendors, profile::{FanLevel, ProfileCommand, ProfileEvent}}; +use rog_types::{ + anime_matrix::{AniMeDataBuffer, FULL_PANE_LEN}, + aura_modes::{self, AuraEffect, AuraModeNum}, + cli_options::{AniMeActions, AniMeStatusValue}, + gfx_vendors::GfxVendors, + profile::{FanLevel, ProfileCommand, ProfileEvent}, +}; use std::env::args; use yansi_term::Colour::Green; use yansi_term::Colour::Red; @@ -196,7 +202,10 @@ fn main() -> Result<(), Box> { let level = dbus.proxies().led().get_led_brightness()?; println!("Current keyboard led brightness: {}", level.to_string()); } - Some(level) => dbus.proxies().led().set_led_brightness(::from(level))?, + Some(level) => dbus + .proxies() + .led() + .set_led_brightness(::from(level))?, } } diff --git a/daemon/src/config_aura.rs b/daemon/src/config_aura.rs index 2705bcd0..2264a2ce 100644 --- a/daemon/src/config_aura.rs +++ b/daemon/src/config_aura.rs @@ -67,7 +67,7 @@ impl AuraConfig { } else { if let Ok(data) = serde_json::from_str(&buf) { return data; - } else if let Ok(data) = serde_json::from_str::(&buf) { + } else if let Ok(data) = serde_json::from_str::(&buf) { let config = data.into_current(); config.write(); info!("Updated AuraConfig version"); diff --git a/daemon/src/ctrl_leds.rs b/daemon/src/ctrl_leds.rs index 78133421..00634c38 100644 --- a/daemon/src/ctrl_leds.rs +++ b/daemon/src/ctrl_leds.rs @@ -10,7 +10,10 @@ use crate::{ laptops::{LaptopLedData, ASUS_KEYBOARD_DEVICES}, }; use log::{error, info, warn}; -use rog_types::{LED_MSG_LEN, aura_modes::{AuraEffect, AuraModeNum, LedBrightness}}; +use rog_types::{ + aura_modes::{AuraEffect, AuraModeNum, LedBrightness}, + LED_MSG_LEN, +}; use std::fs::OpenOptions; use std::io::{Read, Write}; use std::path::Path; @@ -314,15 +317,16 @@ impl CtrlKbdBacklight { pub fn set_brightness(&self, brightness: LedBrightness) -> Result<(), RogError> { let path = Path::new(&self.bright_node); - let mut file = OpenOptions::new() - .write(true) - .open(&path) - .map_err(|err| match err.kind() { - std::io::ErrorKind::NotFound => { - RogError::MissingLedBrightNode((&self.bright_node).into(), err) - } - _ => RogError::Path((&self.bright_node).into(), err), - })?; + let mut file = + OpenOptions::new() + .write(true) + .open(&path) + .map_err(|err| match err.kind() { + std::io::ErrorKind::NotFound => { + RogError::MissingLedBrightNode((&self.bright_node).into(), err) + } + _ => RogError::Path((&self.bright_node).into(), err), + })?; file.write_all(&[brightness.as_char_code()]) .map_err(|err| RogError::Read("buffer".into(), err))?; Ok(()) diff --git a/daemon/src/daemon.rs b/daemon/src/daemon.rs index a555db9a..367ae9c9 100644 --- a/daemon/src/daemon.rs +++ b/daemon/src/daemon.rs @@ -1,10 +1,13 @@ -use daemon::{ctrl_fan_cpu::{CtrlFanAndCPU, DbusFanAndCpu}, laptops::LaptopLedData}; use daemon::ctrl_leds::{CtrlKbdBacklight, DbusKbdBacklight}; use daemon::{ config::Config, ctrl_supported::SupportedFunctions, laptops::print_board_info, GetSupported, }; use daemon::{config_aura::AuraConfig, ctrl_charge::CtrlCharge}; use daemon::{ctrl_anime::CtrlAnimeDisplay, ctrl_gfx::gfx::CtrlGraphics}; +use daemon::{ + ctrl_fan_cpu::{CtrlFanAndCPU, DbusFanAndCpu}, + laptops::LaptopLedData, +}; use daemon::{CtrlTask, Reloadable, ZbusAdd}; use log::LevelFilter; @@ -137,11 +140,7 @@ fn start_daemon() -> Result<(), Box> { let laptop = LaptopLedData::get_data(); let aura_config = AuraConfig::load(&laptop); - if let Ok(ctrl) = CtrlKbdBacklight::new( - laptop, - aura_config, - ) - .map_err(|err| { + if let Ok(ctrl) = CtrlKbdBacklight::new(laptop, aura_config).map_err(|err| { error!("Keyboard control: {}", err); err }) { diff --git a/rog-dbus/src/zbus_led.rs b/rog-dbus/src/zbus_led.rs index 37b3c641..e14eeaa2 100644 --- a/rog-dbus/src/zbus_led.rs +++ b/rog-dbus/src/zbus_led.rs @@ -23,7 +23,10 @@ use std::sync::{Arc, Mutex}; use zbus::{dbus_proxy, Connection, Result}; -use rog_types::{aura_modes::{AuraEffect, LedBrightness}, aura_perkey::KeyColourArray}; +use rog_types::{ + aura_modes::{AuraEffect, LedBrightness}, + aura_perkey::KeyColourArray, +}; const BLOCKING_TIME: u64 = 40; // 100ms = 10 FPS, max 50ms = 20 FPS, 40ms = 25 FPS