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

Reformat with trailing comma

Browse Source
This commit is contained in:
Luke Jones
2025-02-14 16:06:20 +13:00
parent 0bdf0474c9
commit 2c006699f2
113 changed files with 791 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asusctl/examples/anime-diag-png.rs
View File

@@ -23,7 +23,7 @@ fn main() -> Result<(), Box<dyn Error>> {
Path::new(&args[1]), Path::new(&args[1]),
None, None,
args[2].parse::<f32>().unwrap(), args[2].parse::<f32>().unwrap(),
AnimeType::GA401 AnimeType::GA401,
)?; )?;
let anime_type = get_anime_type(); let anime_type = get_anime_type();

2
asusctl/examples/anime-gif.rs
View File

@@ -24,7 +24,7 @@ fn main() {
seq.insert(0, &ActionLoader::AsusAnimation { seq.insert(0, &ActionLoader::AsusAnimation {
file: path.into(), file: path.into(),
time: rog_anime::AnimTime::Infinite, time: rog_anime::AnimTime::Infinite,
brightness brightness,
}) })
.unwrap(); .unwrap();

4
asusctl/examples/anime-png.rs
View File

@@ -27,10 +27,10 @@ fn main() -> Result<(), Box<dyn Error>> {
args[3].parse::<f32>().unwrap(), args[3].parse::<f32>().unwrap(),
Vec2::new( Vec2::new(
args[4].parse::<f32>().unwrap(), args[4].parse::<f32>().unwrap(),
args[5].parse::<f32>().unwrap() args[5].parse::<f32>().unwrap(),
), ),
args[6].parse::<f32>().unwrap(), args[6].parse::<f32>().unwrap(),
anime_type anime_type,
)?; )?;
proxy.write(<AnimeDataBuffer>::try_from(&matrix)?).unwrap(); proxy.write(<AnimeDataBuffer>::try_from(&matrix)?).unwrap();

4
asusctl/examples/anime-spinning.rs
View File

@@ -30,10 +30,10 @@ fn main() -> Result<(), Box<dyn Error>> {
args[3].parse::<f32>().unwrap(), args[3].parse::<f32>().unwrap(),
Vec2::new( Vec2::new(
args[4].parse::<f32>().unwrap(), args[4].parse::<f32>().unwrap(),
args[5].parse::<f32>().unwrap() args[5].parse::<f32>().unwrap(),
), ),
args[6].parse::<f32>().unwrap(), args[6].parse::<f32>().unwrap(),
anime_type anime_type,
)?; )?;
loop { loop {

4
asusctl/examples/aura-zoned-breathe.rs
View File

@@ -36,10 +36,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Colour { Colour {
r: 200, r: 200,
g: 110, g: 110,
b: 0 b: 0,
}, },
100, 100,
10 10,
)); ));
seq.push(zone); seq.push(zone);

14
asusctl/src/anime_cli.rs
View File

@@ -40,7 +40,7 @@ pub struct AnimeCommand {
#[options(no_short, meta = "", help = "Off with his head!!!")] #[options(no_short, meta = "", help = "Off with his head!!!")]
pub off_with_his_head: Option<bool>, pub off_with_his_head: Option<bool>,
#[options(command)] #[options(command)]
pub command: Option<AnimeActions> pub command: Option<AnimeActions>,
} }
#[derive(Options)] #[derive(Options)]
@@ -54,7 +54,7 @@ pub enum AnimeActions {
#[options(help = "display an animated diagonal/pixel-perfect GIF")] #[options(help = "display an animated diagonal/pixel-perfect GIF")]
PixelGif(AnimeGifDiagonal), PixelGif(AnimeGifDiagonal),
#[options(help = "change which builtin animations are shown")] #[options(help = "change which builtin animations are shown")]
SetBuiltins(Builtins) SetBuiltins(Builtins),
} }
#[derive(Options)] #[derive(Options)]
@@ -82,7 +82,7 @@ pub struct Builtins {
)] )]
pub shutdown: AnimShutdown, pub shutdown: AnimShutdown,
#[options(meta = "", help = "set/apply the animations <true/false>")] #[options(meta = "", help = "set/apply the animations <true/false>")]
pub set: Option<bool> pub set: Option<bool>,
} }
#[derive(Options)] #[derive(Options)]
@@ -100,7 +100,7 @@ pub struct AnimeImage {
#[options(meta = "", default = "0.0", help = "the angle in radians")] #[options(meta = "", default = "0.0", help = "the angle in radians")]
pub angle: f32, pub angle: f32,
#[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")] #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
pub bright: f32 pub bright: f32,
} }
#[derive(Options)] #[derive(Options)]
@@ -110,7 +110,7 @@ pub struct AnimeImageDiagonal {
#[options(meta = "", help = "full path to the png to display")] #[options(meta = "", help = "full path to the png to display")]
pub path: String, pub path: String,
#[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")] #[options(meta = "", default = "1.0", help = "brightness 0.0-1.0")]
pub bright: f32 pub bright: f32,
} }
#[derive(Options)] #[derive(Options)]
@@ -134,7 +134,7 @@ pub struct AnimeGif {
default = "1", default = "1",
help = "how many loops to play - 0 is infinite" help = "how many loops to play - 0 is infinite"
)] )]
pub loops: u32 pub loops: u32,
} }
#[derive(Options)] #[derive(Options)]
@@ -150,5 +150,5 @@ pub struct AnimeGifDiagonal {
default = "1", default = "1",
help = "how many loops to play - 0 is infinite" help = "how many loops to play - 0 is infinite"
)] )]
pub loops: u32 pub loops: u32,
} }

28
asusctl/src/aura_cli.rs
View File

@@ -17,7 +17,7 @@ pub struct LedPowerCommand1 {
#[options(meta = "", help = "Control boot animations <true/false>")] #[options(meta = "", help = "Control boot animations <true/false>")]
pub boot: Option<bool>, pub boot: Option<bool>,
#[options(meta = "", help = "Control suspend animations <true/false>")] #[options(meta = "", help = "Control suspend animations <true/false>")]
pub sleep: Option<bool> pub sleep: Option<bool>,
} }
#[derive(Options, Debug)] #[derive(Options, Debug)]
@@ -25,7 +25,7 @@ pub struct LedPowerCommand2 {
#[options(help = "print help message")] #[options(help = "print help message")]
pub help: bool, pub help: bool,
#[options(command)] #[options(command)]
pub command: Option<SetAuraZoneEnabled> pub command: Option<SetAuraZoneEnabled>,
} }
#[derive(Options, Debug)] #[derive(Options, Debug)]
@@ -42,7 +42,7 @@ pub enum SetAuraZoneEnabled {
#[options(help = "")] #[options(help = "")]
RearGlow(AuraPowerStates), RearGlow(AuraPowerStates),
#[options(help = "")] #[options(help = "")]
Ally(AuraPowerStates) Ally(AuraPowerStates),
} }
#[derive(Debug, Clone, Options)] #[derive(Debug, Clone, Options)]
@@ -56,12 +56,12 @@ pub struct AuraPowerStates {
#[options(help = "defaults to false if option unused")] #[options(help = "defaults to false if option unused")]
pub sleep: bool, pub sleep: bool,
#[options(help = "defaults to false if option unused")] #[options(help = "defaults to false if option unused")]
pub shutdown: bool pub shutdown: bool,
} }
#[derive(Options)] #[derive(Options)]
pub struct LedBrightness { pub struct LedBrightness {
level: Option<u8> level: Option<u8>,
} }
impl LedBrightness { impl LedBrightness {
pub fn new(level: Option<u8>) -> Self { pub fn new(level: Option<u8>) -> Self {
@@ -96,7 +96,7 @@ impl ToString for LedBrightness {
Some(0x00) => "low", Some(0x00) => "low",
Some(0x01) => "med", Some(0x01) => "med",
Some(0x02) => "high", Some(0x02) => "high",
_ => "unknown" _ => "unknown",
}; };
s.to_owned() s.to_owned()
} }
@@ -113,7 +113,7 @@ pub struct SingleSpeed {
meta = "", meta = "",
help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left" help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
)] )]
pub zone: AuraZone pub zone: AuraZone,
} }
#[derive(Debug, Clone, Options, Default)] #[derive(Debug, Clone, Options, Default)]
@@ -129,7 +129,7 @@ pub struct SingleSpeedDirection {
meta = "", meta = "",
help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left" help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
)] )]
pub zone: AuraZone pub zone: AuraZone,
} }
#[derive(Debug, Clone, Default, Options)] #[derive(Debug, Clone, Default, Options)]
@@ -143,7 +143,7 @@ pub struct SingleColour {
meta = "", meta = "",
help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left" help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
)] )]
pub zone: AuraZone pub zone: AuraZone,
} }
#[derive(Debug, Clone, Default, Options)] #[derive(Debug, Clone, Default, Options)]
@@ -159,7 +159,7 @@ pub struct SingleColourSpeed {
meta = "", meta = "",
help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left" help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
)] )]
pub zone: AuraZone pub zone: AuraZone,
} }
#[derive(Debug, Clone, Options, Default)] #[derive(Debug, Clone, Options, Default)]
@@ -177,7 +177,7 @@ pub struct TwoColourSpeed {
meta = "", meta = "",
help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left" help = "set the zone for this effect e.g, 0, 1, one, logo, lightbar-left"
)] )]
pub zone: AuraZone pub zone: AuraZone,
} }
#[derive(Debug, Clone, Default, Options)] #[derive(Debug, Clone, Default, Options)]
@@ -191,7 +191,7 @@ pub struct MultiZone {
#[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")] #[options(short = "c", meta = "", help = "set the RGB value e.g, ff00ff")]
pub colour3: Colour, pub colour3: Colour,
#[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")] #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
pub colour4: Colour pub colour4: Colour,
} }
#[derive(Debug, Clone, Default, Options)] #[derive(Debug, Clone, Default, Options)]
@@ -207,7 +207,7 @@ pub struct MultiColourSpeed {
#[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")] #[options(short = "d", meta = "", help = "set the RGB value e.g, ff00ff")]
pub colour4: Colour, pub colour4: Colour,
#[options(no_long, meta = "", help = "set the speed: low, med, high")] #[options(no_long, meta = "", help = "set the speed: low, med, high")]
pub speed: Speed pub speed: Speed,
} }
/// Byte value for setting the built-in mode. /// Byte value for setting the built-in mode.
@@ -239,7 +239,7 @@ pub enum SetAuraBuiltin {
#[options(help = "set a vertical line zooming from left")] #[options(help = "set a vertical line zooming from left")]
Comet(SingleColour), // 11 Comet(SingleColour), // 11
#[options(help = "set a wide vertical line zooming from left")] #[options(help = "set a wide vertical line zooming from left")]
Flash(SingleColour) // 12 Flash(SingleColour), // 12
} }
impl Default for SetAuraBuiltin { impl Default for SetAuraBuiltin {

12
asusctl/src/cli_opts.rs
View File

@@ -26,7 +26,7 @@ pub struct CliStart {
#[options(help = "Toggle one-shot battery charge to 100%")] #[options(help = "Toggle one-shot battery charge to 100%")]
pub one_shot_chg: bool, pub one_shot_chg: bool,
#[options(command)] #[options(command)]
pub command: Option<CliCommand> pub command: Option<CliCommand>,
} }
#[derive(Options)] #[derive(Options)]
@@ -53,7 +53,7 @@ pub enum CliCommand {
help = "Change platform settings. This is a new interface exposed by the asus-armoury \ help = "Change platform settings. This is a new interface exposed by the asus-armoury \
driver, some of the settings will be the same as the older platform interface" driver, some of the settings will be the same as the older platform interface"
)] )]
Armoury(ArmouryCommand) Armoury(ArmouryCommand),
} }
#[derive(Debug, Clone, Options)] #[derive(Debug, Clone, Options)]
@@ -71,7 +71,7 @@ pub struct ProfileCommand {
pub profile_get: bool, pub profile_get: bool,
#[options(meta = "", help = "set the active profile")] #[options(meta = "", help = "set the active profile")]
pub profile_set: Option<PlatformProfile> pub profile_set: Option<PlatformProfile>,
} }
#[derive(Options)] #[derive(Options)]
@@ -83,13 +83,13 @@ pub struct LedModeCommand {
#[options(help = "switch to previous aura mode")] #[options(help = "switch to previous aura mode")]
pub prev_mode: bool, pub prev_mode: bool,
#[options(command)] #[options(command)]
pub command: Option<SetAuraBuiltin> pub command: Option<SetAuraBuiltin>,
} }
#[derive(Options)] #[derive(Options)]
pub struct GraphicsCommand { pub struct GraphicsCommand {
#[options(help = "print help message")] #[options(help = "print help message")]
pub help: bool pub help: bool,
} }
#[derive(Options, Debug)] #[derive(Options, Debug)]
@@ -100,5 +100,5 @@ pub struct ArmouryCommand {
free, free,
help = "append each value name followed by the value to set. `-1` sets to default" help = "append each value name followed by the value to set. `-1` sets to default"
)] )]
pub free: Vec<String> pub free: Vec<String>,
} }

2
asusctl/src/fan_curve_cli.rs
View File

@@ -45,5 +45,5 @@ pub struct FanCurveCommand {
help = "data format = 30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%. \ help = "data format = 30c:1%,49c:2%,59c:3%,69c:4%,79c:31%,89c:49%,99c:56%,109c:58%. \
`--mod-profile` required. If '%' is omitted the fan range is 0-255" `--mod-profile` required. If '%' is omitted the fan range is 0-255"
)] )]
pub data: Option<CurveData> pub data: Option<CurveData>,
} }

32
asusctl/src/main.rs
View File

@@ -106,7 +106,7 @@ fn main() {
fn print_error_help( fn print_error_help(
err: &dyn std::error::Error, err: &dyn std::error::Error,
supported_interfaces: &[String], supported_interfaces: &[String],
supported_properties: &[Properties] supported_properties: &[Properties],
) { ) {
check_service("asusd"); check_service("asusd");
println!("\nError: {}\n", err); println!("\nError: {}\n", err);
@@ -147,7 +147,7 @@ fn check_service(name: &str) -> bool {
fn find_iface<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>> fn find_iface<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>>
where where
T: ProxyImpl<'static> + From<zbus::Proxy<'static>> T: ProxyImpl<'static> + From<zbus::Proxy<'static>>,
{ {
let conn = zbus::blocking::Connection::system().unwrap(); let conn = zbus::blocking::Connection::system().unwrap();
let f = zbus::blocking::fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/").unwrap(); let f = zbus::blocking::fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/").unwrap();
@@ -174,7 +174,7 @@ where
T::builder(&conn) T::builder(&conn)
.path(path.clone())? .path(path.clone())?
.destination("xyz.ljones.Asusd")? .destination("xyz.ljones.Asusd")?
.build()? .build()?,
); );
} }
return Ok(ctrl); return Ok(ctrl);
@@ -187,7 +187,7 @@ fn do_parsed(
parsed: &CliStart, parsed: &CliStart,
supported_interfaces: &[String], supported_interfaces: &[String],
supported_properties: &[Properties], supported_properties: &[Properties],
conn: Connection conn: Connection,
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
match &parsed.command { match &parsed.command {
Some(CliCommand::Aura(mode)) => handle_led_mode(mode)?, Some(CliCommand::Aura(mode)) => handle_led_mode(mode)?,
@@ -295,7 +295,7 @@ fn do_parsed(
let level = aura.brightness()?; let level = aura.brightness()?;
println!("Current keyboard led brightness: {level:?}"); println!("Current keyboard led brightness: {level:?}");
} }
Some(level) => aura.set_brightness(rog_aura::LedBrightness::from(level))? Some(level) => aura.set_brightness(rog_aura::LedBrightness::from(level))?,
} }
} }
} else { } else {
@@ -444,7 +444,7 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
image.angle, image.angle,
Vec2::new(image.x_pos, image.y_pos), Vec2::new(image.x_pos, image.y_pos),
image.bright, image.bright,
anime_type anime_type,
)?; )?;
proxy.write(<AnimeDataBuffer>::try_from(&matrix)?)?; proxy.write(<AnimeDataBuffer>::try_from(&matrix)?)?;
@@ -463,7 +463,7 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
Path::new(&image.path), Path::new(&image.path),
None, None,
image.bright, image.bright,
anime_type anime_type,
)?; )?;
proxy.write(matrix.into_data_buffer(anime_type)?)?; proxy.write(matrix.into_data_buffer(anime_type)?)?;
@@ -485,7 +485,7 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
Vec2::new(gif.x_pos, gif.y_pos), Vec2::new(gif.x_pos, gif.y_pos),
AnimTime::Count(1), AnimTime::Count(1),
gif.bright, gif.bright,
anime_type anime_type,
)?; )?;
let mut loops = gif.loops as i32; let mut loops = gif.loops as i32;
@@ -516,7 +516,7 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
Path::new(&gif.path), Path::new(&gif.path),
AnimTime::Count(1), AnimTime::Count(1),
gif.bright, gif.bright,
anime_type anime_type,
)?; )?;
let mut loops = gif.loops as i32; let mut loops = gif.loops as i32;
@@ -549,7 +549,7 @@ fn handle_anime(cmd: &AnimeCommand) -> Result<(), Box<dyn std::error::Error>> {
boot: builtins.boot, boot: builtins.boot,
awake: builtins.awake, awake: builtins.awake,
sleep: builtins.sleep, sleep: builtins.sleep,
shutdown: builtins.shutdown shutdown: builtins.shutdown,
})?; })?;
} }
} }
@@ -812,7 +812,7 @@ fn handle_led_power1(power: &LedPowerCommand1) -> Result<(), Box<dyn std::error:
fn handle_led_power_1_do_1866( fn handle_led_power_1_do_1866(
aura: &AuraProxyBlocking, aura: &AuraProxyBlocking,
power: &LedPowerCommand1 power: &LedPowerCommand1,
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
let mut states = Vec::new(); let mut states = Vec::new();
if power.keyboard { if power.keyboard {
@@ -821,7 +821,7 @@ fn handle_led_power_1_do_1866(
boot: power.boot.unwrap_or_default(), boot: power.boot.unwrap_or_default(),
awake: power.awake.unwrap_or_default(), awake: power.awake.unwrap_or_default(),
sleep: power.sleep.unwrap_or_default(), sleep: power.sleep.unwrap_or_default(),
shutdown: false shutdown: false,
}); });
} }
if power.lightbar { if power.lightbar {
@@ -830,7 +830,7 @@ fn handle_led_power_1_do_1866(
boot: power.boot.unwrap_or_default(), boot: power.boot.unwrap_or_default(),
awake: power.awake.unwrap_or_default(), awake: power.awake.unwrap_or_default(),
sleep: power.sleep.unwrap_or_default(), sleep: power.sleep.unwrap_or_default(),
shutdown: false shutdown: false,
}); });
} }
@@ -892,7 +892,7 @@ fn handle_led_power2(power: &LedPowerCommand2) -> Result<(), Box<dyn std::error:
aura_cli::SetAuraZoneEnabled::Lightbar(l) => set(PowerZones::Lightbar, l), aura_cli::SetAuraZoneEnabled::Lightbar(l) => set(PowerZones::Lightbar, l),
aura_cli::SetAuraZoneEnabled::Lid(l) => set(PowerZones::Lid, l), aura_cli::SetAuraZoneEnabled::Lid(l) => set(PowerZones::Lid, l),
aura_cli::SetAuraZoneEnabled::RearGlow(r) => set(PowerZones::RearGlow, r), aura_cli::SetAuraZoneEnabled::RearGlow(r) => set(PowerZones::RearGlow, r),
aura_cli::SetAuraZoneEnabled::Ally(r) => set(PowerZones::Ally, r) aura_cli::SetAuraZoneEnabled::Ally(r) => set(PowerZones::Ally, r),
} }
} }
@@ -906,7 +906,7 @@ fn handle_led_power2(power: &LedPowerCommand2) -> Result<(), Box<dyn std::error:
fn handle_throttle_profile( fn handle_throttle_profile(
conn: &Connection, conn: &Connection,
supported: &[Properties], supported: &[Properties],
cmd: &ProfileCommand cmd: &ProfileCommand,
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
if !supported.contains(&Properties::ThrottlePolicy) { if !supported.contains(&Properties::ThrottlePolicy) {
println!("Profiles not supported by either this kernel or by the laptop."); println!("Profiles not supported by either this kernel or by the laptop.");
@@ -950,7 +950,7 @@ fn handle_throttle_profile(
fn handle_fan_curve( fn handle_fan_curve(
conn: &Connection, conn: &Connection,
cmd: &FanCurveCommand cmd: &FanCurveCommand,
) -> Result<(), Box<dyn std::error::Error>> { ) -> Result<(), Box<dyn std::error::Error>> {
let Ok(fan_proxy) = FanCurvesProxyBlocking::new(conn).map_err(|e| { let Ok(fan_proxy) = FanCurvesProxyBlocking::new(conn).map_err(|e| {
println!("Fan-curves not supported by either this kernel or by the laptop: {e:?}"); println!("Fan-curves not supported by either this kernel or by the laptop: {e:?}");

2
asusctl/src/scsi_cli.rs
View File

@@ -31,5 +31,5 @@ pub struct ScsiCommand {
pub colours: Vec<Colour>, pub colours: Vec<Colour>,
#[options(help = "list available animations")] #[options(help = "list available animations")]
pub list: bool pub list: bool,
} }

2
asusctl/src/slash_cli.rs
View File

@@ -31,5 +31,5 @@ pub struct SlashCommand {
meta = "", meta = "",
help = "Show the low-battery warning animation" help = "Show the low-battery warning animation"
)] )]
pub show_battery_warning: Option<bool> pub show_battery_warning: Option<bool>,
} }

40
asusd-user/src/config.rs
View File

@@ -21,7 +21,7 @@ fn root_conf_dir() -> PathBuf {
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
pub struct ConfigAnime { pub struct ConfigAnime {
pub name: String, pub name: String,
pub anime: Vec<ActionLoader> pub anime: Vec<ActionLoader>,
} }
impl ConfigAnime { impl ConfigAnime {
@@ -52,8 +52,8 @@ impl Default for ConfigAnime {
time: AnimTime::Fade(Fade::new( time: AnimTime::Fade(Fade::new(
Duration::from_secs(2), Duration::from_secs(2),
None, None,
Duration::from_secs(2) Duration::from_secs(2),
)) )),
}, },
ActionLoader::AsusAnimation { ActionLoader::AsusAnimation {
file: "/usr/share/asusd/anime/asus/rog/Sunset.gif".into(), file: "/usr/share/asusd/anime/asus/rog/Sunset.gif".into(),
@@ -61,8 +61,8 @@ impl Default for ConfigAnime {
time: AnimTime::Fade(Fade::new( time: AnimTime::Fade(Fade::new(
Duration::from_secs(6), Duration::from_secs(6),
None, None,
Duration::from_secs(3) Duration::from_secs(3),
)) )),
}, },
ActionLoader::ImageAnimation { ActionLoader::ImageAnimation {
file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(), file: "/usr/share/asusd/anime/custom/sonic-run.gif".into(),
@@ -73,8 +73,8 @@ impl Default for ConfigAnime {
time: AnimTime::Fade(Fade::new( time: AnimTime::Fade(Fade::new(
Duration::from_secs(2), Duration::from_secs(2),
Some(Duration::from_secs(2)), Some(Duration::from_secs(2)),
Duration::from_secs(2) Duration::from_secs(2),
)) )),
}, },
ActionLoader::Image { ActionLoader::Image {
file: "/usr/share/asusd/anime/custom/rust.png".into(), file: "/usr/share/asusd/anime/custom/rust.png".into(),
@@ -84,9 +84,9 @@ impl Default for ConfigAnime {
time: AnimTime::Fade(Fade::new( time: AnimTime::Fade(Fade::new(
Duration::from_secs(2), Duration::from_secs(2),
Some(Duration::from_secs(1)), Some(Duration::from_secs(1)),
Duration::from_secs(2) Duration::from_secs(2),
)), )),
brightness: 0.6 brightness: 0.6,
}, },
ActionLoader::Pause(Duration::from_secs(1)), ActionLoader::Pause(Duration::from_secs(1)),
ActionLoader::ImageAnimation { ActionLoader::ImageAnimation {
@@ -95,9 +95,9 @@ impl Default for ConfigAnime {
angle: 0.0, angle: 0.0,
translation: Vec2::new(3.0, 2.0), translation: Vec2::new(3.0, 2.0),
brightness: 0.5, brightness: 0.5,
time: AnimTime::Count(2) time: AnimTime::Count(2),
}, },
] ],
} }
} }
} }
@@ -121,7 +121,7 @@ impl StdConfigLoad for ConfigAnime {}
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
pub struct ConfigAura { pub struct ConfigAura {
pub name: String, pub name: String,
pub aura: AuraSequences pub aura: AuraSequences,
} }
impl ConfigAura { impl ConfigAura {
@@ -139,14 +139,14 @@ impl Default for ConfigAura {
Colour { Colour {
r: 255, r: 255,
g: 0, g: 0,
b: 20 b: 20,
}, },
Colour { Colour {
r: 20, r: 20,
g: 255, g: 255,
b: 0 b: 0,
}, },
Speed::Low Speed::Low,
)); ));
seq.push(key.clone()); seq.push(key.clone());
@@ -161,7 +161,7 @@ impl Default for ConfigAura {
LedCode::F, LedCode::F,
Colour { r: 255, g: 0, b: 0 }, Colour { r: 255, g: 0, b: 0 },
Colour { r: 255, g: 0, b: 0 }, Colour { r: 255, g: 0, b: 0 },
Speed::High Speed::High,
)); ));
seq.push(key); seq.push(key);
@@ -176,13 +176,13 @@ impl Default for ConfigAura {
LedCode::N9, LedCode::N9,
Colour { r: 0, g: 0, b: 255 }, Colour { r: 0, g: 0, b: 255 },
80, 80,
40 40,
)); ));
seq.push(key); seq.push(key);
Self { Self {
name: "aura-default".to_owned(), name: "aura-default".to_owned(),
aura: seq aura: seq,
} }
} }
} }
@@ -209,14 +209,14 @@ pub struct ConfigBase {
/// Name of active anime config file in the user config directory /// Name of active anime config file in the user config directory
pub active_anime: Option<String>, pub active_anime: Option<String>,
/// Name of active aura config file in the user config directory /// Name of active aura config file in the user config directory
pub active_aura: Option<String> pub active_aura: Option<String>,
} }
impl StdConfig for ConfigBase { impl StdConfig for ConfigBase {
fn new() -> Self { fn new() -> Self {
Self { Self {
active_anime: Some("anime-default".to_owned()), active_anime: Some("anime-default".to_owned()),
active_aura: Some("aura-default".to_owned()) active_aura: Some("aura-default".to_owned()),
} }
} }

30
asusd-user/src/ctrl_anime.rs
View File

@@ -25,7 +25,7 @@ pub struct Timer {
/// Used only for `TimeType::Timer`, milliseonds to fade the image in for /// Used only for `TimeType::Timer`, milliseonds to fade the image in for
fade_in: u64, fade_in: u64,
/// Used only for `TimeType::Timer`, milliseonds to fade the image out for /// Used only for `TimeType::Timer`, milliseonds to fade the image out for
fade_out: u64 fade_out: u64,
} }
impl From<Timer> for AnimTime { impl From<Timer> for AnimTime {
@@ -46,7 +46,7 @@ impl From<Timer> for AnimTime {
} }
} }
TimeType::Count => AnimTime::Count(time.count as u32), TimeType::Count => AnimTime::Count(time.count as u32),
TimeType::Infinite => AnimTime::Infinite TimeType::Infinite => AnimTime::Infinite,
} }
} }
} }
@@ -55,7 +55,7 @@ impl From<Timer> for AnimTime {
pub enum TimeType { pub enum TimeType {
Timer, Timer,
Count, Count,
Infinite Infinite,
} }
/// The inner object exists to allow the zbus proxy to share it with a runner /// The inner object exists to allow the zbus proxy to share it with a runner
@@ -63,19 +63,19 @@ pub enum TimeType {
pub struct CtrlAnimeInner<'a> { pub struct CtrlAnimeInner<'a> {
sequences: Sequences, sequences: Sequences,
client: AnimeProxyBlocking<'a>, client: AnimeProxyBlocking<'a>,
do_early_return: Arc<AtomicBool> do_early_return: Arc<AtomicBool>,
} }
impl CtrlAnimeInner<'static> { impl CtrlAnimeInner<'static> {
pub fn new( pub fn new(
sequences: Sequences, sequences: Sequences,
client: AnimeProxyBlocking<'static>, client: AnimeProxyBlocking<'static>,
do_early_return: Arc<AtomicBool> do_early_return: Arc<AtomicBool>,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
Ok(Self { Ok(Self {
sequences, sequences,
client, client,
do_early_return do_early_return,
}) })
} }
@@ -130,7 +130,7 @@ pub struct CtrlAnime<'a> {
client: AnimeProxyBlocking<'a>, client: AnimeProxyBlocking<'a>,
inner: Arc<Mutex<CtrlAnimeInner<'a>>>, inner: Arc<Mutex<CtrlAnimeInner<'a>>>,
/// Must be the same Atomic as in CtrlAnimeInner /// Must be the same Atomic as in CtrlAnimeInner
inner_early_return: Arc<AtomicBool> inner_early_return: Arc<AtomicBool>,
} }
impl CtrlAnime<'static> { impl CtrlAnime<'static> {
@@ -138,13 +138,13 @@ impl CtrlAnime<'static> {
config: Arc<Mutex<ConfigAnime>>, config: Arc<Mutex<ConfigAnime>>,
inner: Arc<Mutex<CtrlAnimeInner<'static>>>, inner: Arc<Mutex<CtrlAnimeInner<'static>>>,
client: AnimeProxyBlocking<'static>, client: AnimeProxyBlocking<'static>,
inner_early_return: Arc<AtomicBool> inner_early_return: Arc<AtomicBool>,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
Ok(CtrlAnime { Ok(CtrlAnime {
config, config,
client, client,
inner, inner,
inner_early_return inner_early_return,
}) })
} }
@@ -174,7 +174,7 @@ impl CtrlAnime<'static> {
index: u32, index: u32,
file: &str, file: &str,
time: Timer, time: Timer,
brightness: f32 brightness: f32,
) -> zbus::fdo::Result<String> { ) -> zbus::fdo::Result<String> {
if let Ok(mut config) = self.config.try_lock() { if let Ok(mut config) = self.config.try_lock() {
let time: AnimTime = time.into(); let time: AnimTime = time.into();
@@ -182,7 +182,7 @@ impl CtrlAnime<'static> {
let action = ActionLoader::AsusAnimation { let action = ActionLoader::AsusAnimation {
file: file.into(), file: file.into(),
brightness, brightness,
time time,
}; };
// Must make the inner run loop return early // Must make the inner run loop return early
@@ -216,7 +216,7 @@ impl CtrlAnime<'static> {
angle: f32, angle: f32,
xy: (f32, f32), xy: (f32, f32),
time: Timer, time: Timer,
brightness: f32 brightness: f32,
) -> zbus::fdo::Result<String> { ) -> zbus::fdo::Result<String> {
if let Ok(mut config) = self.config.try_lock() { if let Ok(mut config) = self.config.try_lock() {
let time: AnimTime = time.into(); let time: AnimTime = time.into();
@@ -228,7 +228,7 @@ impl CtrlAnime<'static> {
angle, angle,
translation, translation,
brightness, brightness,
time time,
}; };
// Must make the inner run loop return early // Must make the inner run loop return early
@@ -261,7 +261,7 @@ impl CtrlAnime<'static> {
angle: f32, angle: f32,
xy: (f32, f32), xy: (f32, f32),
time: Timer, time: Timer,
brightness: f32 brightness: f32,
) -> zbus::fdo::Result<String> { ) -> zbus::fdo::Result<String> {
if let Ok(mut config) = self.config.try_lock() { if let Ok(mut config) = self.config.try_lock() {
let file = Path::new(&file); let file = Path::new(&file);
@@ -272,7 +272,7 @@ impl CtrlAnime<'static> {
angle, angle,
translation: Vec2::new(xy.0, xy.1), translation: Vec2::new(xy.0, xy.1),
brightness, brightness,
time time,
}; };
// Must make the inner run loop return early // Must make the inner run loop return early

6
asusd-user/src/daemon.rs
View File

@@ -61,16 +61,16 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
CtrlAnimeInner::new( CtrlAnimeInner::new(
anime, anime,
anime_proxy_blocking.clone(), anime_proxy_blocking.clone(),
early_return.clone() early_return.clone(),
) )
.unwrap() .unwrap(),
)); ));
// Need new client object for dbus control part // Need new client object for dbus control part
let anime_control = CtrlAnime::new( let anime_control = CtrlAnime::new(
anime_config, anime_config,
inner.clone(), inner.clone(),
anime_proxy_blocking, anime_proxy_blocking,
early_return early_return,
) )
.unwrap(); .unwrap();
anime_control.add_to_server(&mut connection).await; anime_control.add_to_server(&mut connection).await;

4
asusd-user/src/error.rs
View File

@@ -8,7 +8,7 @@ pub enum Error {
ConfigLoadFail, ConfigLoadFail,
ConfigLockFail, ConfigLockFail,
XdgVars, XdgVars,
Anime(AnimeError) Anime(AnimeError),
} }
impl fmt::Display for Error { impl fmt::Display for Error {
@@ -19,7 +19,7 @@ impl fmt::Display for Error {
Error::ConfigLoadFail => write!(f, "Failed to load user config"), Error::ConfigLoadFail => write!(f, "Failed to load user config"),
Error::ConfigLockFail => write!(f, "Failed to lock user config"), Error::ConfigLockFail => write!(f, "Failed to lock user config"),
Error::XdgVars => write!(f, "XDG environment vars appear unset"), Error::XdgVars => write!(f, "XDG environment vars appear unset"),
Error::Anime(err) => write!(f, "Anime error: {}", err) Error::Anime(err) => write!(f, "Anime error: {}", err),
} }
} }
} }

6
asusd-user/src/zbus_anime.rs
View File

@@ -32,7 +32,7 @@ trait Daemon {
file: &str, file: &str,
time: u32, time: u32,
count: u32, count: u32,
brightness: f64 brightness: f64,
) -> zbus::Result<String>; ) -> zbus::Result<String>;
/// InsertImage method /// InsertImage method
@@ -43,7 +43,7 @@ trait Daemon {
scale: f64, scale: f64,
angle: f64, angle: f64,
xy: &(f64, f64), xy: &(f64, f64),
brightness: f64 brightness: f64,
) -> zbus::Result<String>; ) -> zbus::Result<String>;
/// InsertImageGif method /// InsertImageGif method
@@ -56,7 +56,7 @@ trait Daemon {
xy: &(f64, f64), xy: &(f64, f64),
time: u32, time: u32,
count: u32, count: u32,
brightness: f64 brightness: f64,
) -> zbus::Result<String>; ) -> zbus::Result<String>;
/// InsertPause method /// InsertPause method

32
asusd/src/asus_armoury.rs
View File

@@ -20,7 +20,7 @@ const MOD_NAME: &str = "asus_armoury";
#[derive(Debug, Default, Clone, Deserialize, Serialize, Type, Value, OwnedValue)] #[derive(Debug, Default, Clone, Deserialize, Serialize, Type, Value, OwnedValue)]
pub struct PossibleValues { pub struct PossibleValues {
strings: Vec<String>, strings: Vec<String>,
nums: Vec<i32> nums: Vec<i32>,
} }
fn dbus_path_for_attr(attr_name: &str) -> OwnedObjectPath { fn dbus_path_for_attr(attr_name: &str) -> OwnedObjectPath {
@@ -33,7 +33,7 @@ pub struct AsusArmouryAttribute {
config: Arc<Mutex<Config>>, config: Arc<Mutex<Config>>,
/// platform control required here for access to PPD or Throttle profile /// platform control required here for access to PPD or Throttle profile
platform: RogPlatform, platform: RogPlatform,
power: AsusPower power: AsusPower,
} }
impl AsusArmouryAttribute { impl AsusArmouryAttribute {
@@ -41,13 +41,13 @@ impl AsusArmouryAttribute {
attr: Attribute, attr: Attribute,
platform: RogPlatform, platform: RogPlatform,
power: AsusPower, power: AsusPower,
config: Arc<Mutex<Config>> config: Arc<Mutex<Config>>,
) -> Self { ) -> Self {
Self { Self {
attr, attr,
config, config,
platform, platform,
power power,
} }
} }
@@ -64,7 +64,7 @@ impl AsusArmouryAttribute {
async fn watch_and_notify( async fn watch_and_notify(
&mut self, &mut self,
signal_ctxt: SignalEmitter<'static> signal_ctxt: SignalEmitter<'static>,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
use futures_util::StreamExt; use futures_util::StreamExt;
@@ -92,7 +92,7 @@ impl AsusArmouryAttribute {
"inotify watch failed: {}. You can ignore this if your device does not \ "inotify watch failed: {}. You can ignore this if your device does not \
support the feature", support the feature",
e e
) ),
} }
}; };
} }
@@ -187,7 +187,7 @@ impl AsusArmouryAttribute {
async fn default_value(&self) -> i32 { async fn default_value(&self) -> i32 {
match self.attr.default_value() { match self.attr.default_value() {
AttrValue::Integer(i) => *i, AttrValue::Integer(i) => *i,
_ => -1 _ => -1,
} }
} }
@@ -228,7 +228,7 @@ impl AsusArmouryAttribute {
async fn min_value(&self) -> i32 { async fn min_value(&self) -> i32 {
match self.attr.min_value() { match self.attr.min_value() {
AttrValue::Integer(i) => *i, AttrValue::Integer(i) => *i,
_ => -1 _ => -1,
} }
} }
@@ -236,7 +236,7 @@ impl AsusArmouryAttribute {
async fn max_value(&self) -> i32 { async fn max_value(&self) -> i32 {
match self.attr.max_value() { match self.attr.max_value() {
AttrValue::Integer(i) => *i, AttrValue::Integer(i) => *i,
_ => -1 _ => -1,
} }
} }
@@ -244,7 +244,7 @@ impl AsusArmouryAttribute {
async fn scalar_increment(&self) -> i32 { async fn scalar_increment(&self) -> i32 {
match self.attr.scalar_increment() { match self.attr.scalar_increment() {
AttrValue::Integer(i) => *i, AttrValue::Integer(i) => *i,
_ => -1 _ => -1,
} }
} }
@@ -252,7 +252,7 @@ impl AsusArmouryAttribute {
async fn possible_values(&self) -> Vec<i32> { async fn possible_values(&self) -> Vec<i32> {
match self.attr.possible_values() { match self.attr.possible_values() {
AttrValue::EnumInt(i) => i.clone(), AttrValue::EnumInt(i) => i.clone(),
_ => Vec::default() _ => Vec::default(),
} }
} }
@@ -276,7 +276,7 @@ impl AsusArmouryAttribute {
return Ok(*i); return Ok(*i);
} }
return Err(fdo::Error::Failed( return Err(fdo::Error::Failed(
"Could not read current value".to_string() "Could not read current value".to_string(),
)); ));
} }
@@ -284,7 +284,7 @@ impl AsusArmouryAttribute {
return Ok(i); return Ok(i);
} }
Err(fdo::Error::Failed( Err(fdo::Error::Failed(
"Could not read current value".to_string() "Could not read current value".to_string(),
)) ))
} }
@@ -362,14 +362,14 @@ pub async fn start_attributes_zbus(
platform: RogPlatform, platform: RogPlatform,
power: AsusPower, power: AsusPower,
attributes: FirmwareAttributes, attributes: FirmwareAttributes,
config: Arc<Mutex<Config>> config: Arc<Mutex<Config>>,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
for attr in attributes.attributes() { for attr in attributes.attributes() {
let mut attr = AsusArmouryAttribute::new( let mut attr = AsusArmouryAttribute::new(
attr.clone(), attr.clone(),
platform.clone(), platform.clone(),
power.clone(), power.clone(),
config.clone() config.clone(),
); );
attr.reload().await?; attr.reload().await?;
@@ -386,7 +386,7 @@ pub async fn set_config_or_default(
attrs: &FirmwareAttributes, attrs: &FirmwareAttributes,
config: &mut Config, config: &mut Config,
power_plugged: bool, power_plugged: bool,
profile: PlatformProfile profile: PlatformProfile,
) { ) {
for attr in attrs.attributes().iter() { for attr in attrs.attributes().iter() {
let name: FirmwareAttribute = attr.name().into(); let name: FirmwareAttribute = attr.name().into();

22
asusd/src/aura_anime/config.rs
View File

@@ -4,7 +4,7 @@ use config_traits::{StdConfig, StdConfigLoad};
use rog_anime::error::AnimeError; use rog_anime::error::AnimeError;
use rog_anime::usb::Brightness; use rog_anime::usb::Brightness;
use rog_anime::{ use rog_anime::{
ActionData, ActionLoader, AnimTime, Animations, AnimeType, DeviceState, Fade, Vec2 ActionData, ActionLoader, AnimTime, Animations, AnimeType, DeviceState, Fade, Vec2,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -15,14 +15,14 @@ pub struct AniMeConfigCached {
pub system: Vec<ActionData>, pub system: Vec<ActionData>,
pub boot: Vec<ActionData>, pub boot: Vec<ActionData>,
pub wake: Vec<ActionData>, pub wake: Vec<ActionData>,
pub shutdown: Vec<ActionData> pub shutdown: Vec<ActionData>,
} }
impl AniMeConfigCached { impl AniMeConfigCached {
pub fn init_from_config( pub fn init_from_config(
&mut self, &mut self,
config: &AniMeConfig, config: &AniMeConfig,
anime_type: AnimeType anime_type: AnimeType,
) -> Result<(), AnimeError> { ) -> Result<(), AnimeError> {
let mut sys = Vec::with_capacity(config.system.len()); let mut sys = Vec::with_capacity(config.system.len());
for ani in &config.system { for ani in &config.system {
@@ -68,7 +68,7 @@ pub struct AniMeConfig {
pub off_when_suspended: bool, pub off_when_suspended: bool,
pub off_when_lid_closed: bool, pub off_when_lid_closed: bool,
pub brightness_on_battery: Brightness, pub brightness_on_battery: Brightness,
pub builtin_anims: Animations pub builtin_anims: Animations,
} }
impl Default for AniMeConfig { impl Default for AniMeConfig {
@@ -87,7 +87,7 @@ impl Default for AniMeConfig {
off_when_suspended: true, off_when_suspended: true,
off_when_lid_closed: true, off_when_lid_closed: true,
brightness_on_battery: Brightness::Low, brightness_on_battery: Brightness::Low,
builtin_anims: Animations::default() builtin_anims: Animations::default(),
} }
} }
} }
@@ -118,7 +118,7 @@ impl From<&AniMeConfig> for DeviceState {
off_when_unplugged: config.off_when_unplugged, off_when_unplugged: config.off_when_unplugged,
off_when_suspended: config.off_when_suspended, off_when_suspended: config.off_when_suspended,
off_when_lid_closed: config.off_when_lid_closed, off_when_lid_closed: config.off_when_lid_closed,
brightness_on_battery: config.brightness_on_battery brightness_on_battery: config.brightness_on_battery,
} }
} }
} }
@@ -148,8 +148,8 @@ impl AniMeConfig {
time: AnimTime::Fade(Fade::new( time: AnimTime::Fade(Fade::new(
Duration::from_secs(2), Duration::from_secs(2),
Some(Duration::from_secs(2)), Some(Duration::from_secs(2)),
Duration::from_secs(2) Duration::from_secs(2),
)) )),
}, },
], ],
wake: vec![ wake: vec![
@@ -162,8 +162,8 @@ impl AniMeConfig {
time: AnimTime::Fade(Fade::new( time: AnimTime::Fade(Fade::new(
Duration::from_secs(2), Duration::from_secs(2),
Some(Duration::from_secs(2)), Some(Duration::from_secs(2)),
Duration::from_secs(2) Duration::from_secs(2),
)) )),
}, },
], ],
shutdown: vec![ shutdown: vec![
@@ -173,7 +173,7 @@ impl AniMeConfig {
angle: 0.0, angle: 0.0,
translation: Vec2::new(3.0, 2.0), translation: Vec2::new(3.0, 2.0),
brightness: 1.0, brightness: 1.0,
time: AnimTime::Infinite time: AnimTime::Infinite,
}, },
], ],
..Default::default() ..Default::default()

10
asusd/src/aura_anime/mod.rs
View File

@@ -12,7 +12,7 @@ use futures_util::lock::Mutex;
use log::{debug, error, info, warn}; use log::{debug, error, info, warn};
use rog_anime::usb::{ use rog_anime::usb::{
pkt_flush, pkt_set_brightness, pkt_set_enable_display, pkt_set_enable_powersave_anim, pkt_flush, pkt_set_brightness, pkt_set_enable_display, pkt_set_enable_powersave_anim,
pkts_for_init, Brightness pkts_for_init, Brightness,
}; };
use rog_anime::{ActionData, AnimeDataBuffer, AnimePacketType}; use rog_anime::{ActionData, AnimeDataBuffer, AnimePacketType};
use rog_platform::hid_raw::HidRaw; use rog_platform::hid_raw::HidRaw;
@@ -30,14 +30,14 @@ pub struct AniMe {
// set to force thread to exit // set to force thread to exit
thread_exit: Arc<AtomicBool>, thread_exit: Arc<AtomicBool>,
// Set to false when the thread exits // Set to false when the thread exits
thread_running: Arc<AtomicBool> thread_running: Arc<AtomicBool>,
} }
impl AniMe { impl AniMe {
pub fn new( pub fn new(
hid: Option<Arc<Mutex<HidRaw>>>, hid: Option<Arc<Mutex<HidRaw>>>,
usb: Option<Arc<Mutex<USBRaw>>>, usb: Option<Arc<Mutex<USBRaw>>>,
config: Arc<Mutex<AniMeConfig>> config: Arc<Mutex<AniMeConfig>>,
) -> Self { ) -> Self {
Self { Self {
hid, hid,
@@ -45,7 +45,7 @@ impl AniMe {
config, config,
cache: AniMeConfigCached::default(), cache: AniMeConfigCached::default(),
thread_exit: Arc::new(AtomicBool::new(false)), thread_exit: Arc::new(AtomicBool::new(false)),
thread_running: Arc::new(AtomicBool::new(false)) thread_running: Arc::new(AtomicBool::new(false)),
} }
} }
@@ -106,7 +106,7 @@ impl AniMe {
pub async fn set_builtins_enabled( pub async fn set_builtins_enabled(
&self, &self,
enabled: bool, enabled: bool,
bright: Brightness bright: Brightness,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
self.write_bytes(&pkt_set_enable_powersave_anim(enabled)) self.write_bytes(&pkt_set_enable_powersave_anim(enabled))
.await?; .await?;

14
asusd/src/aura_anime/trait_impls.rs
View File

@@ -5,7 +5,7 @@ use log::{debug, error, warn};
use logind_zbus::manager::ManagerProxy; use logind_zbus::manager::ManagerProxy;
use rog_anime::usb::{ use rog_anime::usb::{
pkt_set_brightness, pkt_set_builtin_animations, pkt_set_enable_display, pkt_set_brightness, pkt_set_builtin_animations, pkt_set_enable_display,
pkt_set_enable_powersave_anim, Brightness pkt_set_enable_powersave_anim, Brightness,
}; };
use rog_anime::{Animations, AnimeDataBuffer, DeviceState}; use rog_anime::{Animations, AnimeDataBuffer, DeviceState};
use zbus::object_server::SignalEmitter; use zbus::object_server::SignalEmitter;
@@ -41,7 +41,7 @@ impl AniMeZbus {
pub async fn start_tasks( pub async fn start_tasks(
mut self, mut self,
connection: &Connection, connection: &Connection,
path: OwnedObjectPath path: OwnedObjectPath,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
// let task = zbus.clone(); // let task = zbus.clone();
self.reload() self.reload()
@@ -169,7 +169,7 @@ impl AniMeZbus {
async fn set_builtin_animations(&self, settings: Animations) { async fn set_builtin_animations(&self, settings: Animations) {
self.0 self.0
.write_bytes(&pkt_set_builtin_animations( .write_bytes(&pkt_set_builtin_animations(
settings.boot, settings.awake, settings.sleep, settings.shutdown settings.boot, settings.awake, settings.sleep, settings.shutdown,
)) ))
.await .await
.map_err(|err| { .map_err(|err| {
@@ -319,7 +319,7 @@ impl crate::CtrlTask for AniMeZbus {
inner inner
.write_bytes(&pkt_set_enable_display( .write_bytes(&pkt_set_enable_display(
!(sleeping && config.off_when_suspended) !(sleeping && config.off_when_suspended),
)) ))
.await .await
.map_err(|err| { .map_err(|err| {
@@ -330,7 +330,7 @@ impl crate::CtrlTask for AniMeZbus {
if config.builtin_anims_enabled { if config.builtin_anims_enabled {
inner inner
.write_bytes(&pkt_set_enable_powersave_anim( .write_bytes(&pkt_set_enable_powersave_anim(
!(sleeping && config.off_when_suspended) !(sleeping && config.off_when_suspended),
)) ))
.await .await
.map_err(|err| { .map_err(|err| {
@@ -433,7 +433,7 @@ impl crate::CtrlTask for AniMeZbus {
.ok(); .ok();
} }
} }
} },
) )
.await; .await;
@@ -460,7 +460,7 @@ impl crate::Reloadable for AniMeZbus {
builtin_anims.boot, builtin_anims.boot,
builtin_anims.awake, builtin_anims.awake,
builtin_anims.sleep, builtin_anims.sleep,
builtin_anims.shutdown builtin_anims.shutdown,
)) ))
.await?; .await?;
} }

20
asusd/src/aura_laptop/config.rs
View File

@@ -5,7 +5,7 @@ use log::{debug, info, warn};
use rog_aura::aura_detection::LedSupportData; use rog_aura::aura_detection::LedSupportData;
use rog_aura::keyboard::LaptopAuraPower; use rog_aura::keyboard::LaptopAuraPower;
use rog_aura::{ use rog_aura::{
AuraDeviceType, AuraEffect, AuraModeNum, AuraZone, Direction, LedBrightness, Speed, GRADIENT AuraDeviceType, AuraEffect, AuraModeNum, AuraZone, Direction, LedBrightness, Speed, GRADIENT,
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -29,7 +29,7 @@ pub struct AuraConfig {
pub multizone_on: bool, pub multizone_on: bool,
pub enabled: LaptopAuraPower, pub enabled: LaptopAuraPower,
#[serde(skip)] #[serde(skip)]
pub per_key_mode_active: bool pub per_key_mode_active: bool,
} }
impl StdConfig for AuraConfig { impl StdConfig for AuraConfig {
@@ -74,7 +74,7 @@ impl AuraConfig {
multizone: None, multizone: None,
multizone_on: false, multizone_on: false,
enabled, enabled,
per_key_mode_active: false per_key_mode_active: false,
}; };
for n in &config.support_data.basic_modes { for n in &config.support_data.basic_modes {
@@ -92,7 +92,7 @@ impl AuraConfig {
colour1: *GRADIENT.get(i).unwrap_or(&GRADIENT[0]), colour1: *GRADIENT.get(i).unwrap_or(&GRADIENT[0]),
colour2: *GRADIENT.get(GRADIENT.len() - i).unwrap_or(&GRADIENT[6]), colour2: *GRADIENT.get(GRADIENT.len() - i).unwrap_or(&GRADIENT[6]),
speed: Speed::Med, speed: Speed::Med,
direction: Direction::Left direction: Direction::Left,
}); });
} }
if let Some(m) = config.multizone.as_mut() { if let Some(m) = config.multizone.as_mut() {
@@ -156,7 +156,7 @@ impl AuraConfig {
colour1: *GRADIENT.get(i).unwrap_or(&GRADIENT[0]), colour1: *GRADIENT.get(i).unwrap_or(&GRADIENT[0]),
colour2: *GRADIENT.get(GRADIENT.len() - i).unwrap_or(&GRADIENT[6]), colour2: *GRADIENT.get(GRADIENT.len() - i).unwrap_or(&GRADIENT[6]),
speed: Speed::Med, speed: Speed::Med,
direction: Direction::Left direction: Direction::Left,
}); });
} }
if default.is_empty() { if default.is_empty() {
@@ -232,7 +232,7 @@ impl AuraConfig {
mod tests { mod tests {
use rog_aura::keyboard::AuraPowerState; use rog_aura::keyboard::AuraPowerState;
use rog_aura::{ use rog_aura::{
AuraEffect, AuraModeNum, AuraZone, Colour, Direction, LedBrightness, PowerZones, Speed AuraEffect, AuraModeNum, AuraZone, Colour, Direction, LedBrightness, PowerZones, Speed,
}; };
use super::AuraConfig; use super::AuraConfig;
@@ -246,7 +246,7 @@ mod tests {
colour1: Colour { colour1: Colour {
r: 0xff, r: 0xff,
g: 0x00, g: 0x00,
b: 0xff b: 0xff,
}, },
zone: AuraZone::Key1, zone: AuraZone::Key1,
..Default::default() ..Default::default()
@@ -259,7 +259,7 @@ mod tests {
colour1: Colour { colour1: Colour {
r: 0x00, r: 0x00,
g: 0xff, g: 0xff,
b: 0xff b: 0xff,
}, },
zone: AuraZone::Key2, zone: AuraZone::Key2,
..Default::default() ..Default::default()
@@ -270,7 +270,7 @@ mod tests {
colour1: Colour { colour1: Colour {
r: 0xff, r: 0xff,
g: 0xff, g: 0xff,
b: 0x00 b: 0x00,
}, },
zone: AuraZone::Key3, zone: AuraZone::Key3,
..Default::default() ..Default::default()
@@ -281,7 +281,7 @@ mod tests {
colour1: Colour { colour1: Colour {
r: 0x00, r: 0x00,
g: 0xff, g: 0xff,
b: 0x00 b: 0x00,
}, },
zone: AuraZone::Key4, zone: AuraZone::Key4,
..Default::default() ..Default::default()

18
asusd/src/aura_laptop/mod.rs
View File

@@ -19,7 +19,7 @@ pub mod trait_impls;
pub struct Aura { pub struct Aura {
pub hid: Option<Arc<Mutex<HidRaw>>>, pub hid: Option<Arc<Mutex<HidRaw>>>,
pub backlight: Option<Arc<Mutex<KeyboardBacklight>>>, pub backlight: Option<Arc<Mutex<KeyboardBacklight>>>,
pub config: Arc<Mutex<AuraConfig>> pub config: Arc<Mutex<AuraConfig>>,
} }
impl Aura { impl Aura {
@@ -91,13 +91,13 @@ impl Aura {
pub async fn write_effect_and_apply( pub async fn write_effect_and_apply(
&self, &self,
dev_type: AuraDeviceType, dev_type: AuraDeviceType,
mode: &AuraEffect mode: &AuraEffect,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
if matches!(dev_type, AuraDeviceType::LaptopKeyboardTuf) { if matches!(dev_type, AuraDeviceType::LaptopKeyboardTuf) {
if let Some(platform) = &self.backlight { if let Some(platform) = &self.backlight {
let buf = [ let buf = [
1, mode.mode as u8, mode.colour1.r, mode.colour1.g, mode.colour1.b, 1, mode.mode as u8, mode.colour1.r, mode.colour1.g, mode.colour1.b,
mode.speed as u8 mode.speed as u8,
]; ];
platform.lock().await.set_kbd_rgb_mode(&buf)?; platform.lock().await.set_kbd_rgb_mode(&buf)?;
} }
@@ -121,7 +121,7 @@ impl Aura {
return Ok(()); return Ok(());
} }
Err(RogError::MissingFunction( Err(RogError::MissingFunction(
"No LED backlight control available".to_string() "No LED backlight control available".to_string(),
)) ))
} }
@@ -145,7 +145,7 @@ impl Aura {
0x01, 0x01,
p.new_to_byte() as u8, p.new_to_byte() as u8,
0x0, 0x0,
0x0 0x0,
]; ];
hid_raw.write_bytes(&msg)?; hid_raw.write_bytes(&msg)?;
return Ok(()); return Ok(());
@@ -154,7 +154,7 @@ impl Aura {
let bytes = config.enabled.to_bytes(config.led_type); let bytes = config.enabled.to_bytes(config.led_type);
let msg = [ let msg = [
0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3] 0x5d, 0xbd, 0x01, bytes[0], bytes[1], bytes[2], bytes[3],
]; ];
hid_raw.write_bytes(&msg)?; hid_raw.write_bytes(&msg)?;
} }
@@ -167,7 +167,7 @@ impl Aura {
pub async fn write_effect_block( pub async fn write_effect_block(
&self, &self,
config: &mut AuraConfig, config: &mut AuraConfig,
effect: &AuraLaptopUsbPackets effect: &AuraLaptopUsbPackets,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
if config.brightness == LedBrightness::Off { if config.brightness == LedBrightness::Off {
config.brightness = LedBrightness::Med; config.brightness = LedBrightness::Med;
@@ -201,7 +201,7 @@ impl Aura {
let g = row[10]; let g = row[10];
let b = row[11]; let b = row[11];
tuf.lock().await.set_kbd_rgb_mode(&[ tuf.lock().await.set_kbd_rgb_mode(&[
0, 0, r, g, b, 0 0, 0, r, g, b, 0,
])?; ])?;
} }
} }
@@ -215,7 +215,7 @@ impl Aura {
let mut config = self.config.lock().await; let mut config = self.config.lock().await;
if config.ally_fix.is_none() { if config.ally_fix.is_none() {
let msg = [ let msg = [
0x5d, 0xbd, 0x01, 0xff, 0xff, 0xff, 0xff 0x5d, 0xbd, 0x01, 0xff, 0xff, 0xff, 0xff,
]; ];
hid_raw.lock().await.write_bytes(&msg)?; hid_raw.lock().await.write_bytes(&msg)?;
info!("Reset Ally power settings to base"); info!("Reset Ally power settings to base");

6
asusd/src/aura_laptop/trait_impls.rs
View File

@@ -28,7 +28,7 @@ impl AuraZbus {
mut self, mut self,
connection: &Connection, connection: &Connection,
// _signal_ctx: SignalEmitter<'static>, // _signal_ctx: SignalEmitter<'static>,
path: OwnedObjectPath path: OwnedObjectPath,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
// let task = zbus.clone(); // let task = zbus.clone();
// let signal_ctx = signal_ctx.clone(); // let signal_ctx = signal_ctx.clone();
@@ -144,7 +144,7 @@ impl AuraZbus {
let mode = config.current_mode; let mode = config.current_mode;
match config.builtins.get(&mode) { match config.builtins.get(&mode) {
Some(effect) => Ok(effect.clone()), Some(effect) => Ok(effect.clone()),
None => Err(ZbErr::Failed("Could not get the current effect".into())) None => Err(ZbErr::Failed("Could not get the current effect".into())),
} }
} else { } else {
Err(ZbErr::Failed("Aura control couldn't lock self".to_string())) Err(ZbErr::Failed("Aura control couldn't lock self".to_string()))
@@ -297,7 +297,7 @@ impl CtrlTask for AuraZbus {
move |_power_plugged| { move |_power_plugged| {
// power change // power change
async move {} async move {}
} },
) )
.await; .await;

34
asusd/src/aura_manager.rs
View File

@@ -56,7 +56,7 @@ fn dbus_path_for_dev(parent: &Device) -> Option<OwnedObjectPath> {
if let Some(filename) = filename_partial(parent) { if let Some(filename) = filename_partial(parent) {
return Some( return Some(
ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{filename}")) ObjectPath::from_str_unchecked(&format!("{ASUS_ZBUS_PATH}/{MOD_NAME}/{filename}"))
.into() .into(),
); );
} }
None None
@@ -91,17 +91,17 @@ fn dev_prop_matches(dev: &Device, prop: &str, value: &str) -> bool {
/// required. /// required.
pub struct AsusDevice { pub struct AsusDevice {
device: DeviceHandle, device: DeviceHandle,
dbus_path: OwnedObjectPath dbus_path: OwnedObjectPath,
} }
pub struct DeviceManager { pub struct DeviceManager {
_dbus_connection: Connection _dbus_connection: Connection,
} }
impl DeviceManager { impl DeviceManager {
async fn init_hid_devices( async fn init_hid_devices(
connection: &Connection, connection: &Connection,
device: Device device: Device,
) -> Result<Vec<AsusDevice>, RogError> { ) -> Result<Vec<AsusDevice>, RogError> {
let mut devices = Vec::new(); let mut devices = Vec::new();
if let Some(usb_device) = device.parent_with_subsystem_devtype("usb", "usb_device")? { if let Some(usb_device) = device.parent_with_subsystem_devtype("usb", "usb_device")? {
@@ -122,7 +122,7 @@ impl DeviceManager {
// SLASH DEVICE // SLASH DEVICE
if let Ok(dev_type) = DeviceHandle::new_slash_hid( if let Ok(dev_type) = DeviceHandle::new_slash_hid(
dev.clone(), dev.clone(),
usb_id.to_str().unwrap_or_default() usb_id.to_str().unwrap_or_default(),
) )
.await .await
{ {
@@ -133,14 +133,14 @@ impl DeviceManager {
ctrl.start_tasks(connection, path.clone()).await.unwrap(); ctrl.start_tasks(connection, path.clone()).await.unwrap();
devices.push(AsusDevice { devices.push(AsusDevice {
device: dev_type, device: dev_type,
dbus_path: path dbus_path: path,
}); });
} }
} }
// ANIME MATRIX DEVICE // ANIME MATRIX DEVICE
if let Ok(dev_type) = DeviceHandle::maybe_anime_hid( if let Ok(dev_type) = DeviceHandle::maybe_anime_hid(
dev.clone(), dev.clone(),
usb_id.to_str().unwrap_or_default() usb_id.to_str().unwrap_or_default(),
) )
.await .await
{ {
@@ -151,14 +151,14 @@ impl DeviceManager {
ctrl.start_tasks(connection, path.clone()).await.unwrap(); ctrl.start_tasks(connection, path.clone()).await.unwrap();
devices.push(AsusDevice { devices.push(AsusDevice {
device: dev_type, device: dev_type,
dbus_path: path dbus_path: path,
}); });
} }
} }
// AURA LAPTOP DEVICE // AURA LAPTOP DEVICE
if let Ok(dev_type) = DeviceHandle::maybe_laptop_aura( if let Ok(dev_type) = DeviceHandle::maybe_laptop_aura(
Some(dev), Some(dev),
usb_id.to_str().unwrap_or_default() usb_id.to_str().unwrap_or_default(),
) )
.await .await
{ {
@@ -169,7 +169,7 @@ impl DeviceManager {
ctrl.start_tasks(connection, path.clone()).await.unwrap(); ctrl.start_tasks(connection, path.clone()).await.unwrap();
devices.push(AsusDevice { devices.push(AsusDevice {
device: dev_type, device: dev_type,
dbus_path: path dbus_path: path,
}); });
} }
} }
@@ -209,7 +209,7 @@ impl DeviceManager {
async fn init_scsi( async fn init_scsi(
connection: &Connection, connection: &Connection,
device: &Device, device: &Device,
path: OwnedObjectPath path: OwnedObjectPath,
) -> Option<AsusDevice> { ) -> Option<AsusDevice> {
// "ID_MODEL_ID" "1932" // "ID_MODEL_ID" "1932"
// "ID_VENDOR_ID" "0b05" // "ID_VENDOR_ID" "0b05"
@@ -227,7 +227,7 @@ impl DeviceManager {
ctrl.start_tasks(connection, path.clone()).await.unwrap(); ctrl.start_tasks(connection, path.clone()).await.unwrap();
return Some(AsusDevice { return Some(AsusDevice {
device: dev_type, device: dev_type,
dbus_path: path dbus_path: path,
}); });
} }
} }
@@ -305,7 +305,7 @@ impl DeviceManager {
ctrl.start_tasks(connection, path.clone()).await.unwrap(); ctrl.start_tasks(connection, path.clone()).await.unwrap();
devices.push(AsusDevice { devices.push(AsusDevice {
device: dev_type, device: dev_type,
dbus_path: path dbus_path: path,
}); });
} }
} else { } else {
@@ -327,7 +327,7 @@ impl DeviceManager {
{ {
devices.push(AsusDevice { devices.push(AsusDevice {
device: dev_type, device: dev_type,
dbus_path: path dbus_path: path,
}); });
} }
} }
@@ -354,7 +354,7 @@ impl DeviceManager {
ctrl.start_tasks(connection, path.clone()).await.unwrap(); ctrl.start_tasks(connection, path.clone()).await.unwrap();
devices.push(AsusDevice { devices.push(AsusDevice {
device: dev_type, device: dev_type,
dbus_path: path dbus_path: path,
}); });
} }
} }
@@ -374,7 +374,7 @@ impl DeviceManager {
info!("Found {} valid devices on startup", devices.len()); info!("Found {} valid devices on startup", devices.len());
let devices = Arc::new(Mutex::new(devices)); let devices = Arc::new(Mutex::new(devices));
let manager = Self { let manager = Self {
_dbus_connection: connection _dbus_connection: connection,
}; };
// TODO: The /sysfs/ LEDs don't cause events, so they need to be manually // TODO: The /sysfs/ LEDs don't cause events, so they need to be manually
@@ -509,7 +509,7 @@ impl DeviceManager {
.remove::<ScsiZbus, _>(&path) .remove::<ScsiZbus, _>(&path)
.await? .await?
} }
_ => todo!() _ => todo!(),
}; };
info!("AuraManager removed: {path:?}, {res}"); info!("AuraManager removed: {path:?}, {res}");
} }

34
asusd/src/aura_scsi/config.rs
View File

@@ -14,7 +14,7 @@ pub struct ScsiConfig {
pub dev_type: AuraDeviceType, pub dev_type: AuraDeviceType,
pub enabled: bool, pub enabled: bool,
pub current_mode: AuraMode, pub current_mode: AuraMode,
pub modes: BTreeMap<AuraMode, AuraEffect> pub modes: BTreeMap<AuraMode, AuraEffect>,
} }
impl ScsiConfig { impl ScsiConfig {
@@ -38,61 +38,61 @@ impl Default for ScsiConfig {
(AuraMode::Off, AuraEffect::default_with_mode(AuraMode::Off)), (AuraMode::Off, AuraEffect::default_with_mode(AuraMode::Off)),
( (
AuraMode::Static, AuraMode::Static,
AuraEffect::default_with_mode(AuraMode::Static) AuraEffect::default_with_mode(AuraMode::Static),
), ),
( (
AuraMode::Breathe, AuraMode::Breathe,
AuraEffect::default_with_mode(AuraMode::Breathe) AuraEffect::default_with_mode(AuraMode::Breathe),
), ),
( (
AuraMode::Flashing, AuraMode::Flashing,
AuraEffect::default_with_mode(AuraMode::Flashing) AuraEffect::default_with_mode(AuraMode::Flashing),
), ),
( (
AuraMode::RainbowCycle, AuraMode::RainbowCycle,
AuraEffect::default_with_mode(AuraMode::RainbowCycle) AuraEffect::default_with_mode(AuraMode::RainbowCycle),
), ),
( (
AuraMode::RainbowWave, AuraMode::RainbowWave,
AuraEffect::default_with_mode(AuraMode::RainbowWave) AuraEffect::default_with_mode(AuraMode::RainbowWave),
), ),
( (
AuraMode::RainbowCycleBreathe, AuraMode::RainbowCycleBreathe,
AuraEffect::default_with_mode(AuraMode::RainbowCycleBreathe) AuraEffect::default_with_mode(AuraMode::RainbowCycleBreathe),
), ),
( (
AuraMode::ChaseFade, AuraMode::ChaseFade,
AuraEffect::default_with_mode(AuraMode::ChaseFade) AuraEffect::default_with_mode(AuraMode::ChaseFade),
), ),
( (
AuraMode::RainbowCycleChaseFade, AuraMode::RainbowCycleChaseFade,
AuraEffect::default_with_mode(AuraMode::RainbowCycleChaseFade) AuraEffect::default_with_mode(AuraMode::RainbowCycleChaseFade),
), ),
( (
AuraMode::Chase, AuraMode::Chase,
AuraEffect::default_with_mode(AuraMode::Chase) AuraEffect::default_with_mode(AuraMode::Chase),
), ),
( (
AuraMode::RainbowCycleChase, AuraMode::RainbowCycleChase,
AuraEffect::default_with_mode(AuraMode::RainbowCycleChase) AuraEffect::default_with_mode(AuraMode::RainbowCycleChase),
), ),
( (
AuraMode::RainbowCycleWave, AuraMode::RainbowCycleWave,
AuraEffect::default_with_mode(AuraMode::RainbowCycleWave) AuraEffect::default_with_mode(AuraMode::RainbowCycleWave),
), ),
( (
AuraMode::RainbowPulseChase, AuraMode::RainbowPulseChase,
AuraEffect::default_with_mode(AuraMode::RainbowPulseChase) AuraEffect::default_with_mode(AuraMode::RainbowPulseChase),
), ),
( (
AuraMode::RandomFlicker, AuraMode::RandomFlicker,
AuraEffect::default_with_mode(AuraMode::RandomFlicker) AuraEffect::default_with_mode(AuraMode::RandomFlicker),
), ),
( (
AuraMode::DoubleFade, AuraMode::DoubleFade,
AuraEffect::default_with_mode(AuraMode::DoubleFade) AuraEffect::default_with_mode(AuraMode::DoubleFade),
) ),
]) ]),
} }
} }
} }

2
asusd/src/aura_scsi/mod.rs
View File

@@ -12,7 +12,7 @@ pub mod trait_impls;
#[derive(Clone)] #[derive(Clone)]
pub struct ScsiAura { pub struct ScsiAura {
device: Arc<Mutex<Device>>, device: Arc<Mutex<Device>>,
config: Arc<Mutex<ScsiConfig>> config: Arc<Mutex<ScsiConfig>>,
} }
impl ScsiAura { impl ScsiAura {

4
asusd/src/aura_scsi/trait_impls.rs
View File

@@ -22,7 +22,7 @@ impl ScsiZbus {
pub async fn start_tasks( pub async fn start_tasks(
self, self,
connection: &Connection, connection: &Connection,
path: OwnedObjectPath path: OwnedObjectPath,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
connection connection
.object_server() .object_server()
@@ -87,7 +87,7 @@ impl ScsiZbus {
let mode = config.current_mode; let mode = config.current_mode;
match config.modes.get(&mode) { match config.modes.get(&mode) {
Some(effect) => Ok(effect.clone()), Some(effect) => Ok(effect.clone()),
None => Err(ZbErr::Failed("Could not get the current effect".into())) None => Err(ZbErr::Failed("Could not get the current effect".into())),
} }
} else { } else {
Err(ZbErr::Failed("Aura control couldn't lock self".to_string())) Err(ZbErr::Failed("Aura control couldn't lock self".to_string()))

6
asusd/src/aura_slash/config.rs
View File

@@ -17,7 +17,7 @@ pub struct SlashConfig {
pub show_on_shutdown: bool, pub show_on_shutdown: bool,
pub show_on_sleep: bool, pub show_on_sleep: bool,
pub show_on_battery: bool, pub show_on_battery: bool,
pub show_battery_warning: bool pub show_battery_warning: bool,
} }
impl Default for SlashConfig { impl Default for SlashConfig {
@@ -32,7 +32,7 @@ impl Default for SlashConfig {
show_on_shutdown: true, show_on_shutdown: true,
show_on_sleep: true, show_on_sleep: true,
show_on_battery: true, show_on_battery: true,
show_battery_warning: true show_battery_warning: true,
} }
} }
} }
@@ -58,7 +58,7 @@ impl From<&SlashConfig> for DeviceState {
slash_enabled: config.enabled, slash_enabled: config.enabled,
slash_brightness: config.brightness, slash_brightness: config.brightness,
slash_interval: config.display_interval, slash_interval: config.display_interval,
slash_mode: config.display_mode slash_mode: config.display_mode,
} }
} }
} }

6
asusd/src/aura_slash/mod.rs
View File

@@ -16,14 +16,14 @@ pub mod trait_impls;
pub struct Slash { pub struct Slash {
hid: Option<Arc<Mutex<HidRaw>>>, hid: Option<Arc<Mutex<HidRaw>>>,
usb: Option<Arc<Mutex<USBRaw>>>, usb: Option<Arc<Mutex<USBRaw>>>,
config: Arc<Mutex<SlashConfig>> config: Arc<Mutex<SlashConfig>>,
} }
impl Slash { impl Slash {
pub fn new( pub fn new(
hid: Option<Arc<Mutex<HidRaw>>>, hid: Option<Arc<Mutex<HidRaw>>>,
usb: Option<Arc<Mutex<USBRaw>>>, usb: Option<Arc<Mutex<USBRaw>>>,
config: Arc<Mutex<SlashConfig>> config: Arc<Mutex<SlashConfig>>,
) -> Self { ) -> Self {
Self { hid, usb, config } Self { hid, usb, config }
} }
@@ -57,7 +57,7 @@ impl Slash {
config.slash_type, config.slash_type,
config.enabled, config.enabled,
config.brightness, config.brightness,
config.display_interval config.display_interval,
); );
self.write_bytes(&option_packets).await?; self.write_bytes(&option_packets).await?;

12
asusd/src/aura_slash/trait_impls.rs
View File

@@ -2,7 +2,7 @@ use config_traits::StdConfig;
use log::{debug, error, warn}; use log::{debug, error, warn};
use rog_slash::usb::{ use rog_slash::usb::{
get_battery_saver_packet, get_boot_packet, get_low_battery_packet, get_options_packet, get_battery_saver_packet, get_boot_packet, get_low_battery_packet, get_options_packet,
get_shutdown_packet, get_sleep_packet, pkt_save, pkt_set_mode get_shutdown_packet, get_sleep_packet, pkt_save, pkt_set_mode,
}; };
use rog_slash::{DeviceState, SlashMode}; use rog_slash::{DeviceState, SlashMode};
use zbus::zvariant::OwnedObjectPath; use zbus::zvariant::OwnedObjectPath;
@@ -23,7 +23,7 @@ impl SlashZbus {
pub async fn start_tasks( pub async fn start_tasks(
mut self, mut self,
connection: &Connection, connection: &Connection,
path: OwnedObjectPath path: OwnedObjectPath,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
// let task = zbus.clone(); // let task = zbus.clone();
self.reload() self.reload()
@@ -62,7 +62,7 @@ impl SlashZbus {
config.slash_type, config.slash_type,
enabled, enabled,
brightness, brightness,
config.display_interval config.display_interval,
)) ))
.await .await
.map_err(|err| { .map_err(|err| {
@@ -92,7 +92,7 @@ impl SlashZbus {
config.slash_type, config.slash_type,
enabled, enabled,
brightness, brightness,
config.display_interval config.display_interval,
)) ))
.await .await
.map_err(|err| { .map_err(|err| {
@@ -117,7 +117,7 @@ impl SlashZbus {
let mut config = self.0.lock_config().await; let mut config = self.0.lock_config().await;
self.0 self.0
.write_bytes(&get_options_packet( .write_bytes(&get_options_packet(
config.slash_type, config.enabled, config.brightness, interval config.slash_type, config.enabled, config.brightness, interval,
)) ))
.await .await
.map_err(|err| { .map_err(|err| {
@@ -252,7 +252,7 @@ impl Reloadable for SlashZbus {
config.slash_type, config.slash_type,
config.enabled, config.enabled,
config.brightness, config.brightness,
config.display_interval config.display_interval,
)) ))
.await .await
.map_err(|err| { .map_err(|err| {

20
asusd/src/aura_types.rs
View File

@@ -31,7 +31,7 @@ pub enum _DeviceHandle {
LedClass(KeyboardBacklight), LedClass(KeyboardBacklight),
/// TODO /// TODO
MulticolourLed, MulticolourLed,
None None,
} }
#[derive(Clone)] #[derive(Clone)]
@@ -47,14 +47,14 @@ pub enum DeviceHandle {
TufLedClass(Arc<Mutex<HidRaw>>), TufLedClass(Arc<Mutex<HidRaw>>),
/// TODO /// TODO
MulticolourLed, MulticolourLed,
None None,
} }
impl DeviceHandle { impl DeviceHandle {
/// Try Slash HID. If one exists it is initialsed and returned. /// Try Slash HID. If one exists it is initialsed and returned.
pub async fn new_slash_hid( pub async fn new_slash_hid(
device: Arc<Mutex<HidRaw>>, device: Arc<Mutex<HidRaw>>,
prod_id: &str prod_id: &str,
) -> Result<Self, RogError> { ) -> Result<Self, RogError> {
debug!("Testing for HIDRAW Slash"); debug!("Testing for HIDRAW Slash");
let slash_type = SlashType::from_dmi(); let slash_type = SlashType::from_dmi();
@@ -93,7 +93,7 @@ impl DeviceHandle {
let slash = Slash::new( let slash = Slash::new(
None, None,
Some(Arc::new(Mutex::new(usb))), Some(Arc::new(Mutex::new(usb))),
Arc::new(Mutex::new(config)) Arc::new(Mutex::new(config)),
); );
slash.do_initialization().await?; slash.do_initialization().await?;
Ok(Self::Slash(slash)) Ok(Self::Slash(slash))
@@ -105,11 +105,11 @@ impl DeviceHandle {
/// Try AniMe Matrix HID. If one exists it is initialsed and returned. /// Try AniMe Matrix HID. If one exists it is initialsed and returned.
pub async fn maybe_anime_hid( pub async fn maybe_anime_hid(
_device: Arc<Mutex<HidRaw>>, _device: Arc<Mutex<HidRaw>>,
_prod_id: &str _prod_id: &str,
) -> Result<Self, RogError> { ) -> Result<Self, RogError> {
// TODO: can't use HIDRAW for anime at the moment // TODO: can't use HIDRAW for anime at the moment
Err(RogError::NotFound( Err(RogError::NotFound(
"Can't use anime over hidraw yet. Skip.".to_string() "Can't use anime over hidraw yet. Skip.".to_string(),
)) ))
// debug!("Testing for HIDRAW AniMe"); // debug!("Testing for HIDRAW AniMe");
@@ -144,13 +144,13 @@ impl DeviceHandle {
let mut anime = AniMe::new( let mut anime = AniMe::new(
None, None,
Some(Arc::new(Mutex::new(usb))), Some(Arc::new(Mutex::new(usb))),
Arc::new(Mutex::new(config)) Arc::new(Mutex::new(config)),
); );
anime.do_initialization().await?; anime.do_initialization().await?;
Ok(Self::AniMe(anime)) Ok(Self::AniMe(anime))
} else { } else {
Err(RogError::NotFound( Err(RogError::NotFound(
"No AnimeMatrix device found".to_string() "No AnimeMatrix device found".to_string(),
)) ))
} }
} }
@@ -174,7 +174,7 @@ impl DeviceHandle {
pub async fn maybe_laptop_aura( pub async fn maybe_laptop_aura(
device: Option<Arc<Mutex<HidRaw>>>, device: Option<Arc<Mutex<HidRaw>>>,
prod_id: &str prod_id: &str,
) -> Result<Self, RogError> { ) -> Result<Self, RogError> {
debug!("Testing for laptop aura"); debug!("Testing for laptop aura");
let aura_type = AuraDeviceType::from(prod_id); let aura_type = AuraDeviceType::from(prod_id);
@@ -201,7 +201,7 @@ impl DeviceHandle {
let aura = Aura { let aura = Aura {
hid: device, hid: device,
backlight, backlight,
config: Arc::new(Mutex::new(config)) config: Arc::new(Mutex::new(config)),
}; };
aura.do_initialization().await?; aura.do_initialization().await?;
Ok(Self::Aura(aura)) Ok(Self::Aura(aura))

10
asusd/src/config.rs
View File

@@ -11,7 +11,7 @@ const CONFIG_FILE: &str = "asusd.ron";
#[derive(Default, Clone, Deserialize, Serialize, PartialEq)] #[derive(Default, Clone, Deserialize, Serialize, PartialEq)]
pub struct Tuning { pub struct Tuning {
pub enabled: bool, pub enabled: bool,
pub group: HashMap<FirmwareAttribute, i32> pub group: HashMap<FirmwareAttribute, i32>,
} }
type Tunings = HashMap<PlatformProfile, Tuning>; type Tunings = HashMap<PlatformProfile, Tuning>;
@@ -49,7 +49,7 @@ pub struct Config {
pub armoury_settings: HashMap<FirmwareAttribute, i32>, pub armoury_settings: HashMap<FirmwareAttribute, i32>,
/// Temporary state for AC/Batt /// Temporary state for AC/Batt
#[serde(skip)] #[serde(skip)]
pub last_power_plugged: u8 pub last_power_plugged: u8,
} }
impl Config { impl Config {
@@ -82,7 +82,7 @@ impl Default for Config {
ac_profile_tunings: HashMap::default(), ac_profile_tunings: HashMap::default(),
dc_profile_tunings: HashMap::default(), dc_profile_tunings: HashMap::default(),
armoury_settings: HashMap::default(), armoury_settings: HashMap::default(),
last_power_plugged: Default::default() last_power_plugged: Default::default(),
} }
} }
} }
@@ -147,7 +147,7 @@ pub struct Config601 {
#[serde(skip_serializing_if = "Option::is_none", default)] #[serde(skip_serializing_if = "Option::is_none", default)]
pub nv_temp_target: Option<u8>, pub nv_temp_target: Option<u8>,
#[serde(skip)] #[serde(skip)]
pub last_power_plugged: u8 pub last_power_plugged: u8,
} }
impl From<Config601> for Config { impl From<Config601> for Config {
@@ -170,7 +170,7 @@ impl From<Config601> for Config {
last_power_plugged: c.last_power_plugged, last_power_plugged: c.last_power_plugged,
ac_profile_tunings: HashMap::default(), ac_profile_tunings: HashMap::default(),
dc_profile_tunings: HashMap::default(), dc_profile_tunings: HashMap::default(),
armoury_settings: HashMap::default() armoury_settings: HashMap::default(),
} }
} }
} }

18
asusd/src/ctrl_fancurves.rs
View File

@@ -23,7 +23,7 @@ pub const FAN_CURVE_ZBUS_PATH: &str = "/xyz/ljones";
pub struct FanCurveConfig { pub struct FanCurveConfig {
pub profiles: FanCurveProfiles, pub profiles: FanCurveProfiles,
#[serde(skip)] #[serde(skip)]
pub current: PlatformProfile pub current: PlatformProfile,
} }
impl StdConfig for FanCurveConfig { impl StdConfig for FanCurveConfig {
@@ -47,7 +47,7 @@ impl StdConfigLoad for FanCurveConfig {}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct CtrlFanCurveZbus { pub struct CtrlFanCurveZbus {
config: Arc<Mutex<FanCurveConfig>>, config: Arc<Mutex<FanCurveConfig>>,
platform: RogPlatform platform: RogPlatform,
} }
// Non-zbus-derive impl // Non-zbus-derive impl
@@ -69,7 +69,7 @@ impl CtrlFanCurveZbus {
for this in [ for this in [
PlatformProfile::Balanced, PlatformProfile::Balanced,
PlatformProfile::Performance, PlatformProfile::Performance,
PlatformProfile::Quiet PlatformProfile::Quiet,
] { ] {
// For each profile we need to switch to it before we // For each profile we need to switch to it before we
// can read the existing values from hardware. The ACPI method used // can read the existing values from hardware. The ACPI method used
@@ -93,7 +93,7 @@ impl CtrlFanCurveZbus {
return Ok(Self { return Ok(Self {
config: Arc::new(Mutex::new(config)), config: Arc::new(Mutex::new(config)),
platform platform,
}); });
} }
@@ -108,7 +108,7 @@ impl CtrlFanCurveZbus {
async fn set_fan_curves_enabled( async fn set_fan_curves_enabled(
&mut self, &mut self,
profile: PlatformProfile, profile: PlatformProfile,
enabled: bool enabled: bool,
) -> zbus::fdo::Result<()> { ) -> zbus::fdo::Result<()> {
self.config self.config
.lock() .lock()
@@ -130,7 +130,7 @@ impl CtrlFanCurveZbus {
&mut self, &mut self,
profile: PlatformProfile, profile: PlatformProfile,
fan: FanCurvePU, fan: FanCurvePU,
enabled: bool enabled: bool,
) -> zbus::fdo::Result<()> { ) -> zbus::fdo::Result<()> {
self.config self.config
.lock() .lock()
@@ -149,7 +149,7 @@ impl CtrlFanCurveZbus {
/// Get the fan-curve data for the currently active ThrottlePolicy /// Get the fan-curve data for the currently active ThrottlePolicy
async fn fan_curve_data( async fn fan_curve_data(
&mut self, &mut self,
profile: PlatformProfile profile: PlatformProfile,
) -> zbus::fdo::Result<Vec<CurveData>> { ) -> zbus::fdo::Result<Vec<CurveData>> {
let curve = self let curve = self
.config .config
@@ -166,7 +166,7 @@ impl CtrlFanCurveZbus {
async fn set_fan_curve( async fn set_fan_curve(
&mut self, &mut self,
profile: PlatformProfile, profile: PlatformProfile,
curve: CurveData curve: CurveData,
) -> zbus::fdo::Result<()> { ) -> zbus::fdo::Result<()> {
self.config self.config
.lock() .lock()
@@ -261,7 +261,7 @@ impl CtrlTask for CtrlFanCurveZbus {
.profiles .profiles
.write_profile_curve_to_platform( .write_profile_curve_to_platform(
profile, profile,
&mut find_fan_curve_node().unwrap() &mut find_fan_curve_node().unwrap(),
) )
.map_err(|e| warn!("write_profile_curve_to_platform, {}", e)) .map_err(|e| warn!("write_profile_curve_to_platform, {}", e))
.ok(); .ok();

40
asusd/src/ctrl_platform.rs
View File

@@ -45,7 +45,7 @@ pub struct CtrlPlatform {
platform: RogPlatform, platform: RogPlatform,
attributes: FirmwareAttributes, attributes: FirmwareAttributes,
cpu_control: Option<CPUControl>, cpu_control: Option<CPUControl>,
config: Arc<Mutex<Config>> config: Arc<Mutex<Config>>,
} }
impl CtrlPlatform { impl CtrlPlatform {
@@ -55,7 +55,7 @@ impl CtrlPlatform {
attributes: FirmwareAttributes, attributes: FirmwareAttributes,
config: Arc<Mutex<Config>>, config: Arc<Mutex<Config>>,
config_path: &Path, config_path: &Path,
signal_context: SignalEmitter<'static> signal_context: SignalEmitter<'static>,
) -> Result<Self, RogError> { ) -> Result<Self, RogError> {
let config1 = config.clone(); let config1 = config.clone();
let config_path = config_path.to_owned(); let config_path = config_path.to_owned();
@@ -67,7 +67,7 @@ impl CtrlPlatform {
config, config,
cpu_control: CPUControl::new() cpu_control: CPUControl::new()
.map_err(|e| error!("Couldn't get CPU control sysfs: {e}")) .map_err(|e| error!("Couldn't get CPU control sysfs: {e}"))
.ok() .ok(),
}; };
let mut inotify_self = ret_self.clone(); let mut inotify_self = ret_self.clone();
@@ -86,7 +86,7 @@ impl CtrlPlatform {
inotify::WatchMask::MODIFY inotify::WatchMask::MODIFY
| inotify::WatchMask::CLOSE_WRITE | inotify::WatchMask::CLOSE_WRITE
| inotify::WatchMask::ATTRIB | inotify::WatchMask::ATTRIB
| inotify::WatchMask::CREATE | inotify::WatchMask::CREATE,
) )
.inspect_err(|e| { .inspect_err(|e| {
if e.kind() == std::io::ErrorKind::NotFound { if e.kind() == std::io::ErrorKind::NotFound {
@@ -128,7 +128,7 @@ impl CtrlPlatform {
if limit > 0 if limit > 0
&& std::mem::replace( && std::mem::replace(
&mut self.config.lock().await.charge_control_end_threshold, &mut self.config.lock().await.charge_control_end_threshold,
limit limit,
) != limit ) != limit
{ {
self.power self.power
@@ -210,7 +210,7 @@ impl CtrlPlatform {
match throttle { match throttle {
PlatformProfile::Balanced => self.config.lock().await.profile_balanced_epp, PlatformProfile::Balanced => self.config.lock().await.profile_balanced_epp,
PlatformProfile::Performance => self.config.lock().await.profile_performance_epp, PlatformProfile::Performance => self.config.lock().await.profile_performance_epp,
PlatformProfile::Quiet => self.config.lock().await.profile_quiet_epp PlatformProfile::Quiet => self.config.lock().await.profile_quiet_epp,
} }
} }
@@ -305,7 +305,7 @@ impl CtrlPlatform {
async fn one_shot_full_charge(&self) -> Result<(), FdoErr> { async fn one_shot_full_charge(&self) -> Result<(), FdoErr> {
let base_limit = std::mem::replace( let base_limit = std::mem::replace(
&mut self.config.lock().await.charge_control_end_threshold, &mut self.config.lock().await.charge_control_end_threshold,
100 100,
); );
if base_limit != 100 { if base_limit != 100 {
self.power.set_charge_control_end_threshold(100)?; self.power.set_charge_control_end_threshold(100)?;
@@ -319,7 +319,7 @@ impl CtrlPlatform {
/// If fan-curves are supported will also activate a fan curve for profile. /// If fan-curves are supported will also activate a fan curve for profile.
async fn next_platform_profile( async fn next_platform_profile(
&mut self, &mut self,
#[zbus(signal_context)] ctxt: SignalEmitter<'_> #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
) -> Result<(), FdoErr> { ) -> Result<(), FdoErr> {
let policy: PlatformProfile = let policy: PlatformProfile =
platform_get_value!(self, platform_profile, "platform_profile").map(|n| n.into())?; platform_get_value!(self, platform_profile, "platform_profile").map(|n| n.into())?;
@@ -339,7 +339,7 @@ impl CtrlPlatform {
Ok(self.platform_profile_changed(&ctxt).await?) Ok(self.platform_profile_changed(&ctxt).await?)
} else { } else {
Err(FdoErr::NotSupported( Err(FdoErr::NotSupported(
"RogPlatform: platform_profile not supported".to_owned() "RogPlatform: platform_profile not supported".to_owned(),
)) ))
} }
} }
@@ -353,7 +353,7 @@ impl CtrlPlatform {
async fn set_platform_profile( async fn set_platform_profile(
&mut self, &mut self,
#[zbus(signal_context)] ctxt: SignalEmitter<'_>, #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
policy: PlatformProfile policy: PlatformProfile,
) -> Result<(), FdoErr> { ) -> Result<(), FdoErr> {
// TODO: watch for external changes // TODO: watch for external changes
if self.platform.has_platform_profile() { if self.platform.has_platform_profile() {
@@ -373,7 +373,7 @@ impl CtrlPlatform {
Ok(()) Ok(())
} else { } else {
Err(FdoErr::NotSupported( Err(FdoErr::NotSupported(
"RogPlatform: platform_profile not supported".to_owned() "RogPlatform: platform_profile not supported".to_owned(),
)) ))
} }
} }
@@ -399,7 +399,7 @@ impl CtrlPlatform {
async fn set_platform_profile_on_battery( async fn set_platform_profile_on_battery(
&mut self, &mut self,
#[zbus(signal_context)] ctxt: SignalEmitter<'_>, #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
policy: PlatformProfile policy: PlatformProfile,
) -> Result<(), FdoErr> { ) -> Result<(), FdoErr> {
self.config.lock().await.platform_profile_on_battery = policy; self.config.lock().await.platform_profile_on_battery = policy;
self.set_platform_profile(ctxt, policy).await?; self.set_platform_profile(ctxt, policy).await?;
@@ -428,7 +428,7 @@ impl CtrlPlatform {
async fn set_platform_profile_on_ac( async fn set_platform_profile_on_ac(
&mut self, &mut self,
#[zbus(signal_context)] ctxt: SignalEmitter<'_>, #[zbus(signal_context)] ctxt: SignalEmitter<'_>,
policy: PlatformProfile policy: PlatformProfile,
) -> Result<(), FdoErr> { ) -> Result<(), FdoErr> {
self.config.lock().await.platform_profile_on_ac = policy; self.config.lock().await.platform_profile_on_ac = policy;
self.set_platform_profile(ctxt, policy).await?; self.set_platform_profile(ctxt, policy).await?;
@@ -593,7 +593,7 @@ impl ReloadAndNotify for CtrlPlatform {
async fn reload_and_notify( async fn reload_and_notify(
&mut self, &mut self,
signal_context: &SignalEmitter<'static>, signal_context: &SignalEmitter<'static>,
data: Self::Data data: Self::Data,
) -> Result<(), RogError> { ) -> Result<(), RogError> {
let mut config = self.config.lock().await; let mut config = self.config.lock().await;
if *config != data { if *config != data {
@@ -622,7 +622,7 @@ impl ReloadAndNotify for CtrlPlatform {
let epp = match profile { let epp = match profile {
PlatformProfile::Balanced => data.profile_balanced_epp, PlatformProfile::Balanced => data.profile_balanced_epp,
PlatformProfile::Performance => data.profile_performance_epp, PlatformProfile::Performance => data.profile_performance_epp,
PlatformProfile::Quiet => data.profile_quiet_epp PlatformProfile::Quiet => data.profile_quiet_epp,
}; };
warn!("setting epp to {epp:?}"); warn!("setting epp to {epp:?}");
self.check_and_set_epp(epp, true); self.check_and_set_epp(epp, true);
@@ -694,7 +694,7 @@ impl CtrlTask for CtrlPlatform {
platform1 platform1
.power .power
.set_charge_control_end_threshold( .set_charge_control_end_threshold(
platform1.config.lock().await.charge_control_end_threshold platform1.config.lock().await.charge_control_end_threshold,
) )
.ok(); .ok();
} }
@@ -728,7 +728,7 @@ impl CtrlTask for CtrlPlatform {
platform2 platform2
.power .power
.set_charge_control_end_threshold( .set_charge_control_end_threshold(
lock.base_charge_control_end_threshold lock.base_charge_control_end_threshold,
) )
.map_err(|err| { .map_err(|err| {
warn!("CtrlCharge: charge_control_end_threshold {}", err); warn!("CtrlCharge: charge_control_end_threshold {}", err);
@@ -773,7 +773,7 @@ impl CtrlTask for CtrlPlatform {
&attrs, &attrs,
&mut *platform3.config.lock().await, &mut *platform3.config.lock().await,
power_plugged, power_plugged,
profile profile,
) )
.await; .await;
platform3 platform3
@@ -782,7 +782,7 @@ impl CtrlTask for CtrlPlatform {
.ok(); .ok();
} }
} }
} },
) )
.await; .await;
@@ -829,7 +829,7 @@ impl CtrlTask for CtrlPlatform {
&attrs, &attrs,
&mut *ctrl.config.lock().await, &mut *ctrl.config.lock().await,
power_plugged == 1, power_plugged == 1,
profile profile,
) )
.await; .await;
} }

6
asusd/src/daemon.rs
View File

@@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let is_service = match env::var_os("IS_SERVICE") { let is_service = match env::var_os("IS_SERVICE") {
Some(val) => val == "1", Some(val) => val == "1",
None => true None => true,
}; };
if !is_service { if !is_service {
@@ -76,7 +76,7 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
platform.clone(), platform.clone(),
power.clone(), power.clone(),
attributes.clone(), attributes.clone(),
config.clone() config.clone(),
) )
.await?; .await?;
@@ -96,7 +96,7 @@ async fn start_daemon() -> Result<(), Box<dyn Error>> {
attributes, attributes,
config.clone(), config.clone(),
&cfg_path, &cfg_path,
CtrlPlatform::signal_context(&server)? CtrlPlatform::signal_context(&server)?,
) { ) {
Ok(ctrl) => { Ok(ctrl) => {
let sig_ctx = CtrlPlatform::signal_context(&server)?; let sig_ctx = CtrlPlatform::signal_context(&server)?;

4
asusd/src/error.rs
View File

@@ -37,7 +37,7 @@ pub enum RogError {
SystemdUnitAction(String), SystemdUnitAction(String),
SystemdUnitWaitTimeout(String), SystemdUnitWaitTimeout(String),
Command(String, std::io::Error), Command(String, std::io::Error),
ParseRon(ron::Error) ParseRon(ron::Error),
} }
impl fmt::Display for RogError { impl fmt::Display for RogError {
@@ -87,7 +87,7 @@ impl fmt::Display for RogError {
) )
} }
RogError::Command(func, error) => write!(f, "Command exec error: {}: {}", func, error), RogError::Command(func, error) => write!(f, "Command exec error: {}: {}", func, error),
RogError::ParseRon(error) => write!(f, "Parse config error: {}", error) RogError::ParseRon(error) => write!(f, "Parse config error: {}", error),
} }
} }
} }

14
asusd/src/lib.rs
View File

@@ -149,7 +149,7 @@ pub trait ReloadAndNotify {
fn reload_and_notify( fn reload_and_notify(
&mut self, &mut self,
signal_context: &SignalEmitter<'static>, signal_context: &SignalEmitter<'static>,
data: Self::Data data: Self::Data,
) -> impl Future<Output = Result<(), RogError>> + Send; ) -> impl Future<Output = Result<(), RogError>> + Send;
} }
@@ -159,7 +159,7 @@ pub trait ZbusRun {
fn add_to_server_helper( fn add_to_server_helper(
iface: impl Interface, iface: impl Interface,
path: &str, path: &str,
server: &mut Connection server: &mut Connection,
) -> impl Future<Output = ()> + Send { ) -> impl Future<Output = ()> + Send {
async move { async move {
server server
@@ -188,7 +188,7 @@ pub trait CtrlTask {
/// separate thread. /// separate thread.
fn create_tasks( fn create_tasks(
&self, &self,
signal: SignalEmitter<'static> signal: SignalEmitter<'static>,
) -> impl Future<Output = Result<(), RogError>> + Send; ) -> impl Future<Output = Result<(), RogError>> + Send;
// /// Create a timed repeating task // /// Create a timed repeating task
@@ -212,7 +212,7 @@ pub trait CtrlTask {
mut on_prepare_for_sleep: F1, mut on_prepare_for_sleep: F1,
mut on_prepare_for_shutdown: F2, mut on_prepare_for_shutdown: F2,
mut on_lid_change: F3, mut on_lid_change: F3,
mut on_external_power_change: F4 mut on_external_power_change: F4,
) -> impl Future<Output = ()> + Send ) -> impl Future<Output = ()> + Send
where where
F1: FnMut(bool) -> Fut1 + Send + 'static, F1: FnMut(bool) -> Fut1 + Send + 'static,
@@ -222,7 +222,7 @@ pub trait CtrlTask {
Fut1: Future<Output = ()> + Send, Fut1: Future<Output = ()> + Send,
Fut2: Future<Output = ()> + Send, Fut2: Future<Output = ()> + Send,
Fut3: Future<Output = ()> + Send, Fut3: Future<Output = ()> + Send,
Fut4: Future<Output = ()> + Send Fut4: Future<Output = ()> + Send,
{ {
async { async {
let connection = Connection::system() let connection = Connection::system()
@@ -302,10 +302,10 @@ pub trait GetSupported {
pub async fn start_tasks<T>( pub async fn start_tasks<T>(
mut zbus: T, mut zbus: T,
connection: &mut Connection, connection: &mut Connection,
signal_ctx: SignalEmitter<'static> signal_ctx: SignalEmitter<'static>,
) -> Result<(), RogError> ) -> Result<(), RogError>
where where
T: ZbusRun + Reloadable + CtrlTask + Clone T: ZbusRun + Reloadable + CtrlTask + Clone,
{ {
let zbus_clone = zbus.clone(); let zbus_clone = zbus.clone();

2
config-traits/src/lib.rs
View File

@@ -19,7 +19,7 @@ use serde::Serialize;
/// implemented, the rest are intended to be free methods. /// implemented, the rest are intended to be free methods.
pub trait StdConfig pub trait StdConfig
where where
Self: Serialize + DeserializeOwned Self: Serialize + DeserializeOwned,
{ {
/// Taking over the standard `new()` to ensure things can be generic /// Taking over the standard `new()` to ensure things can be generic
fn new() -> Self; fn new() -> Self;

4
dmi-id/src/lib.rs
View File

@@ -12,7 +12,7 @@ pub struct DMIID {
pub bios_vendor: String, pub bios_vendor: String,
pub bios_version: String, pub bios_version: String,
pub product_family: String, pub product_family: String,
pub product_name: String pub product_name: String,
} }
impl DMIID { impl DMIID {
@@ -77,7 +77,7 @@ impl DMIID {
product_name: device product_name: device
.attribute_value("product_name") .attribute_value("product_name")
.map(|s| s.to_string_lossy().to_string()) .map(|s| s.to_string_lossy().to_string())
.unwrap_or("Unknown".to_string()) .unwrap_or("Unknown".to_string()),
}); });
} }
Err("dmi not found".into()) Err("dmi not found".into())

26
rog-anime/src/data.rs
View File

@@ -23,15 +23,15 @@ const PANE_LEN: usize = BLOCK_END - BLOCK_START;
/// First packet is for GA401 + GA402 /// First packet is for GA401 + GA402
pub const USB_PREFIX1: [u8; 7] = [ pub const USB_PREFIX1: [u8; 7] = [
0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02 0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02,
]; ];
/// Second packet is for GA401 + GA402 /// Second packet is for GA401 + GA402
pub const USB_PREFIX2: [u8; 7] = [ pub const USB_PREFIX2: [u8; 7] = [
0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02 0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02,
]; ];
/// Third packet is for GA402 matrix /// Third packet is for GA402 matrix
pub const USB_PREFIX3: [u8; 7] = [ pub const USB_PREFIX3: [u8; 7] = [
0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02 0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02,
]; ];
#[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))] #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
@@ -40,7 +40,7 @@ pub struct Animations {
pub boot: AnimBooting, pub boot: AnimBooting,
pub awake: AnimAwake, pub awake: AnimAwake,
pub sleep: AnimSleeping, pub sleep: AnimSleeping,
pub shutdown: AnimShutdown pub shutdown: AnimShutdown,
} }
// TODO: move this out // TODO: move this out
@@ -54,7 +54,7 @@ pub struct DeviceState {
pub off_when_unplugged: bool, pub off_when_unplugged: bool,
pub off_when_suspended: bool, pub off_when_suspended: bool,
pub off_when_lid_closed: bool, pub off_when_lid_closed: bool,
pub brightness_on_battery: Brightness pub brightness_on_battery: Brightness,
} }
#[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))] #[cfg_attr(feature = "dbus", derive(Type), zvariant(signature = "s"))]
@@ -64,7 +64,7 @@ pub enum AnimeType {
GA402, GA402,
GU604, GU604,
#[default] #[default]
Unsupported Unsupported,
} }
impl FromStr for AnimeType { impl FromStr for AnimeType {
@@ -75,7 +75,7 @@ impl FromStr for AnimeType {
"ga401" | "GA401" => Self::GA401, "ga401" | "GA401" => Self::GA401,
"ga402" | "GA402" => Self::GA402, "ga402" | "GA402" => Self::GA402,
"gu604" | "GU604" => Self::GU604, "gu604" | "GU604" => Self::GU604,
_ => Self::Unsupported _ => Self::Unsupported,
}) })
} }
} }
@@ -98,7 +98,7 @@ impl AnimeType {
pub fn width(&self) -> usize { pub fn width(&self) -> usize {
match self { match self {
AnimeType::GU604 => 70, AnimeType::GU604 => 70,
_ => 74 _ => 74,
} }
} }
@@ -107,7 +107,7 @@ impl AnimeType {
match self { match self {
AnimeType::GA401 => 36, AnimeType::GA401 => 36,
AnimeType::GU604 => 43, AnimeType::GU604 => 43,
_ => 39 _ => 39,
} }
} }
@@ -116,7 +116,7 @@ impl AnimeType {
match self { match self {
AnimeType::GA401 => PANE_LEN * 2, AnimeType::GA401 => PANE_LEN * 2,
AnimeType::GU604 => PANE_LEN * 3, AnimeType::GU604 => PANE_LEN * 3,
_ => PANE_LEN * 3 _ => PANE_LEN * 3,
} }
} }
} }
@@ -127,7 +127,7 @@ impl AnimeType {
#[derive(Debug, Clone, Deserialize, Serialize)] #[derive(Debug, Clone, Deserialize, Serialize)]
pub struct AnimeDataBuffer { pub struct AnimeDataBuffer {
data: Vec<u8>, data: Vec<u8>,
anime: AnimeType anime: AnimeType,
} }
impl AnimeDataBuffer { impl AnimeDataBuffer {
@@ -137,7 +137,7 @@ impl AnimeDataBuffer {
AnimeDataBuffer { AnimeDataBuffer {
data: vec![0u8; len], data: vec![0u8; len],
anime anime,
} }
} }
@@ -180,7 +180,7 @@ impl TryFrom<AnimeDataBuffer> for AnimePacketType {
let mut buffers = match anime.anime { let mut buffers = match anime.anime {
AnimeType::GA401 => vec![[0; 640]; 2], AnimeType::GA401 => vec![[0; 640]; 2],
AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported => vec![[0; 640]; 3] AnimeType::GA402 | AnimeType::GU604 | AnimeType::Unsupported => vec![[0; 640]; 3],
}; };
for (idx, chunk) in anime.data.as_slice().chunks(PANE_LEN).enumerate() { for (idx, chunk) in anime.data.as_slice().chunks(PANE_LEN).enumerate() {

20
rog-anime/src/diagonal.rs
View File

@@ -20,7 +20,7 @@ impl AnimeDiagonal {
Self( Self(
anime_type, anime_type,
vec![vec![0; anime_type.width()]; anime_type.height()], vec![vec![0; anime_type.width()]; anime_type.height()],
duration duration,
) )
} }
@@ -49,7 +49,7 @@ impl AnimeDiagonal {
path: &Path, path: &Path,
duration: Option<Duration>, duration: Option<Duration>,
bright: f32, bright: f32,
anime_type: AnimeType anime_type: AnimeType,
) -> Result<Self> { ) -> Result<Self> {
let data = std::fs::read(path).map_err(|e| { let data = std::fs::read(path).map_err(|e| {
error!("Could not open {path:?}: {e:?}"); error!("Could not open {path:?}: {e:?}");
@@ -86,7 +86,7 @@ impl AnimeDiagonal {
png_pong::PngRaster::Rgba16(ras) => { png_pong::PngRaster::Rgba16(ras) => {
Self::pixels_from_16bit(ras, &mut matrix, bright, false); Self::pixels_from_16bit(ras, &mut matrix, bright, false);
} }
png_pong::PngRaster::Palette(..) => return Err(AnimeError::Format) png_pong::PngRaster::Palette(..) => return Err(AnimeError::Format),
}; };
Ok(matrix) Ok(matrix)
@@ -96,9 +96,9 @@ impl AnimeDiagonal {
ras: &pix::Raster<P>, ras: &pix::Raster<P>,
matrix: &mut AnimeDiagonal, matrix: &mut AnimeDiagonal,
bright: f32, bright: f32,
grey: bool grey: bool,
) where ) where
P: pix::el::Pixel<Chan = pix::chan::Ch8> P: pix::el::Pixel<Chan = pix::chan::Ch8>,
{ {
let width = ras.width(); let width = ras.width();
for (y, row) in ras.pixels().chunks(width as usize).enumerate() { for (y, row) in ras.pixels().chunks(width as usize).enumerate() {
@@ -121,9 +121,9 @@ impl AnimeDiagonal {
ras: &pix::Raster<P>, ras: &pix::Raster<P>,
matrix: &mut AnimeDiagonal, matrix: &mut AnimeDiagonal,
bright: f32, bright: f32,
grey: bool grey: bool,
) where ) where
P: pix::el::Pixel<Chan = pix::chan::Ch16> P: pix::el::Pixel<Chan = pix::chan::Ch16>,
{ {
let width = ras.width(); let width = ras.width();
for (y, row) in ras.pixels().chunks(width as usize).enumerate() { for (y, row) in ras.pixels().chunks(width as usize).enumerate() {
@@ -146,7 +146,7 @@ impl AnimeDiagonal {
match anime_type { match anime_type {
AnimeType::GA401 => self.to_ga401_packets(), AnimeType::GA401 => self.to_ga401_packets(),
AnimeType::GU604 => self.to_gu604_packets(), AnimeType::GU604 => self.to_gu604_packets(),
_ => self.to_ga402_packets() _ => self.to_ga402_packets(),
} }
} }
@@ -224,7 +224,7 @@ impl AnimeDiagonal {
x: usize, x: usize,
y: usize, y: usize,
start_index: &mut usize, start_index: &mut usize,
len: usize len: usize,
) { ) {
buf[*start_index..*start_index + len].copy_from_slice(&anime.get_row(x, y, len)); buf[*start_index..*start_index + len].copy_from_slice(&anime.get_row(x, y, len));
*start_index += len; *start_index += len;
@@ -307,7 +307,7 @@ impl AnimeDiagonal {
x: usize, x: usize,
y: usize, y: usize,
start_index: &mut usize, start_index: &mut usize,
len: usize len: usize,
) { ) {
buf[*start_index..*start_index + len].copy_from_slice(&anime.get_row(x, y, len)); buf[*start_index..*start_index + len].copy_from_slice(&anime.get_row(x, y, len));
*start_index += len; *start_index += len;

4
rog-anime/src/error.rs
View File

@@ -24,7 +24,7 @@ pub enum AnimeError {
DataBufferLength, DataBufferLength,
PixelGifWidth(usize), PixelGifWidth(usize),
PixelGifHeight(usize), PixelGifHeight(usize),
ParseError(String) ParseError(String),
} }
impl fmt::Display for AnimeError { impl fmt::Display for AnimeError {
@@ -61,7 +61,7 @@ impl fmt::Display for AnimeError {
AnimeError::PixelGifHeight(n) => write!( AnimeError::PixelGifHeight(n) => write!(
f, f,
"The gif used for pixel-perfect gif is is taller than {n}" "The gif used for pixel-perfect gif is is taller than {n}"
) ),
} }
} }
} }

30
rog-anime/src/gif.rs
View File

@@ -16,7 +16,7 @@ pub struct AnimeFrame {
/// the `asusd` daemon over dbus or converted to USB packet with /// the `asusd` daemon over dbus or converted to USB packet with
/// `AnimePacketType::from(buffer)` /// `AnimePacketType::from(buffer)`
data: AnimeDataBuffer, data: AnimeDataBuffer,
delay: Duration delay: Duration,
} }
impl AnimeFrame { impl AnimeFrame {
@@ -44,7 +44,7 @@ pub enum AnimTime {
/// Run for infinite time /// Run for infinite time
Infinite, Infinite,
/// Fade in, play for, fade out /// Fade in, play for, fade out
Fade(Fade) Fade(Fade),
} }
impl Default for AnimTime { impl Default for AnimTime {
@@ -59,7 +59,7 @@ impl Default for AnimTime {
pub struct Fade { pub struct Fade {
fade_in: Duration, fade_in: Duration,
show_for: Option<Duration>, show_for: Option<Duration>,
fade_out: Duration fade_out: Duration,
} }
impl Fade { impl Fade {
@@ -67,7 +67,7 @@ impl Fade {
Self { Self {
fade_in, fade_in,
show_for, show_for,
fade_out fade_out,
} }
} }
@@ -100,7 +100,7 @@ impl AnimeGif {
file_name: &Path, file_name: &Path,
duration: AnimTime, duration: AnimTime,
brightness: f32, brightness: f32,
anime_type: AnimeType anime_type: AnimeType,
) -> Result<Self> { ) -> Result<Self> {
let mut matrix = AnimeDiagonal::new(anime_type, None); let mut matrix = AnimeDiagonal::new(anime_type, None);
@@ -142,7 +142,7 @@ impl AnimeGif {
frames.push(AnimeFrame { frames.push(AnimeFrame {
data: matrix.into_data_buffer(anime_type)?, data: matrix.into_data_buffer(anime_type)?,
delay: Duration::from_millis(wait as u64) delay: Duration::from_millis(wait as u64),
}); });
} }
Ok(Self(frames, duration)) Ok(Self(frames, duration))
@@ -154,7 +154,7 @@ impl AnimeGif {
file_name: &Path, file_name: &Path,
anime_type: AnimeType, anime_type: AnimeType,
duration: AnimTime, duration: AnimTime,
brightness: f32 brightness: f32,
) -> Result<Self> { ) -> Result<Self> {
let image = AnimeDiagonal::from_png(file_name, None, brightness, anime_type)?; let image = AnimeDiagonal::from_png(file_name, None, brightness, anime_type)?;
@@ -170,7 +170,7 @@ impl AnimeGif {
let single = AnimeFrame { let single = AnimeFrame {
data: image.into_data_buffer(anime_type)?, data: image.into_data_buffer(anime_type)?,
delay: Duration::from_millis(30) delay: Duration::from_millis(30),
}; };
let frames = vec![single; frame_count as usize]; let frames = vec![single; frame_count as usize];
@@ -187,7 +187,7 @@ impl AnimeGif {
translation: Vec2, translation: Vec2,
duration: AnimTime, duration: AnimTime,
brightness: f32, brightness: f32,
anime_type: AnimeType anime_type: AnimeType,
) -> Result<Self> { ) -> Result<Self> {
let mut frames = Vec::new(); let mut frames = Vec::new();
let mut decoder = gif::DecodeOptions::new(); let mut decoder = gif::DecodeOptions::new();
@@ -211,7 +211,7 @@ impl AnimeGif {
brightness, brightness,
pixels, pixels,
decoder.width() as u32, decoder.width() as u32,
anime_type anime_type,
)?; )?;
while let Some(frame) = decoder.read_next_frame()? { while let Some(frame) = decoder.read_next_frame()? {
@@ -226,7 +226,7 @@ impl AnimeGif {
brightness, brightness,
pixels, pixels,
width as u32, width as u32,
anime_type anime_type,
)?; )?;
} }
for (y, row) in frame.buffer.chunks(frame.width as usize * 4).enumerate() { for (y, row) in frame.buffer.chunks(frame.width as usize * 4).enumerate() {
@@ -239,7 +239,7 @@ impl AnimeGif {
(x + frame.left as usize) + ((y + frame.top as usize) * width as usize); (x + frame.left as usize) + ((y + frame.top as usize) * width as usize);
image.get_mut()[pos] = Pixel { image.get_mut()[pos] = Pixel {
color: ((px[0] as u32 + px[1] as u32 + px[2] as u32) / 3), color: ((px[0] as u32 + px[1] as u32 + px[2] as u32) / 3),
alpha: 1.0 alpha: 1.0,
}; };
} }
} }
@@ -247,7 +247,7 @@ impl AnimeGif {
frames.push(AnimeFrame { frames.push(AnimeFrame {
data: <AnimeDataBuffer>::try_from(&image)?, data: <AnimeDataBuffer>::try_from(&image)?,
delay: Duration::from_millis(wait as u64) delay: Duration::from_millis(wait as u64),
}); });
} }
Ok(Self(frames, duration)) Ok(Self(frames, duration))
@@ -265,7 +265,7 @@ impl AnimeGif {
translation: Vec2, translation: Vec2,
duration: AnimTime, duration: AnimTime,
brightness: f32, brightness: f32,
anime_type: AnimeType anime_type: AnimeType,
) -> Result<Self> { ) -> Result<Self> {
let image = let image =
AnimeImage::from_png(file_name, scale, angle, translation, brightness, anime_type)?; AnimeImage::from_png(file_name, scale, angle, translation, brightness, anime_type)?;
@@ -282,7 +282,7 @@ impl AnimeGif {
let single = AnimeFrame { let single = AnimeFrame {
data: <AnimeDataBuffer>::try_from(&image)?, data: <AnimeDataBuffer>::try_from(&image)?,
delay: Duration::from_millis(30) delay: Duration::from_millis(30),
}; };
let frames = vec![single; frame_count as usize]; let frames = vec![single; frame_count as usize];

6
rog-anime/src/grid.rs
View File

@@ -18,7 +18,7 @@ const HEIGHT: usize = 55;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct AnimeGrid { pub struct AnimeGrid {
anime_type: AnimeType, anime_type: AnimeType,
data: [[u8; WIDTH]; HEIGHT] data: [[u8; WIDTH]; HEIGHT],
} }
impl AnimeGrid { impl AnimeGrid {
@@ -26,7 +26,7 @@ impl AnimeGrid {
pub fn new(anime_type: AnimeType) -> Self { pub fn new(anime_type: AnimeType) -> Self {
Self { Self {
anime_type, anime_type,
data: [[0u8; WIDTH]; HEIGHT] data: [[0u8; WIDTH]; HEIGHT],
} }
} }
@@ -174,7 +174,7 @@ mod tests {
0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255,
0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0,
0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0,
]; ];
assert_eq!(matrix.data(), &data_cmp); assert_eq!(matrix.data(), &data_cmp);
} }

44
rog-anime/src/image.rs
View File

@@ -13,7 +13,7 @@ use crate::AnimeType;
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
pub struct Pixel { pub struct Pixel {
pub color: u32, pub color: u32,
pub alpha: f32 pub alpha: f32,
} }
impl Default for Pixel { impl Default for Pixel {
@@ -21,7 +21,7 @@ impl Default for Pixel {
fn default() -> Self { fn default() -> Self {
Pixel { Pixel {
color: 0, color: 0,
alpha: 0.0 alpha: 0.0,
} }
} }
} }
@@ -76,7 +76,7 @@ pub struct AnimeImage {
/// The type of the display. The GA401 and GA402 use the same controller and /// The type of the display. The GA401 and GA402 use the same controller and
/// therefore same ID, so the identifier must be by laptop model in /// therefore same ID, so the identifier must be by laptop model in
/// `AnimeType`. /// `AnimeType`.
anime_type: AnimeType anime_type: AnimeType,
} }
impl AnimeImage { impl AnimeImage {
@@ -88,7 +88,7 @@ impl AnimeImage {
bright: f32, bright: f32,
pixels: Vec<Pixel>, pixels: Vec<Pixel>,
width: u32, width: u32,
anime_type: AnimeType anime_type: AnimeType,
) -> Result<Self> { ) -> Result<Self> {
if !(0.0..=1.0).contains(&bright) { if !(0.0..=1.0).contains(&bright) {
return Err(AnimeError::InvalidBrightness(bright)); return Err(AnimeError::InvalidBrightness(bright));
@@ -102,7 +102,7 @@ impl AnimeImage {
led_pos: Self::generate_image_positioning(anime_type), led_pos: Self::generate_image_positioning(anime_type),
img_pixels: pixels, img_pixels: pixels,
width, width,
anime_type anime_type,
}) })
} }
@@ -121,7 +121,7 @@ impl AnimeImage {
match anime_type { match anime_type {
AnimeType::GA401 => 0.8, AnimeType::GA401 => 0.8,
AnimeType::GU604 => 0.78, AnimeType::GU604 => 0.78,
_ => 0.77 _ => 0.77,
} }
} }
@@ -138,7 +138,7 @@ impl AnimeImage {
match anime_type { match anime_type {
AnimeType::GA401 => 0.3, AnimeType::GA401 => 0.3,
AnimeType::GU604 => 0.28, AnimeType::GU604 => 0.28,
_ => 0.283 _ => 0.283,
} }
} }
@@ -237,7 +237,7 @@ impl AnimeImage {
AnimeType::GA401 => (33.0 + 0.5) * Self::scale_x(anime_type), AnimeType::GA401 => (33.0 + 0.5) * Self::scale_x(anime_type),
AnimeType::GU604 => (38.0 + 0.5) * Self::scale_x(anime_type), AnimeType::GU604 => (38.0 + 0.5) * Self::scale_x(anime_type),
_ => (35.0 + 0.5) * Self::scale_x(anime_type) _ => (35.0 + 0.5) * Self::scale_x(anime_type),
} }
} }
@@ -246,7 +246,7 @@ impl AnimeImage {
match anime_type { match anime_type {
AnimeType::GA401 => 55, AnimeType::GA401 => 55,
AnimeType::GU604 => 62, AnimeType::GU604 => 62,
_ => 61 _ => 61,
} }
} }
@@ -257,7 +257,7 @@ impl AnimeImage {
AnimeType::GA401 => (54.0 + 1.0) * Self::scale_y(anime_type), AnimeType::GA401 => (54.0 + 1.0) * Self::scale_y(anime_type),
AnimeType::GU604 => 62.0 * Self::scale_y(anime_type), AnimeType::GU604 => 62.0 * Self::scale_y(anime_type),
// GA402 may not have dead pixels and require only the physical LED count // GA402 may not have dead pixels and require only the physical LED count
_ => 61.0 * Self::scale_y(anime_type) _ => 61.0 * Self::scale_y(anime_type),
} }
} }
@@ -267,11 +267,11 @@ impl AnimeImage {
AnimeType::GA401 => match y { AnimeType::GA401 => match y {
0 | 2 | 4 => 33, 0 | 2 | 4 => 33,
1 | 3 => 35, // Some rows are padded 1 | 3 => 35, // Some rows are padded
_ => 36 - y / 2 _ => 36 - y / 2,
}, },
AnimeType::GU604 => AnimeImage::width(anime_type, y), AnimeType::GU604 => AnimeImage::width(anime_type, y),
// GA402 does not have padding, equivalent to width // GA402 does not have padding, equivalent to width
_ => AnimeImage::width(anime_type, y) _ => AnimeImage::width(anime_type, y),
} }
} }
@@ -322,7 +322,7 @@ impl AnimeImage {
let x0 = led_from_px.mul_vec3(pos + Vec3::new(0.0, -0.5, 0.0)); let x0 = led_from_px.mul_vec3(pos + Vec3::new(0.0, -0.5, 0.0));
const GROUP: [f32; 4] = [ const GROUP: [f32; 4] = [
0.0, 0.5, 1.0, 1.5 0.0, 0.5, 1.0, 1.5,
]; ];
for u in &GROUP { for u in &GROUP {
for v in &GROUP { for v in &GROUP {
@@ -399,7 +399,7 @@ impl AnimeImage {
let led_from_cm = Mat3::from_scale(Vec2::new( let led_from_cm = Mat3::from_scale(Vec2::new(
1.0 / AnimeImage::scale_x(self.anime_type), 1.0 / AnimeImage::scale_x(self.anime_type),
1.0 / AnimeImage::scale_y(self.anime_type) 1.0 / AnimeImage::scale_y(self.anime_type),
)); ));
let transform = let transform =
@@ -422,7 +422,7 @@ impl AnimeImage {
angle: f32, angle: f32,
translation: Vec2, translation: Vec2,
bright: f32, bright: f32,
anime_type: AnimeType anime_type: AnimeType,
) -> Result<Self> { ) -> Result<Self> {
let data = std::fs::read(path).map_err(|e| { let data = std::fs::read(path).map_err(|e| {
error!("Could not open {path:?}: {e:?}"); error!("Could not open {path:?}: {e:?}");
@@ -466,7 +466,7 @@ impl AnimeImage {
width = ras.width(); width = ras.width();
Self::pixels_from_16bit(ras, false) Self::pixels_from_16bit(ras, false)
} }
png_pong::PngRaster::Palette(..) => return Err(AnimeError::Format) png_pong::PngRaster::Palette(..) => return Err(AnimeError::Format),
}; };
let mut matrix = AnimeImage::new( let mut matrix = AnimeImage::new(
@@ -476,7 +476,7 @@ impl AnimeImage {
bright, bright,
pixels, pixels,
width, width,
anime_type anime_type,
)?; )?;
matrix.update(); matrix.update();
@@ -485,7 +485,7 @@ impl AnimeImage {
fn pixels_from_8bit<P>(ras: &pix::Raster<P>, grey: bool) -> Vec<Pixel> fn pixels_from_8bit<P>(ras: &pix::Raster<P>, grey: bool) -> Vec<Pixel>
where where
P: pix::el::Pixel<Chan = pix::chan::Ch8> P: pix::el::Pixel<Chan = pix::chan::Ch8>,
{ {
ras.pixels() ras.pixels()
.iter() .iter()
@@ -497,14 +497,14 @@ impl AnimeImage {
+ (<u8>::from(px.two()) / 3) as u32 + (<u8>::from(px.two()) / 3) as u32
+ (<u8>::from(px.three()) / 3) as u32 + (<u8>::from(px.three()) / 3) as u32
}, },
alpha: <f32>::from(px.alpha()) alpha: <f32>::from(px.alpha()),
}) })
.collect() .collect()
} }
fn pixels_from_16bit<P>(ras: &pix::Raster<P>, grey: bool) -> Vec<Pixel> fn pixels_from_16bit<P>(ras: &pix::Raster<P>, grey: bool) -> Vec<Pixel>
where where
P: pix::el::Pixel<Chan = pix::chan::Ch16> P: pix::el::Pixel<Chan = pix::chan::Ch16>,
{ {
ras.pixels() ras.pixels()
.iter() .iter()
@@ -516,7 +516,7 @@ impl AnimeImage {
+ ((<u16>::from(px.two()) / 3) >> 8) as u32 + ((<u16>::from(px.two()) / 3) >> 8) as u32
+ ((<u16>::from(px.three()) / 3) >> 8) as u32 + ((<u16>::from(px.three()) / 3) >> 8) as u32
}, },
alpha: <f32>::from(px.alpha()) alpha: <f32>::from(px.alpha()),
}) })
.collect() .collect()
} }
@@ -653,7 +653,7 @@ mod tests {
Vec2::default(), Vec2::default(),
AnimTime::Infinite, AnimTime::Infinite,
1.0, 1.0,
AnimeType::GA402 AnimeType::GA402,
) )
.unwrap(); .unwrap();
matrix.frames()[0].frame(); matrix.frames()[0].frame();

42
rog-anime/src/sequencer.rs
View File

@@ -16,13 +16,13 @@ pub enum ActionLoader {
AsusAnimation { AsusAnimation {
file: PathBuf, file: PathBuf,
time: AnimTime, time: AnimTime,
brightness: f32 brightness: f32,
}, },
/// Image designed to be pixel perfect using the slanted template /// Image designed to be pixel perfect using the slanted template
AsusImage { AsusImage {
file: PathBuf, file: PathBuf,
time: AnimTime, time: AnimTime,
brightness: f32 brightness: f32,
}, },
/// Animated gif. If the file is a png a static gif is created using the /// Animated gif. If the file is a png a static gif is created using the
/// `time` properties /// `time` properties
@@ -32,7 +32,7 @@ pub enum ActionLoader {
angle: f32, angle: f32,
translation: Vec2, translation: Vec2,
time: AnimTime, time: AnimTime,
brightness: f32 brightness: f32,
}, },
Image { Image {
file: PathBuf, file: PathBuf,
@@ -40,10 +40,10 @@ pub enum ActionLoader {
angle: f32, angle: f32,
translation: Vec2, translation: Vec2,
time: AnimTime, time: AnimTime,
brightness: f32 brightness: f32,
}, },
/// A pause to be used between sequences /// A pause to be used between sequences
Pause(Duration) Pause(Duration),
} }
/// All the possible `AniMe` actions that can be used. The enum is intended to /// All the possible `AniMe` actions that can be used. The enum is intended to
@@ -64,7 +64,7 @@ pub enum ActionData {
/// Placeholder /// Placeholder
TimeDate, TimeDate,
/// Placeholder /// Placeholder
Matrix Matrix,
} }
impl ActionData { impl ActionData {
@@ -73,14 +73,14 @@ impl ActionData {
ActionLoader::AsusAnimation { ActionLoader::AsusAnimation {
file, file,
time, time,
brightness brightness,
} => ActionData::Animation(AnimeGif::from_diagonal_gif( } => ActionData::Animation(AnimeGif::from_diagonal_gif(
file, *time, *brightness, anime_type file, *time, *brightness, anime_type,
)?), )?),
ActionLoader::AsusImage { ActionLoader::AsusImage {
file, file,
time, time,
brightness brightness,
} => match time { } => match time {
AnimTime::Infinite => { AnimTime::Infinite => {
let image = AnimeDiagonal::from_png(file, None, *brightness, anime_type)?; let image = AnimeDiagonal::from_png(file, None, *brightness, anime_type)?;
@@ -88,8 +88,8 @@ impl ActionData {
ActionData::Image(Box::new(data)) ActionData::Image(Box::new(data))
} }
_ => ActionData::Animation(AnimeGif::from_diagonal_png( _ => ActionData::Animation(AnimeGif::from_diagonal_png(
file, anime_type, *time, *brightness file, anime_type, *time, *brightness,
)?) )?),
}, },
ActionLoader::ImageAnimation { ActionLoader::ImageAnimation {
file, file,
@@ -97,17 +97,17 @@ impl ActionData {
angle, angle,
translation, translation,
time, time,
brightness brightness,
} => { } => {
if let Some(ext) = file.extension() { if let Some(ext) = file.extension() {
if ext.to_string_lossy().to_lowercase() == "png" { if ext.to_string_lossy().to_lowercase() == "png" {
return Ok(ActionData::Animation(AnimeGif::from_png( return Ok(ActionData::Animation(AnimeGif::from_png(
file, *scale, *angle, *translation, *time, *brightness, anime_type file, *scale, *angle, *translation, *time, *brightness, anime_type,
)?)); )?));
} }
} }
ActionData::Animation(AnimeGif::from_gif( ActionData::Animation(AnimeGif::from_gif(
file, *scale, *angle, *translation, *time, *brightness, anime_type file, *scale, *angle, *translation, *time, *brightness, anime_type,
)?) )?)
} }
ActionLoader::Image { ActionLoader::Image {
@@ -116,23 +116,23 @@ impl ActionData {
angle, angle,
translation, translation,
brightness, brightness,
time time,
} => { } => {
match time { match time {
AnimTime::Infinite => { AnimTime::Infinite => {
// If no time then create a plain static image // If no time then create a plain static image
let image = AnimeImage::from_png( let image = AnimeImage::from_png(
file, *scale, *angle, *translation, *brightness, anime_type file, *scale, *angle, *translation, *brightness, anime_type,
)?; )?;
let data = <AnimeDataBuffer>::try_from(&image)?; let data = <AnimeDataBuffer>::try_from(&image)?;
ActionData::Image(Box::new(data)) ActionData::Image(Box::new(data))
} }
_ => ActionData::Animation(AnimeGif::from_png( _ => ActionData::Animation(AnimeGif::from_png(
file, *scale, *angle, *translation, *time, *brightness, anime_type file, *scale, *angle, *translation, *time, *brightness, anime_type,
)?) )?),
} }
} }
ActionLoader::Pause(duration) => ActionData::Pause(*duration) ActionLoader::Pause(duration) => ActionData::Pause(*duration),
}; };
Ok(a) Ok(a)
} }
@@ -171,7 +171,7 @@ impl Sequences {
pub fn iter(&self) -> ActionIterator<'_> { pub fn iter(&self) -> ActionIterator<'_> {
ActionIterator { ActionIterator {
actions: self, actions: self,
next_idx: 0 next_idx: 0,
} }
} }
} }
@@ -179,7 +179,7 @@ impl Sequences {
/// Iteractor helper for iterating over all the actions in `Sequences` /// Iteractor helper for iterating over all the actions in `Sequences`
pub struct ActionIterator<'a> { pub struct ActionIterator<'a> {
actions: &'a Sequences, actions: &'a Sequences,
next_idx: usize next_idx: usize,
} }
impl<'a> Iterator for ActionIterator<'a> { impl<'a> Iterator for ActionIterator<'a> {

32
rog-anime/src/usb.rs
View File

@@ -35,7 +35,7 @@ pub enum Brightness {
Low = 1, Low = 1,
#[default] #[default]
Med = 2, Med = 2,
High = 3 High = 3,
} }
impl FromStr for Brightness { impl FromStr for Brightness {
@@ -47,7 +47,7 @@ impl FromStr for Brightness {
"Low" | "low" => Brightness::Low, "Low" | "low" => Brightness::Low,
"Med" | "med" => Brightness::Med, "Med" | "med" => Brightness::Med,
"High" | "high" => Brightness::High, "High" | "high" => Brightness::High,
_ => Brightness::Med _ => Brightness::Med,
}) })
} }
} }
@@ -58,7 +58,7 @@ impl From<u8> for Brightness {
0 => Brightness::Off, 0 => Brightness::Off,
1 => Brightness::Low, 1 => Brightness::Low,
3 => Brightness::High, 3 => Brightness::High,
_ => Brightness::Med _ => Brightness::Med,
} }
} }
} }
@@ -84,7 +84,7 @@ impl From<Brightness> for i32 {
pub enum AnimBooting { pub enum AnimBooting {
#[default] #[default]
GlitchConstruction = 0, GlitchConstruction = 0,
StaticEmergence = 1 StaticEmergence = 1,
} }
impl FromStr for AnimBooting { impl FromStr for AnimBooting {
@@ -94,7 +94,7 @@ impl FromStr for AnimBooting {
match s { match s {
"GlitchConstruction" => Ok(Self::GlitchConstruction), "GlitchConstruction" => Ok(Self::GlitchConstruction),
"StaticEmergence" => Ok(Self::StaticEmergence), "StaticEmergence" => Ok(Self::StaticEmergence),
_ => Err(AnimeError::ParseError(s.to_owned())) _ => Err(AnimeError::ParseError(s.to_owned())),
} }
} }
} }
@@ -104,7 +104,7 @@ impl From<i32> for AnimBooting {
match value { match value {
0 => Self::GlitchConstruction, 0 => Self::GlitchConstruction,
1 => Self::StaticEmergence, 1 => Self::StaticEmergence,
_ => Self::default() _ => Self::default(),
} }
} }
} }
@@ -124,7 +124,7 @@ impl From<AnimBooting> for i32 {
pub enum AnimAwake { pub enum AnimAwake {
#[default] #[default]
BinaryBannerScroll = 0, BinaryBannerScroll = 0,
RogLogoGlitch = 1 RogLogoGlitch = 1,
} }
impl FromStr for AnimAwake { impl FromStr for AnimAwake {
@@ -134,7 +134,7 @@ impl FromStr for AnimAwake {
match s { match s {
"BinaryBannerScroll" => Ok(Self::BinaryBannerScroll), "BinaryBannerScroll" => Ok(Self::BinaryBannerScroll),
"RogLogoGlitch" => Ok(Self::RogLogoGlitch), "RogLogoGlitch" => Ok(Self::RogLogoGlitch),
_ => Err(AnimeError::ParseError(s.to_owned())) _ => Err(AnimeError::ParseError(s.to_owned())),
} }
} }
} }
@@ -144,7 +144,7 @@ impl From<i32> for AnimAwake {
match value { match value {
0 => Self::BinaryBannerScroll, 0 => Self::BinaryBannerScroll,
1 => Self::RogLogoGlitch, 1 => Self::RogLogoGlitch,
_ => Self::default() _ => Self::default(),
} }
} }
} }
@@ -164,7 +164,7 @@ impl From<AnimAwake> for i32 {
pub enum AnimSleeping { pub enum AnimSleeping {
#[default] #[default]
BannerSwipe = 0, BannerSwipe = 0,
Starfield = 1 Starfield = 1,
} }
impl FromStr for AnimSleeping { impl FromStr for AnimSleeping {
@@ -174,7 +174,7 @@ impl FromStr for AnimSleeping {
match s { match s {
"BannerSwipe" => Ok(Self::BannerSwipe), "BannerSwipe" => Ok(Self::BannerSwipe),
"Starfield" => Ok(Self::Starfield), "Starfield" => Ok(Self::Starfield),
_ => Err(AnimeError::ParseError(s.to_owned())) _ => Err(AnimeError::ParseError(s.to_owned())),
} }
} }
} }
@@ -184,7 +184,7 @@ impl From<i32> for AnimSleeping {
match value { match value {
0 => Self::BannerSwipe, 0 => Self::BannerSwipe,
1 => Self::Starfield, 1 => Self::Starfield,
_ => Self::default() _ => Self::default(),
} }
} }
} }
@@ -204,7 +204,7 @@ impl From<AnimSleeping> for i32 {
pub enum AnimShutdown { pub enum AnimShutdown {
#[default] #[default]
GlitchOut = 0, GlitchOut = 0,
SeeYa = 1 SeeYa = 1,
} }
impl FromStr for AnimShutdown { impl FromStr for AnimShutdown {
@@ -214,7 +214,7 @@ impl FromStr for AnimShutdown {
match s { match s {
"GlitchOut" => Ok(Self::GlitchOut), "GlitchOut" => Ok(Self::GlitchOut),
"SeeYa" => Ok(Self::SeeYa), "SeeYa" => Ok(Self::SeeYa),
_ => Err(AnimeError::ParseError(s.to_owned())) _ => Err(AnimeError::ParseError(s.to_owned())),
} }
} }
} }
@@ -224,7 +224,7 @@ impl From<i32> for AnimShutdown {
match value { match value {
0 => Self::GlitchOut, 0 => Self::GlitchOut,
1 => Self::SeeYa, 1 => Self::SeeYa,
_ => Self::default() _ => Self::default(),
} }
} }
} }
@@ -326,7 +326,7 @@ pub const fn pkt_set_builtin_animations(
boot: AnimBooting, boot: AnimBooting,
awake: AnimAwake, awake: AnimAwake,
sleep: AnimSleeping, sleep: AnimSleeping,
shutdown: AnimShutdown shutdown: AnimShutdown,
) -> [u8; PACKET_SIZE] { ) -> [u8; PACKET_SIZE] {
let mut pkt = [0; PACKET_SIZE]; let mut pkt = [0; PACKET_SIZE];
pkt[0] = DEV_PAGE; pkt[0] = DEV_PAGE;

10
rog-anime/tests/ga401.rs
View File

@@ -52,7 +52,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt1_check = [ let pkt1_check = [
0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -100,7 +100,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let mut matrix = AnimeImage::new( let mut matrix = AnimeImage::new(
@@ -110,7 +110,7 @@ mod tests {
0.0, 0.0,
vec![Pixel::default(); 1000], vec![Pixel::default(); 1000],
100, 100,
AnimeType::GA401 AnimeType::GA401,
) )
.unwrap(); .unwrap();
matrix.edge_outline(); matrix.edge_outline();
@@ -175,7 +175,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt1_check = [ let pkt1_check = [
0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -223,7 +223,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));

20
rog-anime/tests/ga402q.rs
View File

@@ -52,7 +52,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt1_check = [ let pkt1_check = [
0x5e, 0xc0, 0x2, 0x74, 0x2, 0x73, 0x2, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x2, 0x74, 0x2, 0x73, 0x2, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
@@ -100,7 +100,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt2_check = [ let pkt2_check = [
0x5e, 0xc0, 0x2, 0xe7, 0x4, 0x73, 0x2, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x2, 0xe7, 0x4, 0x73, 0x2, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
@@ -148,7 +148,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let mut matrix = AnimeImage::new( let mut matrix = AnimeImage::new(
@@ -158,7 +158,7 @@ mod tests {
0.0, 0.0,
vec![Pixel::default(); 1000], vec![Pixel::default(); 1000],
100, 100,
AnimeType::GA402 AnimeType::GA402,
) )
.unwrap(); .unwrap();
matrix.edge_outline(); matrix.edge_outline();
@@ -218,7 +218,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt1_check = [ let pkt1_check = [
0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
@@ -266,7 +266,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt2_check = [ let pkt2_check = [
0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
@@ -314,7 +314,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -378,7 +378,7 @@ mod tests {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt1_check = [ let pkt1_check = [
0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -426,7 +426,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt2_check = [ let pkt2_check = [
0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
@@ -474,7 +474,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));

14
rog-anime/tests/gu604.rs
View File

@@ -52,7 +52,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt1_check = [ let pkt1_check = [
0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -100,7 +100,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt2_check = [ let pkt2_check = [
0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -148,7 +148,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let mut matrix = AnimeImage::new( let mut matrix = AnimeImage::new(
@@ -158,7 +158,7 @@ mod tests {
0.0, 0.0,
vec![Pixel::default(); 1000], vec![Pixel::default(); 1000],
100, 100,
AnimeType::GU604 AnimeType::GU604,
) )
.unwrap(); .unwrap();
matrix.edge_outline(); matrix.edge_outline();
@@ -218,7 +218,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt1_check = [ let pkt1_check = [
0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -266,7 +266,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let pkt2_check = [ let pkt2_check = [
0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0xc0, 0x02, 0xe7, 0x04, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -314,7 +314,7 @@ mod tests {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));

6
rog-aura/src/aura_detection.rs
View File

@@ -54,7 +54,7 @@ pub struct LedSupportData {
#[serde(default)] #[serde(default)]
pub advanced_type: AdvancedAuraType, pub advanced_type: AdvancedAuraType,
/// If empty will default to `Keyboard` power zone /// If empty will default to `Keyboard` power zone
pub power_zones: Vec<PowerZones> pub power_zones: Vec<PowerZones>,
} }
impl LedSupportData { impl LedSupportData {
@@ -116,7 +116,7 @@ impl LedSupportFile {
basic_modes: vec![AuraModeNum::Static], basic_modes: vec![AuraModeNum::Static],
basic_zones: vec![], basic_zones: vec![],
advanced_type: AdvancedAuraType::None, advanced_type: AdvancedAuraType::None,
power_zones: vec![PowerZones::Keyboard] power_zones: vec![PowerZones::Keyboard],
} }
} }
@@ -200,7 +200,7 @@ mod tests {
power_zones: vec![ power_zones: vec![
PowerZones::Keyboard, PowerZones::Keyboard,
PowerZones::RearGlow, PowerZones::RearGlow,
] ],
}; };
assert!(ron::to_string(&led).is_ok()); assert!(ron::to_string(&led).is_ok());

94
rog-aura/src/builtin_modes.rs
View File

@@ -19,7 +19,7 @@ pub enum LedBrightness {
Low = 1, Low = 1,
#[default] #[default]
Med = 2, Med = 2,
High = 3 High = 3,
} }
impl LedBrightness { impl LedBrightness {
@@ -28,7 +28,7 @@ impl LedBrightness {
Self::Off => Self::Low, Self::Off => Self::Low,
Self::Low => Self::Med, Self::Low => Self::Med,
Self::Med => Self::High, Self::Med => Self::High,
Self::High => Self::Off Self::High => Self::Off,
} }
} }
@@ -37,7 +37,7 @@ impl LedBrightness {
Self::Off => Self::High, Self::Off => Self::High,
Self::Low => Self::Off, Self::Low => Self::Off,
Self::Med => Self::Low, Self::Med => Self::Low,
Self::High => Self::Med Self::High => Self::Med,
} }
} }
} }
@@ -48,7 +48,7 @@ impl From<u8> for LedBrightness {
0 => LedBrightness::Off, 0 => LedBrightness::Off,
1 => LedBrightness::Low, 1 => LedBrightness::Low,
3 => LedBrightness::High, 3 => LedBrightness::High,
_ => LedBrightness::Med _ => LedBrightness::Med,
} }
} }
} }
@@ -72,7 +72,7 @@ impl From<i32> for LedBrightness {
1 => LedBrightness::Low, 1 => LedBrightness::Low,
2 => LedBrightness::Med, 2 => LedBrightness::Med,
3 => LedBrightness::High, 3 => LedBrightness::High,
_ => LedBrightness::Med _ => LedBrightness::Med,
} }
} }
} }
@@ -82,7 +82,7 @@ impl From<i32> for LedBrightness {
pub struct Colour { pub struct Colour {
pub r: u8, pub r: u8,
pub g: u8, pub g: u8,
pub b: u8 pub b: u8,
} }
impl Default for Colour { impl Default for Colour {
@@ -110,7 +110,7 @@ impl From<&[f32; 3]> for Colour {
Self { Self {
r: (255.0 * c[0]) as u8, r: (255.0 * c[0]) as u8,
g: (255.0 * c[1]) as u8, g: (255.0 * c[1]) as u8,
b: (255.0 * c[2]) as u8 b: (255.0 * c[2]) as u8,
} }
} }
} }
@@ -120,7 +120,7 @@ impl From<Colour> for [f32; 3] {
[ [
c.r as f32 / 255.0, c.r as f32 / 255.0,
c.g as f32 / 255.0, c.g as f32 / 255.0,
c.b as f32 / 255.0 c.b as f32 / 255.0,
] ]
} }
} }
@@ -130,7 +130,7 @@ impl From<&[u8; 3]> for Colour {
Self { Self {
r: c[0], r: c[0],
g: c[1], g: c[1],
b: c[2] b: c[2],
} }
} }
} }
@@ -138,7 +138,7 @@ impl From<&[u8; 3]> for Colour {
impl From<Colour> for [u8; 3] { impl From<Colour> for [u8; 3] {
fn from(c: Colour) -> Self { fn from(c: Colour) -> Self {
[ [
c.r, c.g, c.b c.r, c.g, c.b,
] ]
} }
} }
@@ -153,7 +153,7 @@ pub enum Speed {
Low = 0xe1, Low = 0xe1,
#[default] #[default]
Med = 0xeb, Med = 0xeb,
High = 0xf5 High = 0xf5,
} }
impl FromStr for Speed { impl FromStr for Speed {
@@ -165,7 +165,7 @@ impl FromStr for Speed {
"low" => Ok(Speed::Low), "low" => Ok(Speed::Low),
"med" => Ok(Speed::Med), "med" => Ok(Speed::Med),
"high" => Ok(Speed::High), "high" => Ok(Speed::High),
_ => Err(Error::ParseSpeed) _ => Err(Error::ParseSpeed),
} }
} }
} }
@@ -175,7 +175,7 @@ impl From<i32> for Speed {
match value { match value {
0 => Self::Low, 0 => Self::Low,
2 => Self::High, 2 => Self::High,
_ => Self::Med _ => Self::Med,
} }
} }
} }
@@ -185,7 +185,7 @@ impl From<Speed> for i32 {
match value { match value {
Speed::Low => 0, Speed::Low => 0,
Speed::Med => 1, Speed::Med => 1,
Speed::High => 2 Speed::High => 2,
} }
} }
} }
@@ -195,7 +195,7 @@ impl From<Speed> for u8 {
match s { match s {
Speed::Low => 0, Speed::Low => 0,
Speed::Med => 1, Speed::Med => 1,
Speed::High => 2 Speed::High => 2,
} }
} }
} }
@@ -213,7 +213,7 @@ pub enum Direction {
Right = 0, Right = 0,
Left = 1, Left = 1,
Up = 2, Up = 2,
Down = 3 Down = 3,
} }
impl FromStr for Direction { impl FromStr for Direction {
@@ -226,7 +226,7 @@ impl FromStr for Direction {
"up" => Ok(Direction::Up), "up" => Ok(Direction::Up),
"down" => Ok(Direction::Down), "down" => Ok(Direction::Down),
"left" => Ok(Direction::Left), "left" => Ok(Direction::Left),
_ => Err(Error::ParseDirection) _ => Err(Error::ParseDirection),
} }
} }
} }
@@ -237,7 +237,7 @@ impl From<i32> for Direction {
1 => Self::Left, 1 => Self::Left,
2 => Self::Up, 2 => Self::Up,
3 => Self::Down, 3 => Self::Down,
_ => Self::Right _ => Self::Right,
} }
} }
} }
@@ -270,7 +270,7 @@ pub enum AuraModeNum {
Ripple = 8, Ripple = 8,
Pulse = 10, Pulse = 10,
Comet = 11, Comet = 11,
Flash = 12 Flash = 12,
} }
impl Display for AuraModeNum { impl Display for AuraModeNum {
@@ -299,7 +299,7 @@ impl From<&AuraModeNum> for &str {
AuraModeNum::Ripple => "Ripple", AuraModeNum::Ripple => "Ripple",
AuraModeNum::Pulse => "Pulse", AuraModeNum::Pulse => "Pulse",
AuraModeNum::Comet => "Comet", AuraModeNum::Comet => "Comet",
AuraModeNum::Flash => "Flash" AuraModeNum::Flash => "Flash",
} }
} }
} }
@@ -317,7 +317,7 @@ impl From<&str> for AuraModeNum {
"Pulse" => AuraModeNum::Pulse, "Pulse" => AuraModeNum::Pulse,
"Comet" => AuraModeNum::Comet, "Comet" => AuraModeNum::Comet,
"Flash" => AuraModeNum::Flash, "Flash" => AuraModeNum::Flash,
_ => AuraModeNum::Static _ => AuraModeNum::Static,
} }
} }
} }
@@ -336,7 +336,7 @@ impl From<u8> for AuraModeNum {
10 => AuraModeNum::Pulse, 10 => AuraModeNum::Pulse,
11 => AuraModeNum::Comet, 11 => AuraModeNum::Comet,
12 => AuraModeNum::Flash, 12 => AuraModeNum::Flash,
_ => AuraModeNum::Static _ => AuraModeNum::Static,
} }
} }
} }
@@ -383,7 +383,7 @@ pub enum AuraZone {
/// The left part of a lightbar (typically on the front of laptop) /// The left part of a lightbar (typically on the front of laptop)
BarLeft = 6, BarLeft = 6,
/// The right part of a lightbar /// The right part of a lightbar
BarRight = 7 BarRight = 7,
} }
impl FromStr for AuraZone { impl FromStr for AuraZone {
@@ -400,7 +400,7 @@ impl FromStr for AuraZone {
"5" | "logo" => Ok(AuraZone::Logo), "5" | "logo" => Ok(AuraZone::Logo),
"6" | "lightbar-left" => Ok(AuraZone::BarLeft), "6" | "lightbar-left" => Ok(AuraZone::BarLeft),
"7" | "lightbar-right" => Ok(AuraZone::BarRight), "7" | "lightbar-right" => Ok(AuraZone::BarRight),
_ => Err(Error::ParseSpeed) _ => Err(Error::ParseSpeed),
} }
} }
} }
@@ -415,7 +415,7 @@ impl From<i32> for AuraZone {
5 => Self::Logo, 5 => Self::Logo,
6 => Self::BarLeft, 6 => Self::BarLeft,
7 => Self::BarRight, 7 => Self::BarRight,
_ => Self::default() _ => Self::default(),
} }
} }
} }
@@ -445,7 +445,7 @@ pub struct AuraEffect {
/// One of three speeds for modes that support speed (most that animate) /// One of three speeds for modes that support speed (most that animate)
pub speed: Speed, pub speed: Speed,
/// Up, down, left, right. Only Rainbow mode seems to use this /// Up, down, left, right. Only Rainbow mode seems to use this
pub direction: Direction pub direction: Direction,
} }
impl AuraEffect { impl AuraEffect {
@@ -481,7 +481,7 @@ impl Default for AuraEffect {
colour1: Colour { r: 166, g: 0, b: 0 }, colour1: Colour { r: 166, g: 0, b: 0 },
colour2: Colour { r: 0, g: 0, b: 0 }, colour2: Colour { r: 0, g: 0, b: 0 },
speed: Speed::Med, speed: Speed::Med,
direction: Direction::Right direction: Direction::Right,
} }
} }
} }
@@ -541,7 +541,7 @@ impl From<&AuraEffect> for Vec<u8> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::{ use crate::{
AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed, AURA_LAPTOP_LED_MSG_LEN AuraEffect, AuraModeNum, AuraZone, Colour, Direction, Speed, AURA_LAPTOP_LED_MSG_LEN,
}; };
#[test] #[test]
@@ -552,18 +552,18 @@ mod tests {
colour1: Colour { colour1: Colour {
r: 0xff, r: 0xff,
g: 0x11, g: 0x11,
b: 0xdd b: 0xdd,
}, },
colour2: Colour::default(), colour2: Colour::default(),
speed: Speed::Med, speed: Speed::Med,
direction: Direction::Right direction: Direction::Right,
}; };
let ar = <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st); let ar = <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st);
println!("{:02x?}", ar); println!("{:02x?}", ar);
let check = [ let check = [
0x5d, 0xb3, 0x0, 0x0, 0xff, 0x11, 0xdd, 0xeb, 0x0, 0x0, 0xa6, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x0, 0x0, 0xff, 0x11, 0xdd, 0xeb, 0x0, 0x0, 0xa6, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0 0x0,
]; ];
assert_eq!(ar, check); assert_eq!(ar, check);
} }
@@ -576,15 +576,15 @@ mod tests {
colour1: Colour { colour1: Colour {
r: 0xff, r: 0xff,
g: 0, g: 0,
b: 0 b: 0,
}, },
colour2: Colour { r: 0, g: 0, b: 0 }, colour2: Colour { r: 0, g: 0, b: 0 },
speed: Speed::Low, speed: Speed::Low,
direction: Direction::Left direction: Direction::Left,
}; };
let capture = [ let capture = [
0x5d, 0xb3, 0x01, 0x00, 0xff, 0x00, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x01, 0x00, 0xff, 0x00, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0 0x0, 0x0,
]; ];
assert_eq!( assert_eq!(
<[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9], <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
@@ -595,11 +595,11 @@ mod tests {
st.colour1 = Colour { st.colour1 = Colour {
r: 0xff, r: 0xff,
g: 0xff, g: 0xff,
b: 0 b: 0,
}; };
let capture = [ let capture = [
0x5d, 0xb3, 0x02, 0x00, 0xff, 0xff, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x02, 0x00, 0xff, 0xff, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0 0x0, 0x0,
]; ];
assert_eq!( assert_eq!(
<[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9], <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
@@ -610,11 +610,11 @@ mod tests {
st.colour1 = Colour { st.colour1 = Colour {
r: 0, r: 0,
g: 0xff, g: 0xff,
b: 0xff b: 0xff,
}; };
let capture = [ let capture = [
0x5d, 0xb3, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0 0x0, 0x0,
]; ];
assert_eq!( assert_eq!(
<[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9], <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
@@ -625,11 +625,11 @@ mod tests {
st.colour1 = Colour { st.colour1 = Colour {
r: 0xff, r: 0xff,
g: 0x00, g: 0x00,
b: 0xff b: 0xff,
}; };
let capture = [ let capture = [
0x5d, 0xb3, 0x04, 0x00, 0xff, 0x00, 0xff, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x04, 0x00, 0xff, 0x00, 0xff, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0 0x0, 0x0,
]; ];
assert_eq!( assert_eq!(
<[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9], <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
@@ -640,11 +640,11 @@ mod tests {
st.colour1 = Colour { st.colour1 = Colour {
r: 0x2c, r: 0x2c,
g: 0xff, g: 0xff,
b: 0x00 b: 0x00,
}; };
let capture = [ let capture = [
0x5d, 0xb3, 0x05, 0x00, 0x2c, 0xff, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x05, 0x00, 0x2c, 0xff, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0 0x0, 0x0,
]; ];
assert_eq!( assert_eq!(
<[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9], <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
@@ -655,11 +655,11 @@ mod tests {
st.colour1 = Colour { st.colour1 = Colour {
r: 0xff, r: 0xff,
g: 0x00, g: 0x00,
b: 0x00 b: 0x00,
}; };
let capture = [ let capture = [
0x5d, 0xb3, 0x06, 0x00, 0xff, 0x00, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x06, 0x00, 0xff, 0x00, 0x00, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0 0x0, 0x0,
]; ];
assert_eq!( assert_eq!(
<[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9], <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
@@ -670,11 +670,11 @@ mod tests {
st.colour1 = Colour { st.colour1 = Colour {
r: 0xff, r: 0xff,
g: 0x00, g: 0x00,
b: 0xcd b: 0xcd,
}; };
let capture = [ let capture = [
0x5d, 0xb3, 0x07, 0x00, 0xff, 0x00, 0xcd, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x07, 0x00, 0xff, 0x00, 0xcd, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0 0x0, 0x0,
]; ];
assert_eq!( assert_eq!(
<[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9], <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],
@@ -684,7 +684,7 @@ mod tests {
st.mode = AuraModeNum::RainbowWave; st.mode = AuraModeNum::RainbowWave;
let capture = [ let capture = [
0x5d, 0xb3, 0x07, 0x03, 0xff, 0x00, 0xcd, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5d, 0xb3, 0x07, 0x03, 0xff, 0x00, 0xcd, 0xe1, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0 0x0, 0x0,
]; ];
assert_eq!( assert_eq!(
<[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9], <[u8; AURA_LAPTOP_LED_MSG_LEN]>::from(&st)[..9],

2
rog-aura/src/effects/base.rs
View File

@@ -11,7 +11,7 @@ pub struct InputBased {
/// - temperature /// - temperature
/// - fan speed /// - fan speed
/// - time /// - time
input: Box<dyn InputForEffect> input: Box<dyn InputForEffect>,
} }
impl EffectState for InputBased { impl EffectState for InputBased {

4
rog-aura/src/effects/breathe.rs
View File

@@ -19,7 +19,7 @@ pub struct Breathe {
#[serde(skip)] #[serde(skip)]
count_flipped: bool, count_flipped: bool,
#[serde(skip)] #[serde(skip)]
use_colour1: bool use_colour1: bool,
} }
impl Breathe { impl Breathe {
@@ -31,7 +31,7 @@ impl Breathe {
speed, speed,
colour: colour1, colour: colour1,
count_flipped: false, count_flipped: false,
use_colour1: true use_colour1: true,
} }
} }
} }

16
rog-aura/src/effects/doom.rs
View File

@@ -13,7 +13,7 @@ pub struct DoomFlicker {
#[serde(skip)] #[serde(skip)]
count: u8, count: u8,
#[serde(skip)] #[serde(skip)]
colour: Colour colour: Colour,
} }
impl DoomFlicker { impl DoomFlicker {
@@ -24,7 +24,7 @@ impl DoomFlicker {
count: 4, count: 4,
max_percentage, max_percentage,
min_percentage, min_percentage,
start_colour: colour start_colour: colour,
} }
} }
} }
@@ -53,13 +53,13 @@ impl EffectState for DoomFlicker {
let max_light = Colour { let max_light = Colour {
r: (start_colour.r as f32 / 100.0 * *max_percentage as f32) as u8, r: (start_colour.r as f32 / 100.0 * *max_percentage as f32) as u8,
g: (start_colour.g as f32 / 100.0 * *max_percentage as f32) as u8, g: (start_colour.g as f32 / 100.0 * *max_percentage as f32) as u8,
b: (start_colour.b as f32 / 100.0 * *max_percentage as f32) as u8 b: (start_colour.b as f32 / 100.0 * *max_percentage as f32) as u8,
}; };
// min light is a percentage of the set colour // min light is a percentage of the set colour
let min_light = Colour { let min_light = Colour {
r: (start_colour.r as f32 / 100.0 * *min_percentage as f32) as u8, r: (start_colour.r as f32 / 100.0 * *min_percentage as f32) as u8,
g: (start_colour.g as f32 / 100.0 * *min_percentage as f32) as u8, g: (start_colour.g as f32 / 100.0 * *min_percentage as f32) as u8,
b: (start_colour.b as f32 / 100.0 * *min_percentage as f32) as u8 b: (start_colour.b as f32 / 100.0 * *min_percentage as f32) as u8,
}; };
// Convert the 255 to percentage // Convert the 255 to percentage
@@ -96,7 +96,7 @@ pub struct DoomLightFlash {
#[serde(skip)] #[serde(skip)]
count: u8, count: u8,
#[serde(skip)] #[serde(skip)]
colour: Colour colour: Colour,
} }
impl DoomLightFlash { impl DoomLightFlash {
@@ -109,7 +109,7 @@ impl DoomLightFlash {
min_percentage, min_percentage,
start_colour: colour, start_colour: colour,
max_time: 32, max_time: 32,
min_time: 7 min_time: 7,
} }
} }
} }
@@ -135,13 +135,13 @@ impl EffectState for DoomLightFlash {
let max_light = Colour { let max_light = Colour {
r: (start_colour.r as f32 / 100.0 * *max_percentage as f32) as u8, r: (start_colour.r as f32 / 100.0 * *max_percentage as f32) as u8,
g: (start_colour.g as f32 / 100.0 * *max_percentage as f32) as u8, g: (start_colour.g as f32 / 100.0 * *max_percentage as f32) as u8,
b: (start_colour.b as f32 / 100.0 * *max_percentage as f32) as u8 b: (start_colour.b as f32 / 100.0 * *max_percentage as f32) as u8,
}; };
// min light is a percentage of the set colour // min light is a percentage of the set colour
let min_light = Colour { let min_light = Colour {
r: (start_colour.r as f32 / 100.0 * *min_percentage as f32) as u8, r: (start_colour.r as f32 / 100.0 * *min_percentage as f32) as u8,
g: (start_colour.g as f32 / 100.0 * *min_percentage as f32) as u8, g: (start_colour.g as f32 / 100.0 * *min_percentage as f32) as u8,
b: (start_colour.b as f32 / 100.0 * *min_percentage as f32) as u8 b: (start_colour.b as f32 / 100.0 * *min_percentage as f32) as u8,
}; };
if *colour == max_light { if *colour == max_light {

20
rog-aura/src/effects/mod.rs
View File

@@ -32,7 +32,7 @@ pub const RNDTABLE: [i32; 256] = [
206, 163, 45, 63, 90, 168, 114, 59, 33, 159, 95, 28, 139, 123, 98, 125, 196, 15, 70, 194, 253, 206, 163, 45, 63, 90, 168, 114, 59, 33, 159, 95, 28, 139, 123, 98, 125, 196, 15, 70, 194, 253,
54, 14, 109, 226, 71, 17, 161, 93, 186, 87, 244, 138, 20, 52, 123, 251, 26, 36, 17, 46, 52, 54, 14, 109, 226, 71, 17, 161, 93, 186, 87, 244, 138, 20, 52, 123, 251, 26, 36, 17, 46, 52,
231, 232, 76, 31, 221, 84, 37, 216, 165, 212, 106, 197, 242, 98, 43, 39, 175, 254, 145, 190, 231, 232, 76, 31, 221, 84, 37, 216, 165, 212, 106, 197, 242, 98, 43, 39, 175, 254, 145, 190,
84, 118, 222, 187, 136, 120, 163, 236, 249 84, 118, 222, 187, 136, 120, 163, 236, 249,
]; ];
pub fn p_random() -> i32 { pub fn p_random() -> i32 {
@@ -67,7 +67,7 @@ pub(crate) trait EffectState {
#[derive(Debug, Deserialize, Serialize, Default)] #[derive(Debug, Deserialize, Serialize, Default)]
pub struct AdvancedEffects { pub struct AdvancedEffects {
effects: Vec<Effect>, effects: Vec<Effect>,
zoned: bool zoned: bool,
} }
impl AdvancedEffects { impl AdvancedEffects {
@@ -75,7 +75,7 @@ impl AdvancedEffects {
pub fn new(zoned: bool) -> Self { pub fn new(zoned: bool) -> Self {
Self { Self {
effects: Default::default(), effects: Default::default(),
zoned zoned,
} }
} }
@@ -186,7 +186,7 @@ pub enum Effect {
Static(Static), Static(Static),
Breathe(Breathe), Breathe(Breathe),
DoomFlicker(DoomFlicker), DoomFlicker(DoomFlicker),
DoomLightFlash(DoomLightFlash) DoomLightFlash(DoomLightFlash),
} }
impl Default for Effect { impl Default for Effect {
@@ -211,7 +211,7 @@ mod tests {
.push(Effect::Static(Static::new(LedCode::F, Colour { .push(Effect::Static(Static::new(LedCode::F, Colour {
r: 255, r: 255,
g: 127, g: 127,
b: 0 b: 0,
}))); })));
seq.next_state(&layout); seq.next_state(&layout);
@@ -232,14 +232,14 @@ mod tests {
Colour { Colour {
r: 255, r: 255,
g: 127, g: 127,
b: 0 b: 0,
}, },
Colour { Colour {
r: 127, r: 127,
g: 0, g: 0,
b: 255 b: 255,
}, },
Speed::Med Speed::Med,
))); )));
let s = let s =
@@ -274,10 +274,10 @@ mod tests {
Colour { Colour {
r: 255, r: 255,
g: 127, g: 127,
b: 80 b: 80,
}, },
100, 100,
10 10,
))); )));
seq.next_state(&layout); seq.next_state(&layout);

4
rog-aura/src/effects/static_.rs
View File

@@ -8,14 +8,14 @@ use crate::{effect_state_impl, Colour};
pub struct Static { pub struct Static {
led: LedCode, led: LedCode,
/// The starting colour /// The starting colour
colour: Colour colour: Colour,
} }
impl Static { impl Static {
pub fn new(address: LedCode, colour: Colour) -> Self { pub fn new(address: LedCode, colour: Colour) -> Self {
Self { Self {
led: address, led: address,
colour colour,
} }
} }
} }

4
rog-aura/src/error.rs
View File

@@ -8,7 +8,7 @@ pub enum Error {
ParseBrightness, ParseBrightness,
IoPath(String, std::io::Error), IoPath(String, std::io::Error),
Ron(ron::Error), Ron(ron::Error),
RonParse(ron::error::SpannedError) RonParse(ron::error::SpannedError),
} }
impl fmt::Display for Error { impl fmt::Display for Error {
@@ -21,7 +21,7 @@ impl fmt::Display for Error {
Error::ParseBrightness => write!(f, "Could not parse brightness"), Error::ParseBrightness => write!(f, "Could not parse brightness"),
Error::IoPath(path, io) => write!(f, "IO Error: {path}, {io}"), Error::IoPath(path, io) => write!(f, "IO Error: {path}, {io}"),
Error::Ron(e) => write!(f, "RON Parse Error: {e}"), Error::Ron(e) => write!(f, "RON Parse Error: {e}"),
Error::RonParse(e) => write!(f, "RON Parse Error: {e}") Error::RonParse(e) => write!(f, "RON Parse Error: {e}"),
} }
} }
} }

10
rog-aura/src/keyboard/advanced.rs
View File

@@ -164,7 +164,7 @@ pub enum LedCode {
/// To be ignored by effects /// To be ignored by effects
Spacing, Spacing,
/// To be ignored by effects /// To be ignored by effects
Blocking Blocking,
} }
impl LedCode { impl LedCode {
@@ -210,7 +210,7 @@ pub struct LedUsbPackets {
/// Wether or not this packet collection is zoned. The determines which /// Wether or not this packet collection is zoned. The determines which
/// starting bytes are used and what the indexing is for lightbar RGB /// starting bytes are used and what the indexing is for lightbar RGB
/// colours /// colours
zoned: bool zoned: bool,
} }
impl Default for LedUsbPackets { impl Default for LedUsbPackets {
@@ -244,7 +244,7 @@ impl LedUsbPackets {
} }
Self { Self {
usb_packets: set, usb_packets: set,
zoned: false zoned: false,
} }
} }
@@ -274,7 +274,7 @@ impl LedUsbPackets {
} }
Self { Self {
usb_packets: vec![pkt], usb_packets: vec![pkt],
zoned: true zoned: true,
} }
} }
@@ -633,7 +633,7 @@ impl From<&LedCode> for &str {
LedCode::ZonedKbLeft => "Left Zone (zone 1)", LedCode::ZonedKbLeft => "Left Zone (zone 1)",
LedCode::ZonedKbLeftMid => "Center-left Zone (zone 2)", LedCode::ZonedKbLeftMid => "Center-left Zone (zone 2)",
LedCode::ZonedKbRightMid => "Center-right Zone (zone 3)", LedCode::ZonedKbRightMid => "Center-right Zone (zone 3)",
LedCode::ZonedKbRight => "Right Zone (zone 4)" LedCode::ZonedKbRight => "Right Zone (zone 4)",
} }
} }
} }

28
rog-aura/src/keyboard/layouts.rs
View File

@@ -26,12 +26,12 @@ pub enum KeyShape {
pad_left: f32, pad_left: f32,
pad_right: f32, pad_right: f32,
pad_top: f32, pad_top: f32,
pad_bottom: f32 pad_bottom: f32,
}, },
Blank { Blank {
width: f32, width: f32,
height: f32 height: f32,
} },
} }
impl KeyShape { impl KeyShape {
@@ -41,7 +41,7 @@ impl KeyShape {
pad_left: f32, pad_left: f32,
pad_right: f32, pad_right: f32,
pad_top: f32, pad_top: f32,
pad_bottom: f32 pad_bottom: f32,
) -> Self { ) -> Self {
Self::Led { Self::Led {
width, width,
@@ -49,7 +49,7 @@ impl KeyShape {
pad_left, pad_left,
pad_right, pad_right,
pad_top, pad_top,
pad_bottom pad_bottom,
} }
} }
@@ -66,7 +66,7 @@ impl KeyShape {
pad_left, pad_left,
pad_right, pad_right,
pad_top, pad_top,
pad_bottom pad_bottom,
} => { } => {
*width *= scale; *width *= scale;
*height *= scale; *height *= scale;
@@ -97,7 +97,7 @@ pub struct KeyRow {
row: Vec<(LedCode, String)>, row: Vec<(LedCode, String)>,
/// The final data structure merged key_shapes and rows /// The final data structure merged key_shapes and rows
#[serde(skip)] #[serde(skip)]
built_row: Vec<(LedCode, KeyShape)> built_row: Vec<(LedCode, KeyShape)>,
} }
impl KeyRow { impl KeyRow {
@@ -106,7 +106,7 @@ impl KeyRow {
pad_left, pad_left,
pad_top, pad_top,
row, row,
built_row: Default::default() built_row: Default::default(),
} }
} }
@@ -132,7 +132,7 @@ impl KeyRow {
pad_bottom, pad_bottom,
.. ..
} => height + pad_top + pad_bottom, } => height + pad_top + pad_bottom,
KeyShape::Blank { height, .. } => *height KeyShape::Blank { height, .. } => *height,
}; };
if h < height { if h < height {
@@ -156,7 +156,7 @@ impl KeyRow {
pad_right, pad_right,
.. ..
} => w += width + pad_left + pad_right, } => w += width + pad_left + pad_right,
KeyShape::Blank { width, .. } => w += width KeyShape::Blank { width, .. } => w += width,
} }
} }
w w
@@ -185,7 +185,7 @@ pub struct KeyLayout {
/// Should be copied from the `LaptopLedData` as laptops may have the same /// Should be copied from the `LaptopLedData` as laptops may have the same
/// layout, but different EC features. /// layout, but different EC features.
#[serde(skip)] #[serde(skip)]
advanced_type: AdvancedAuraType advanced_type: AdvancedAuraType,
} }
impl KeyLayout { impl KeyLayout {
@@ -195,7 +195,7 @@ impl KeyLayout {
if buf.is_empty() { if buf.is_empty() {
Err(Error::IoPath( Err(Error::IoPath(
path.to_string_lossy().to_string(), path.to_string_lossy().to_string(),
std::io::ErrorKind::InvalidData.into() std::io::ErrorKind::InvalidData.into(),
)) ))
} else { } else {
let mut data = ron::from_str::<Self>(&buf)?; let mut data = ron::from_str::<Self>(&buf)?;
@@ -332,7 +332,7 @@ impl KeyLayout {
advanced_type: AdvancedAuraType::None, advanced_type: AdvancedAuraType::None,
key_shapes: HashMap::from([( key_shapes: HashMap::from([(
"regular".to_owned(), "regular".to_owned(),
KeyShape::new_led(1.0, 1.0, 0.1, 0.1, 0.1, 0.1) KeyShape::new_led(1.0, 1.0, 0.1, 0.1, 0.1, 0.1),
)]), )]),
key_rows: vec![ key_rows: vec![
KeyRow::new(0.1, 0.1, vec![ KeyRow::new(0.1, 0.1, vec![
@@ -422,7 +422,7 @@ impl KeyLayout {
(LedCode::PrtSc, "regular".to_owned()), (LedCode::PrtSc, "regular".to_owned()),
(LedCode::RCtrl, "regular".to_owned()), (LedCode::RCtrl, "regular".to_owned()),
]), ]),
] ],
} }
} }
} }

2
rog-aura/src/keyboard/mod.rs
View File

@@ -16,5 +16,5 @@ pub enum AdvancedAuraType {
#[default] #[default]
None, None,
Zoned(Vec<LedCode>), Zoned(Vec<LedCode>),
PerKey PerKey,
} }

118
rog-aura/src/keyboard/power.rs
View File

@@ -23,7 +23,7 @@ pub struct AuraPowerState {
pub awake: bool, pub awake: bool,
pub sleep: bool, pub sleep: bool,
/// Ignored for pre-2021 and Tuf /// Ignored for pre-2021 and Tuf
pub shutdown: bool pub shutdown: bool,
} }
impl Default for AuraPowerState { impl Default for AuraPowerState {
@@ -34,7 +34,7 @@ impl Default for AuraPowerState {
boot: true, boot: true,
awake: true, awake: true,
sleep: true, sleep: true,
shutdown: true shutdown: true,
} }
} }
} }
@@ -46,7 +46,7 @@ impl AuraPowerState {
boot: true, boot: true,
awake: true, awake: true,
sleep: true, sleep: true,
shutdown: true shutdown: true,
} }
} }
@@ -140,7 +140,7 @@ impl AuraPowerState {
| ((self.sleep as u32) << (23 + 3)) | ((self.sleep as u32) << (23 + 3))
| ((self.shutdown as u32) << (23 + 4)) | ((self.shutdown as u32) << (23 + 4))
} }
PowerZones::None | PowerZones::KeyboardAndLightbar => 0 PowerZones::None | PowerZones::KeyboardAndLightbar => 0,
} }
} }
} }
@@ -148,7 +148,7 @@ impl AuraPowerState {
#[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))] #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
pub struct LaptopAuraPower { pub struct LaptopAuraPower {
pub states: Vec<AuraPowerState> pub states: Vec<AuraPowerState>,
} }
impl LaptopAuraPower { impl LaptopAuraPower {
@@ -206,19 +206,19 @@ impl LaptopAuraPower {
// 3. KeyboardAndLightbar // 3. KeyboardAndLightbar
if support_data.power_zones.contains(&PowerZones::Lightbar) { if support_data.power_zones.contains(&PowerZones::Lightbar) {
Self { Self {
states: vec![AuraPowerState::default_for(PowerZones::KeyboardAndLightbar)] states: vec![AuraPowerState::default_for(PowerZones::KeyboardAndLightbar)],
} }
} else { } else {
Self { Self {
states: vec![AuraPowerState::default_for(PowerZones::Keyboard)] states: vec![AuraPowerState::default_for(PowerZones::Keyboard)],
} }
} }
} }
AuraDeviceType::LaptopKeyboardTuf => Self { AuraDeviceType::LaptopKeyboardTuf => Self {
states: vec![AuraPowerState::default_for(PowerZones::Keyboard)] states: vec![AuraPowerState::default_for(PowerZones::Keyboard)],
}, },
AuraDeviceType::ScsiExtDisk => todo!(), AuraDeviceType::ScsiExtDisk => todo!(),
AuraDeviceType::AnimeOrSlash => todo!() AuraDeviceType::AnimeOrSlash => todo!(),
} }
} }
@@ -266,7 +266,7 @@ impl LaptopAuraPower {
self.new_to_bytes() self.new_to_bytes()
} }
AuraDeviceType::ScsiExtDisk => todo!("scsi disk not implemented yet"), AuraDeviceType::ScsiExtDisk => todo!("scsi disk not implemented yet"),
AuraDeviceType::AnimeOrSlash => todo!("anime/slash not implemented yet") AuraDeviceType::AnimeOrSlash => todo!("anime/slash not implemented yet"),
} }
} }
} }
@@ -285,7 +285,7 @@ enum OldAuraPower {
Boot = 0xc31209, Boot = 0xc31209,
Sleep = 0x300804, Sleep = 0x300804,
Keyboard = 0x080000, Keyboard = 0x080000,
Lightbar = 0x040500 Lightbar = 0x040500,
} }
impl BitOr<OldAuraPower> for OldAuraPower { impl BitOr<OldAuraPower> for OldAuraPower {
@@ -332,9 +332,9 @@ mod test {
boot: false, boot: false,
awake: true, awake: true,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}; };
let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021); let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021);
println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]); println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
@@ -347,9 +347,9 @@ mod test {
boot: false, boot: false,
awake: true, awake: true,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}; };
let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021); let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021);
println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]); println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
@@ -369,16 +369,16 @@ mod test {
boot: true, boot: true,
awake: true, awake: true,
sleep: true, sleep: true,
shutdown: false shutdown: false,
}, },
AuraPowerState { AuraPowerState {
zone: PowerZones::Lightbar, zone: PowerZones::Lightbar,
boot: true, boot: true,
awake: true, awake: true,
sleep: true, sleep: true,
shutdown: false shutdown: false,
}, },
] ],
}; };
let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021); let bytes = power.to_bytes(AuraDeviceType::LaptopKeyboardPre2021);
println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]); println!("{:08b}, {:08b}, {:08b}", bytes[0], bytes[1], bytes[2]);
@@ -394,9 +394,9 @@ mod test {
boot: true, boot: true,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let boot_keyb_ = to_binary_string_post2021(&LaptopAuraPower { let boot_keyb_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -405,9 +405,9 @@ mod test {
boot: true, boot: true,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let sleep_logo = to_binary_string_post2021(&LaptopAuraPower { let sleep_logo = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -416,9 +416,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: true, sleep: true,
shutdown: false shutdown: false,
}, },
] ],
}); });
let sleep_keyb = to_binary_string_post2021(&LaptopAuraPower { let sleep_keyb = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -427,9 +427,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: true, sleep: true,
shutdown: false shutdown: false,
}, },
] ],
}); });
let awake_logo = to_binary_string_post2021(&LaptopAuraPower { let awake_logo = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -438,9 +438,9 @@ mod test {
boot: false, boot: false,
awake: true, awake: true,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let awake_keyb = to_binary_string_post2021(&LaptopAuraPower { let awake_keyb = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -449,9 +449,9 @@ mod test {
boot: false, boot: false,
awake: true, awake: true,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let shut_logo_ = to_binary_string_post2021(&LaptopAuraPower { let shut_logo_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -460,9 +460,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: true shutdown: true,
}, },
] ],
}); });
let shut_keyb_ = to_binary_string_post2021(&LaptopAuraPower { let shut_keyb_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -471,9 +471,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: true shutdown: true,
}, },
] ],
}); });
let boot_bar__ = to_binary_string_post2021(&LaptopAuraPower { let boot_bar__ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -482,9 +482,9 @@ mod test {
boot: true, boot: true,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let awake_bar_ = to_binary_string_post2021(&LaptopAuraPower { let awake_bar_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -493,9 +493,9 @@ mod test {
boot: false, boot: false,
awake: true, awake: true,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let sleep_bar_ = to_binary_string_post2021(&LaptopAuraPower { let sleep_bar_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -504,9 +504,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: true, sleep: true,
shutdown: false shutdown: false,
}, },
] ],
}); });
let shut_bar__ = to_binary_string_post2021(&LaptopAuraPower { let shut_bar__ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -515,9 +515,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: true shutdown: true,
}, },
] ],
}); });
let boot_lid__ = to_binary_string_post2021(&LaptopAuraPower { let boot_lid__ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -526,9 +526,9 @@ mod test {
boot: true, boot: true,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let awake_lid_ = to_binary_string_post2021(&LaptopAuraPower { let awake_lid_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -537,9 +537,9 @@ mod test {
boot: false, boot: false,
awake: true, awake: true,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let sleep_lid_ = to_binary_string_post2021(&LaptopAuraPower { let sleep_lid_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -548,9 +548,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: true, sleep: true,
shutdown: false shutdown: false,
}, },
] ],
}); });
let shut_lid__ = to_binary_string_post2021(&LaptopAuraPower { let shut_lid__ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -559,9 +559,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: true shutdown: true,
}, },
] ],
}); });
let boot_rear_ = to_binary_string_post2021(&LaptopAuraPower { let boot_rear_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -570,9 +570,9 @@ mod test {
boot: true, boot: true,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let awake_rear = to_binary_string_post2021(&LaptopAuraPower { let awake_rear = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -581,9 +581,9 @@ mod test {
boot: false, boot: false,
awake: true, awake: true,
sleep: false, sleep: false,
shutdown: false shutdown: false,
}, },
] ],
}); });
let sleep_rear = to_binary_string_post2021(&LaptopAuraPower { let sleep_rear = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -592,9 +592,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: true, sleep: true,
shutdown: false shutdown: false,
}, },
] ],
}); });
let shut_rear_ = to_binary_string_post2021(&LaptopAuraPower { let shut_rear_ = to_binary_string_post2021(&LaptopAuraPower {
states: vec![ states: vec![
@@ -603,9 +603,9 @@ mod test {
boot: false, boot: false,
awake: false, awake: false,
sleep: false, sleep: false,
shutdown: true shutdown: true,
}, },
] ],
}); });
assert_eq!(boot_logo_, "00000001, 00000000, 00000000, 00000000"); assert_eq!(boot_logo_, "00000001, 00000000, 00000000, 00000000");
@@ -655,7 +655,7 @@ mod test {
zone: PowerZones::RearGlow, zone: PowerZones::RearGlow,
..Default::default() ..Default::default()
}, },
] ],
}); });
assert_eq!(byte1, "11111111, 00011110, 00001111, 00001111"); assert_eq!(byte1, "11111111, 00011110, 00001111, 00001111");
} }

22
rog-aura/src/lib.rs
View File

@@ -29,40 +29,40 @@ pub const VERSION: &str = env!("CARGO_PKG_VERSION");
pub const RED: Colour = Colour { pub const RED: Colour = Colour {
r: 0xff, r: 0xff,
g: 0x00, g: 0x00,
b: 0x00 b: 0x00,
}; };
pub const GREEN: Colour = Colour { pub const GREEN: Colour = Colour {
r: 0x00, r: 0x00,
g: 0xff, g: 0xff,
b: 0x00 b: 0x00,
}; };
pub const BLUE: Colour = Colour { pub const BLUE: Colour = Colour {
r: 0x00, r: 0x00,
g: 0x00, g: 0x00,
b: 0xff b: 0xff,
}; };
pub const VIOLET: Colour = Colour { pub const VIOLET: Colour = Colour {
r: 0x9b, r: 0x9b,
g: 0x26, g: 0x26,
b: 0xb6 b: 0xb6,
}; };
pub const TEAL: Colour = Colour { pub const TEAL: Colour = Colour {
r: 0x00, r: 0x00,
g: 0x7c, g: 0x7c,
b: 0x80 b: 0x80,
}; };
pub const YELLOW: Colour = Colour { pub const YELLOW: Colour = Colour {
r: 0xff, r: 0xff,
g: 0xef, g: 0xef,
b: 0x00 b: 0x00,
}; };
pub const ORANGE: Colour = Colour { pub const ORANGE: Colour = Colour {
r: 0xff, r: 0xff,
g: 0xa4, g: 0xa4,
b: 0x00 b: 0x00,
}; };
pub const GRADIENT: [Colour; 7] = [ pub const GRADIENT: [Colour; 7] = [
RED, VIOLET, BLUE, TEAL, GREEN, YELLOW, ORANGE RED, VIOLET, BLUE, TEAL, GREEN, YELLOW, ORANGE,
]; ];
#[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))] #[cfg_attr(feature = "dbus", derive(Type, Value, OwnedValue))]
@@ -76,7 +76,7 @@ pub enum AuraDeviceType {
ScsiExtDisk = 3, ScsiExtDisk = 3,
Ally = 4, Ally = 4,
AnimeOrSlash = 5, AnimeOrSlash = 5,
Unknown = 255 Unknown = 255,
} }
impl AuraDeviceType { impl AuraDeviceType {
@@ -110,7 +110,7 @@ impl From<&str> for AuraDeviceType {
"1abe" | "1b4c" => Self::Ally, "1abe" | "1b4c" => Self::Ally,
"19b3" | "193b" => Self::AnimeOrSlash, "19b3" | "193b" => Self::AnimeOrSlash,
"19b6" => Self::LaptopKeyboard2021, "19b6" => Self::LaptopKeyboard2021,
_ => Self::Unknown _ => Self::Unknown,
} }
} }
} }
@@ -138,5 +138,5 @@ pub enum PowerZones {
KeyboardAndLightbar = 5, KeyboardAndLightbar = 5,
/// Ally specific for creating correct packet /// Ally specific for creating correct packet
Ally = 6, Ally = 6,
None = 255 None = 255,
} }

4
rog-aura/src/usb.rs
View File

@@ -1,7 +1,7 @@
// Only these two packets must be 17 bytes // Only these two packets must be 17 bytes
pub const AURA_LAPTOP_LED_APPLY: [u8; 17] = [ pub const AURA_LAPTOP_LED_APPLY: [u8; 17] = [
0x5d, 0xb4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 0x5d, 0xb4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
]; ];
pub const AURA_LAPTOP_LED_SET: [u8; 17] = [ pub const AURA_LAPTOP_LED_SET: [u8; 17] = [
0x5d, 0xb5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 0x5d, 0xb5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
]; ];

2
rog-control-center/build.rs
View File

@@ -18,7 +18,7 @@ fn main() {
CompilerConfiguration::new() CompilerConfiguration::new()
// .embed_resources(EmbedResourcesKind::EmbedFiles) // .embed_resources(EmbedResourcesKind::EmbedFiles)
.with_include_paths(vec![include]) .with_include_paths(vec![include])
.with_style("fluent".into()) .with_style("fluent".into()),
) )
.unwrap(); .unwrap();
} }

2
rog-control-center/src/cli_options.rs
View File

@@ -23,5 +23,5 @@ pub struct CliStart {
help = "put ROGCC in layout viewing mode - this is helpful for finding existing layouts \ help = "put ROGCC in layout viewing mode - this is helpful for finding existing layouts \
that might match your laptop" that might match your laptop"
)] )]
pub layout_viewing: bool pub layout_viewing: bool,
} }

8
rog-control-center/src/config.rs
View File

@@ -21,7 +21,7 @@ pub struct Config {
pub fullscreen_width: u32, pub fullscreen_width: u32,
pub fullscreen_height: u32, pub fullscreen_height: u32,
// This field must be last // This field must be last
pub notifications: EnabledNotifications pub notifications: EnabledNotifications,
} }
impl Default for Config { impl Default for Config {
@@ -36,7 +36,7 @@ impl Default for Config {
fullscreen_height: 1080, fullscreen_height: 1080,
notifications: EnabledNotifications::default(), notifications: EnabledNotifications::default(),
ac_command: String::new(), ac_command: String::new(),
bat_command: String::new() bat_command: String::new(),
} }
} }
} }
@@ -77,7 +77,7 @@ pub struct Config461 {
pub enable_dgpu_notifications: bool, pub enable_dgpu_notifications: bool,
pub dark_mode: bool, pub dark_mode: bool,
// This field must be last // This field must be last
pub enabled_notifications: EnabledNotifications pub enabled_notifications: EnabledNotifications,
} }
impl From<Config461> for Config { impl From<Config461> for Config {
@@ -92,7 +92,7 @@ impl From<Config461> for Config {
start_fullscreen: false, start_fullscreen: false,
fullscreen_width: 1920, fullscreen_width: 1920,
fullscreen_height: 1080, fullscreen_height: 1080,
notifications: c.enabled_notifications notifications: c.enabled_notifications,
} }
} }
} }

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

@@ -9,7 +9,7 @@ pub enum Error {
ConfigLockFail, ConfigLockFail,
XdgVars, XdgVars,
Zbus(zbus::Error), Zbus(zbus::Error),
Notification(notify_rust::error::Error) Notification(notify_rust::error::Error),
} }
impl fmt::Display for Error { impl fmt::Display for Error {
@@ -21,7 +21,7 @@ impl fmt::Display for Error {
Error::ConfigLockFail => write!(f, "Failed to lock user config"), Error::ConfigLockFail => write!(f, "Failed to lock user config"),
Error::XdgVars => write!(f, "XDG environment vars appear unset"), Error::XdgVars => write!(f, "XDG environment vars appear unset"),
Error::Zbus(err) => write!(f, "Error: {}", err), Error::Zbus(err) => write!(f, "Error: {}", err),
Error::Notification(err) => write!(f, "Notification Error: {}", err) Error::Notification(err) => write!(f, "Notification Error: {}", err),
} }
} }
} }

2
rog-control-center/src/lib.rs
View File

@@ -38,5 +38,5 @@ pub enum Page {
System, System,
AuraEffects, AuraEffects,
AnimeMatrix, AnimeMatrix,
FanCurves FanCurves,
} }

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

@@ -17,7 +17,7 @@ use rog_control_center::slint::ComponentHandle;
use rog_control_center::tray::init_tray; use rog_control_center::tray::init_tray;
use rog_control_center::ui::setup_window; use rog_control_center::ui::setup_window;
use rog_control_center::zbus_proxies::{ use rog_control_center::zbus_proxies::{
AppState, ROGCCZbus, ROGCCZbusProxyBlocking, ZBUS_IFACE, ZBUS_PATH AppState, ROGCCZbus, ROGCCZbusProxyBlocking, ZBUS_IFACE, ZBUS_PATH,
}; };
use rog_control_center::{print_versions, MainWindow}; use rog_control_center::{print_versions, MainWindow};
use tokio::runtime::Runtime; use tokio::runtime::Runtime;

26
rog-control-center/src/mocking.rs
View File

@@ -5,7 +5,7 @@ use rog_aura::{AuraEffect, AuraModeNum, AuraZone};
use rog_platform::platform::GpuMode; use rog_platform::platform::GpuMode;
use rog_platform::supported::{ use rog_platform::supported::{
AdvancedAura, AnimeSupportedFunctions, ChargeSupportedFunctions, LedSupportedFunctions, AdvancedAura, AnimeSupportedFunctions, ChargeSupportedFunctions, LedSupportedFunctions,
PlatformProfileFunctions, RogBiosSupportedFunctions, SupportedFunctions PlatformProfileFunctions, RogBiosSupportedFunctions, SupportedFunctions,
}; };
use rog_profiles::fan_curve_set::{CurveData, FanCurveSet}; use rog_profiles::fan_curve_set::{CurveData, FanCurveSet};
use supergfxctl::pci_device::{GfxMode, GfxPower}; use supergfxctl::pci_device::{GfxMode, GfxPower};
@@ -16,7 +16,7 @@ const NOPE: &str = "";
#[derive(Default)] #[derive(Default)]
pub struct DaemonProxyBlocking<'a> { pub struct DaemonProxyBlocking<'a> {
_phantom: &'a str _phantom: &'a str,
} }
impl<'a> DaemonProxyBlocking<'a> { impl<'a> DaemonProxyBlocking<'a> {
@@ -35,7 +35,7 @@ impl<'a> DaemonProxyBlocking<'a> {
#[derive(Default)] #[derive(Default)]
pub struct RogDbusClientBlocking<'a> { pub struct RogDbusClientBlocking<'a> {
_phantom: &'a str _phantom: &'a str,
} }
impl<'a> RogDbusClientBlocking<'a> { impl<'a> RogDbusClientBlocking<'a> {
@@ -126,16 +126,16 @@ impl Profile {
pub fn fan_curve_data(&self, _p: rog_profiles::Profile) -> Result<FanCurveSet> { pub fn fan_curve_data(&self, _p: rog_profiles::Profile) -> Result<FanCurveSet> {
let mut curve = FanCurveSet::default(); let mut curve = FanCurveSet::default();
curve.cpu.pwm = [ curve.cpu.pwm = [
30, 40, 60, 100, 140, 180, 200, 250 30, 40, 60, 100, 140, 180, 200, 250,
]; ];
curve.cpu.temp = [ curve.cpu.temp = [
20, 30, 40, 50, 70, 80, 90, 100 20, 30, 40, 50, 70, 80, 90, 100,
]; ];
curve.gpu.pwm = [ curve.gpu.pwm = [
40, 80, 100, 140, 170, 200, 230, 250 40, 80, 100, 140, 170, 200, 230, 250,
]; ];
curve.gpu.temp = [ curve.gpu.temp = [
20, 30, 40, 50, 70, 80, 90, 100 20, 30, 40, 50, 70, 80, 90, 100,
]; ];
Ok(curve) Ok(curve)
} }
@@ -204,7 +204,7 @@ impl Led {
AuraDevRog2::AwakeKeyb, AuraDevRog2::AwakeKeyb,
AuraDevRog2::SleepLogo, AuraDevRog2::SleepLogo,
AuraDevRog2::AwakeLogo, AuraDevRog2::AwakeLogo,
] ],
}) })
} }
@@ -242,11 +242,11 @@ impl Supported {
Ok(SupportedFunctions { Ok(SupportedFunctions {
anime_ctrl: AnimeSupportedFunctions(true), anime_ctrl: AnimeSupportedFunctions(true),
charge_ctrl: ChargeSupportedFunctions { charge_ctrl: ChargeSupportedFunctions {
charge_level_set: true charge_level_set: true,
}, },
platform_profile: PlatformProfileFunctions { platform_profile: PlatformProfileFunctions {
platform_profile: true, platform_profile: true,
fan_curves: true fan_curves: true,
}, },
keyboard_led: LedSupportedFunctions { keyboard_led: LedSupportedFunctions {
dev_id: AuraDevice::X19b6, dev_id: AuraDevice::X19b6,
@@ -267,7 +267,7 @@ impl Supported {
AuraZone::BarRight, AuraZone::BarRight,
AuraZone::Logo, AuraZone::Logo,
], ],
advanced_type: AdvancedAura::PerKey advanced_type: AdvancedAura::PerKey,
}, },
rog_bios_ctrl: RogBiosSupportedFunctions { rog_bios_ctrl: RogBiosSupportedFunctions {
post_sound: true, post_sound: true,
@@ -275,8 +275,8 @@ impl Supported {
panel_overdrive: true, panel_overdrive: true,
dgpu_disable: true, dgpu_disable: true,
mini_led_mode: true, mini_led_mode: true,
egpu_enable: true egpu_enable: true,
} },
}) })
} }
} }

18
rog-control-center/src/notify.rs
View File

@@ -31,7 +31,7 @@ const NOTIF_HEADER: &str = "ROG Control";
pub struct EnabledNotifications { pub struct EnabledNotifications {
pub enabled: bool, pub enabled: bool,
pub receive_notify_gfx: bool, pub receive_notify_gfx: bool,
pub receive_notify_gfx_status: bool pub receive_notify_gfx_status: bool,
} }
impl Default for EnabledNotifications { impl Default for EnabledNotifications {
@@ -39,7 +39,7 @@ impl Default for EnabledNotifications {
Self { Self {
enabled: true, enabled: true,
receive_notify_gfx: true, receive_notify_gfx: true,
receive_notify_gfx_status: true receive_notify_gfx_status: true,
} }
} }
} }
@@ -92,7 +92,7 @@ fn start_dpu_status_mon(config: Arc<Mutex<Config>>) {
pub fn start_notifications( pub fn start_notifications(
config: Arc<Mutex<Config>>, config: Arc<Mutex<Config>>,
rt: &Runtime rt: &Runtime,
) -> Result<Vec<JoinHandle<()>>> { ) -> Result<Vec<JoinHandle<()>>> {
// Setup the AC/BAT commands that will run on power status change // Setup the AC/BAT commands that will run on power status change
let config_copy = config.clone(); let config_copy = config.clone();
@@ -214,7 +214,7 @@ pub fn start_notifications(
supergfxctl::actions::UserActionRequired::Reboot => { supergfxctl::actions::UserActionRequired::Reboot => {
do_mux_notification("Graphics mode change requires reboot", &mode) do_mux_notification("Graphics mode change requires reboot", &mode)
} }
_ => do_gfx_action_notif(<&str>::from(action), *action, mode) _ => do_gfx_action_notif(<&str>::from(action), *action, mode),
} }
.map_err(|e| { .map_err(|e| {
error!("zbus signal: do_gfx_action_notif: {e}"); error!("zbus signal: do_gfx_action_notif: {e}");
@@ -266,13 +266,13 @@ fn convert_gfx_mode(gfx: GfxMode) -> GpuMode {
GfxMode::Vfio => GpuMode::Vfio, GfxMode::Vfio => GpuMode::Vfio,
GfxMode::AsusEgpu => GpuMode::Egpu, GfxMode::AsusEgpu => GpuMode::Egpu,
GfxMode::AsusMuxDgpu => GpuMode::Ultimate, GfxMode::AsusMuxDgpu => GpuMode::Ultimate,
GfxMode::None => GpuMode::Error GfxMode::None => GpuMode::Error,
} }
} }
fn base_notification<T>(message: &str, data: &T) -> Notification fn base_notification<T>(message: &str, data: &T) -> Notification
where where
T: Display T: Display,
{ {
let mut notif = Notification::new(); let mut notif = Notification::new();
notif notif
@@ -290,7 +290,7 @@ fn do_gpu_status_notif(message: &str, data: &GfxPower) -> Notification {
GfxPower::Off => "asus_notif_green", GfxPower::Off => "asus_notif_green",
GfxPower::AsusDisabled => "asus_notif_white", GfxPower::AsusDisabled => "asus_notif_white",
GfxPower::AsusMuxDiscreet | GfxPower::Active => "asus_notif_red", GfxPower::AsusMuxDiscreet | GfxPower::Active => "asus_notif_red",
GfxPower::Unknown => "gpu-integrated" GfxPower::Unknown => "gpu-integrated",
}; };
notif.icon(icon); notif.icon(icon);
notif notif
@@ -331,7 +331,7 @@ fn do_gfx_action_notif(message: &str, action: GfxUserAction, mode: GpuMode) -> R
if id == "gfx-mode-session-action" { if id == "gfx-mode-session-action" {
let mut cmd = Command::new("qdbus"); let mut cmd = Command::new("qdbus");
cmd.args([ cmd.args([
"org.kde.ksmserver", "/KSMServer", "logout", "1", "0", "0" "org.kde.ksmserver", "/KSMServer", "logout", "1", "0", "0",
]); ]);
cmd.spawn().ok(); cmd.spawn().ok();
} else if id == "__closed" { } else if id == "__closed" {
@@ -375,7 +375,7 @@ fn do_mux_notification(message: &str, m: &GpuMode) -> Result<()> {
if id == "gfx-mode-session-action" { if id == "gfx-mode-session-action" {
let mut cmd = Command::new("qdbus"); let mut cmd = Command::new("qdbus");
cmd.args([ cmd.args([
"org.kde.ksmserver", "/KSMServer", "logout", "1", "1", "0" "org.kde.ksmserver", "/KSMServer", "logout", "1", "1", "0",
]); ]);
cmd.spawn().ok(); cmd.spawn().ok();
} else if id == "__closed" { } else if id == "__closed" {

16
rog-control-center/src/tray.rs
View File

@@ -24,7 +24,7 @@ struct Icons {
rog_red: Icon, rog_red: Icon,
rog_green: Icon, rog_green: Icon,
rog_white: Icon, rog_white: Icon,
gpu_integrated: Icon gpu_integrated: Icon,
} }
static ICONS: OnceLock<Icons> = OnceLock::new(); static ICONS: OnceLock<Icons> = OnceLock::new();
@@ -51,14 +51,14 @@ fn read_icon(file: &Path) -> Icon {
Icon { Icon {
width: width as i32, width: width as i32,
height: height as i32, height: height as i32,
data: img.into_raw() data: img.into_raw(),
} }
} }
struct AsusTray { struct AsusTray {
current_title: String, current_title: String,
current_icon: Icon, current_icon: Icon,
proxy: ROGCCZbusProxyBlocking<'static> proxy: ROGCCZbusProxyBlocking<'static>,
} }
impl ksni::Tray for AsusTray { impl ksni::Tray for AsusTray {
@@ -106,7 +106,7 @@ async fn set_tray_icon_and_tip(
mode: GfxMode, mode: GfxMode,
power: GfxPower, power: GfxPower,
tray: &mut Handle<AsusTray>, tray: &mut Handle<AsusTray>,
supergfx_active: bool supergfx_active: bool,
) { ) {
if let Some(icons) = ICONS.get() { if let Some(icons) = ICONS.get() {
let icon = match power { let icon = match power {
@@ -165,7 +165,7 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
let tray_init = AsusTray { let tray_init = AsusTray {
current_title: TRAY_LABEL.to_string(), current_title: TRAY_LABEL.to_string(),
current_icon: rog_red.clone(), current_icon: rog_red.clone(),
proxy proxy,
}; };
// TODO: return an error to the UI // TODO: return an error to the UI
@@ -190,7 +190,7 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
rog_red: rog_red.clone(), rog_red: rog_red.clone(),
rog_green, rog_green,
rog_white, rog_white,
gpu_integrated gpu_integrated,
}); });
let mut has_supergfx = false; let mut has_supergfx = false;
@@ -218,8 +218,8 @@ pub fn init_tray(_supported_properties: Vec<Properties>, config: Arc<Mutex<Confi
may not be running or installed" may not be running or installed"
) )
} }
_ => warn!("Couldn't get mode from supergfxd: {e:?}") _ => warn!("Couldn't get mode from supergfxd: {e:?}"),
} },
} }
info!("Started ROGTray"); info!("Started ROGTray");

30
rog-control-center/src/types/aura_types.rs
View File

@@ -1,6 +1,6 @@
use crate::slint_generatedMainWindow::{ use crate::slint_generatedMainWindow::{
AuraDevType as SlintDeviceType, AuraPowerState as SlintAuraPowerState, AuraDevType as SlintDeviceType, AuraPowerState as SlintAuraPowerState,
LaptopAuraPower as SlintLaptopAuraPower LaptopAuraPower as SlintLaptopAuraPower,
}; };
impl From<rog_aura::AuraEffect> for crate::slint_generatedMainWindow::AuraEffect { impl From<rog_aura::AuraEffect> for crate::slint_generatedMainWindow::AuraEffect {
@@ -10,20 +10,20 @@ impl From<rog_aura::AuraEffect> for crate::slint_generatedMainWindow::AuraEffect
red: m.colour1.r, red: m.colour1.r,
green: m.colour1.g, green: m.colour1.g,
blue: m.colour1.b, blue: m.colour1.b,
alpha: 255 alpha: 255,
} }
.into(), .into(),
colour2: RgbaColor { colour2: RgbaColor {
red: m.colour2.r, red: m.colour2.r,
green: m.colour2.g, green: m.colour2.g,
blue: m.colour2.b, blue: m.colour2.b,
alpha: 255 alpha: 255,
} }
.into(), .into(),
direction: m.direction.into(), direction: m.direction.into(),
mode: m.mode.into(), mode: m.mode.into(),
speed: m.speed.into(), speed: m.speed.into(),
zone: m.zone.into() zone: m.zone.into(),
} }
} }
} }
@@ -36,17 +36,17 @@ impl From<crate::slint_generatedMainWindow::AuraEffect> for rog_aura::AuraEffect
colour1: rog_aura::Colour { colour1: rog_aura::Colour {
r: c1.red, r: c1.red,
g: c1.green, g: c1.green,
b: c1.blue b: c1.blue,
}, },
colour2: rog_aura::Colour { colour2: rog_aura::Colour {
r: c2.red, r: c2.red,
g: c2.green, g: c2.green,
b: c2.blue b: c2.blue,
}, },
direction: m.direction.into(), direction: m.direction.into(),
mode: m.mode.into(), mode: m.mode.into(),
speed: m.speed.into(), speed: m.speed.into(),
zone: m.zone.into() zone: m.zone.into(),
} }
} }
} }
@@ -66,7 +66,7 @@ impl From<PowerZones> for SlintPowerZones {
PowerZones::RearGlow => SlintPowerZones::RearGlow, PowerZones::RearGlow => SlintPowerZones::RearGlow,
PowerZones::KeyboardAndLightbar => SlintPowerZones::KeyboardAndLightbar, PowerZones::KeyboardAndLightbar => SlintPowerZones::KeyboardAndLightbar,
PowerZones::Ally => SlintPowerZones::Ally, PowerZones::Ally => SlintPowerZones::Ally,
PowerZones::None => SlintPowerZones::Keyboard PowerZones::None => SlintPowerZones::Keyboard,
} }
} }
} }
@@ -80,7 +80,7 @@ impl From<SlintPowerZones> for PowerZones {
SlintPowerZones::Lid => PowerZones::Lid, SlintPowerZones::Lid => PowerZones::Lid,
SlintPowerZones::RearGlow => PowerZones::RearGlow, SlintPowerZones::RearGlow => PowerZones::RearGlow,
SlintPowerZones::KeyboardAndLightbar => PowerZones::KeyboardAndLightbar, SlintPowerZones::KeyboardAndLightbar => PowerZones::KeyboardAndLightbar,
SlintPowerZones::Ally => PowerZones::Ally SlintPowerZones::Ally => PowerZones::Ally,
} }
} }
} }
@@ -92,7 +92,7 @@ impl From<SlintAuraPowerState> for AuraPowerState {
boot: value.boot, boot: value.boot,
awake: value.awake, awake: value.awake,
sleep: value.sleep, sleep: value.sleep,
shutdown: value.shutdown shutdown: value.shutdown,
} }
} }
} }
@@ -106,7 +106,7 @@ impl From<AuraPowerState> for SlintAuraPowerState {
sleep: value.sleep, sleep: value.sleep,
shutdown: value.shutdown, shutdown: value.shutdown,
zone, zone,
zone_name_idx: zone as i32 zone_name_idx: zone as i32,
} }
} }
} }
@@ -120,7 +120,7 @@ impl From<&AuraPowerState> for SlintAuraPowerState {
sleep: value.sleep, sleep: value.sleep,
shutdown: value.shutdown, shutdown: value.shutdown,
zone, zone,
zone_name_idx: zone as i32 zone_name_idx: zone as i32,
} }
} }
} }
@@ -140,7 +140,7 @@ impl From<LaptopAuraPower> for SlintLaptopAuraPower {
let converted: Vec<SlintAuraPowerState> = let converted: Vec<SlintAuraPowerState> =
value.states.iter().map(SlintAuraPowerState::from).collect(); value.states.iter().map(SlintAuraPowerState::from).collect();
Self { Self {
states: ModelRc::from(converted.as_slice()) states: ModelRc::from(converted.as_slice()),
} }
} }
} }
@@ -154,7 +154,7 @@ impl From<SlintDeviceType> for AuraDeviceType {
SlintDeviceType::ScsiExtDisk => Self::ScsiExtDisk, SlintDeviceType::ScsiExtDisk => Self::ScsiExtDisk,
SlintDeviceType::Unknown => Self::Unknown, SlintDeviceType::Unknown => Self::Unknown,
SlintDeviceType::Ally => Self::Ally, SlintDeviceType::Ally => Self::Ally,
SlintDeviceType::AnimeOrSlash => Self::AnimeOrSlash SlintDeviceType::AnimeOrSlash => Self::AnimeOrSlash,
} }
} }
} }
@@ -168,7 +168,7 @@ impl From<AuraDeviceType> for SlintDeviceType {
AuraDeviceType::ScsiExtDisk => SlintDeviceType::ScsiExtDisk, AuraDeviceType::ScsiExtDisk => SlintDeviceType::ScsiExtDisk,
AuraDeviceType::Unknown => SlintDeviceType::Unknown, AuraDeviceType::Unknown => SlintDeviceType::Unknown,
AuraDeviceType::Ally => SlintDeviceType::Ally, AuraDeviceType::Ally => SlintDeviceType::Ally,
AuraDeviceType::AnimeOrSlash => SlintDeviceType::AnimeOrSlash AuraDeviceType::AnimeOrSlash => SlintDeviceType::AnimeOrSlash,
} }
} }
} }

8
rog-control-center/src/types/fan_types.rs
View File

@@ -8,7 +8,7 @@ impl From<Profile> for PlatformProfile {
match value { match value {
Profile::Balanced => PlatformProfile::Balanced, Profile::Balanced => PlatformProfile::Balanced,
Profile::Performance => PlatformProfile::Performance, Profile::Performance => PlatformProfile::Performance,
Profile::Quiet => PlatformProfile::Quiet Profile::Quiet => PlatformProfile::Quiet,
} }
} }
} }
@@ -18,7 +18,7 @@ impl From<PlatformProfile> for Profile {
match value { match value {
PlatformProfile::Balanced => Profile::Balanced, PlatformProfile::Balanced => Profile::Balanced,
PlatformProfile::Performance => Profile::Performance, PlatformProfile::Performance => Profile::Performance,
PlatformProfile::Quiet => Profile::Quiet PlatformProfile::Quiet => Profile::Quiet,
} }
} }
} }
@@ -28,7 +28,7 @@ impl From<FanType> for FanCurvePU {
match value { match value {
FanType::CPU => FanCurvePU::CPU, FanType::CPU => FanCurvePU::CPU,
FanType::Middle => FanCurvePU::MID, FanType::Middle => FanCurvePU::MID,
FanType::GPU => FanCurvePU::GPU FanType::GPU => FanCurvePU::GPU,
} }
} }
} }
@@ -38,7 +38,7 @@ impl From<FanCurvePU> for FanType {
match value { match value {
FanCurvePU::CPU => FanType::CPU, FanCurvePU::CPU => FanType::CPU,
FanCurvePU::GPU => FanType::GPU, FanCurvePU::GPU => FanType::GPU,
FanCurvePU::MID => FanType::Middle FanCurvePU::MID => FanType::Middle,
} }
} }
} }

8
rog-control-center/src/ui/mod.rs
View File

@@ -68,7 +68,7 @@ pub fn show_toast(
success: SharedString, success: SharedString,
fail: SharedString, fail: SharedString,
handle: Weak<MainWindow>, handle: Weak<MainWindow>,
result: zbus::Result<()> result: zbus::Result<()>,
) { ) {
match result { match result {
Ok(_) => { Ok(_) => {
@@ -78,7 +78,7 @@ pub fn show_toast(
log::warn!("{fail}: {e}"); log::warn!("{fail}: {e}");
handle.unwrap().invoke_show_toast(fail) handle.unwrap().invoke_show_toast(fail)
}) })
.ok() .ok(),
}; };
} }
@@ -98,9 +98,9 @@ pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
available.contains(&"xyz.ljones.Anime".to_string()), available.contains(&"xyz.ljones.Anime".to_string()),
available.contains(&"xyz.ljones.FanCurves".to_string()), available.contains(&"xyz.ljones.FanCurves".to_string()),
true, true,
true true,
] ]
.into() .into(),
); );
ui.on_exit_app(move || { ui.on_exit_app(move || {

4
rog-control-center/src/ui/setup_anime.rs
View File

@@ -51,9 +51,9 @@ pub fn setup_anime_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
boot: boot.into(), boot: boot.into(),
awake: awake.into(), awake: awake.into(),
sleep: sleep.into(), sleep: sleep.into(),
shutdown: shutdown.into() shutdown: shutdown.into(),
}) })
.await .await,
); );
}); });
}); });

8
rog-control-center/src/ui/setup_aura.rs
View File

@@ -9,7 +9,7 @@ use slint::{ComponentHandle, Model, RgbaColor, SharedString};
use crate::config::Config; use crate::config::Config;
use crate::ui::show_toast; use crate::ui::show_toast;
use crate::{ use crate::{
set_ui_callbacks, set_ui_props_async, AuraPageData, MainWindow, PowerZones as SlintPowerZones set_ui_callbacks, set_ui_props_async, AuraPageData, MainWindow, PowerZones as SlintPowerZones,
}; };
fn decode_hex(s: &str) -> RgbaColor<u8> { fn decode_hex(s: &str) -> RgbaColor<u8> {
@@ -19,7 +19,7 @@ fn decode_hex(s: &str) -> RgbaColor<u8> {
alpha: 255, alpha: 255,
red: 0, red: 0,
green: 0, green: 0,
blue: 0 blue: 0,
}; };
} }
let c: Vec<u8> = (0..s.len()) let c: Vec<u8> = (0..s.len())
@@ -30,7 +30,7 @@ fn decode_hex(s: &str) -> RgbaColor<u8> {
alpha: 255, alpha: 255,
red: *c.first().unwrap_or(&255), red: *c.first().unwrap_or(&255),
green: *c.get(1).unwrap_or(&128), green: *c.get(1).unwrap_or(&128),
blue: *c.get(2).unwrap_or(&32) blue: *c.get(2).unwrap_or(&32),
} }
} }
@@ -198,7 +198,7 @@ pub fn setup_aura_page(ui: &MainWindow, _states: Arc<Mutex<Config>>) {
"Aura power settings changed".into(), "Aura power settings changed".into(),
"Failed to set Aura power settings".into(), "Failed to set Aura power settings".into(),
handle_copy, handle_copy,
proxy_copy.set_led_power(power).await proxy_copy.set_led_power(power).await,
); );
}); });
}); });

6
rog-control-center/src/ui/setup_fans.rs
View File

@@ -13,7 +13,7 @@ pub fn update_fan_data(
handle: Weak<MainWindow>, handle: Weak<MainWindow>,
bal: Vec<CurveData>, bal: Vec<CurveData>,
perf: Vec<CurveData>, perf: Vec<CurveData>,
quiet: Vec<CurveData> quiet: Vec<CurveData>,
) { ) {
handle handle
.upgrade_in_event_loop(move |handle| { .upgrade_in_event_loop(move |handle| {
@@ -24,7 +24,7 @@ pub fn update_fan_data(
.zip(pwm.iter()) .zip(pwm.iter())
.map(|(x, y)| Node { .map(|(x, y)| Node {
x: *x as f32, x: *x as f32,
y: *y as f32 y: *y as f32,
}) })
.collect(); .collect();
tmp.as_slice().into() tmp.as_slice().into()
@@ -199,6 +199,6 @@ fn fan_data_for(fan: FanType, enabled: bool, data: Vec<Node>) -> CurveData {
fan: fan.into(), fan: fan.into(),
pwm, pwm,
temp, temp,
enabled enabled,
} }
} }

2
rog-control-center/src/ui/setup_system.rs
View File

@@ -16,7 +16,7 @@ use crate::{set_ui_callbacks, set_ui_props_async, AttrMinMax, MainWindow, System
const MINMAX: AttrMinMax = AttrMinMax { const MINMAX: AttrMinMax = AttrMinMax {
min: 0, min: 0,
max: 0, max: 0,
current: -1.0 current: -1.0,
}; };
pub fn setup_system_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) { pub fn setup_system_page(ui: &MainWindow, _config: Arc<Mutex<Config>>) {

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

@@ -14,18 +14,18 @@ pub enum AppState {
MainWindowClosed = 2, MainWindowClosed = 2,
StartingUp = 3, StartingUp = 3,
QuitApp = 4, QuitApp = 4,
LockFailed = 5 LockFailed = 5,
} }
pub struct ROGCCZbus { pub struct ROGCCZbus {
state: Arc<Mutex<AppState>> state: Arc<Mutex<AppState>>,
} }
impl ROGCCZbus { impl ROGCCZbus {
#[allow(clippy::new_without_default)] #[allow(clippy::new_without_default)]
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
state: Arc::new(Mutex::new(AppState::StartingUp)) state: Arc::new(Mutex::new(AppState::StartingUp)),
} }
} }
@@ -72,7 +72,7 @@ pub trait ROGCCZbus {
pub fn find_iface<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>> pub fn find_iface<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>>
where where
T: ProxyImpl<'static> + From<zbus::Proxy<'static>> T: ProxyImpl<'static> + From<zbus::Proxy<'static>>,
{ {
let conn = Connection::system().unwrap(); let conn = Connection::system().unwrap();
let f = fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/").unwrap(); let f = fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/").unwrap();
@@ -99,7 +99,7 @@ where
T::builder(&conn) T::builder(&conn)
.path(path.clone())? .path(path.clone())?
.destination("xyz.ljones.Asusd")? .destination("xyz.ljones.Asusd")?
.build()? .build()?,
); );
} }
return Ok(ctrl); return Ok(ctrl);
@@ -110,7 +110,7 @@ where
pub async fn find_iface_async<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>> pub async fn find_iface_async<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>>
where where
T: zbus::proxy::ProxyImpl<'static> + From<zbus::Proxy<'static>> T: zbus::proxy::ProxyImpl<'static> + From<zbus::Proxy<'static>>,
{ {
let conn = zbus::Connection::system().await.unwrap(); let conn = zbus::Connection::system().await.unwrap();
let f = zbus::fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/") let f = zbus::fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/")
@@ -140,7 +140,7 @@ where
.path(path.clone())? .path(path.clone())?
.destination("xyz.ljones.Asusd")? .destination("xyz.ljones.Asusd")?
.build() .build()
.await? .await?,
); );
} }
return Ok(ctrl); return Ok(ctrl);

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: 2025-02-10 09:04+0000\n" "POT-Creation-Date: 2025-02-14 03:05+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"

4
rog-dbus/src/lib.rs
View File

@@ -54,7 +54,7 @@ pub async fn has_iface(iface: &str) -> Result<bool, Box<dyn std::error::Error>>
pub async fn find_iface_async<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>> pub async fn find_iface_async<T>(iface_name: &str) -> Result<Vec<T>, Box<dyn std::error::Error>>
where where
T: ProxyImpl<'static> + From<zbus::Proxy<'static>> T: ProxyImpl<'static> + From<zbus::Proxy<'static>>,
{ {
let conn = zbus::Connection::system().await?; let conn = zbus::Connection::system().await?;
let f = zbus::fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/").await?; let f = zbus::fdo::ObjectManagerProxy::new(&conn, "xyz.ljones.Asusd", "/").await?;
@@ -82,7 +82,7 @@ where
.path(path.clone())? .path(path.clone())?
.destination("xyz.ljones.Asusd")? .destination("xyz.ljones.Asusd")?
.build() .build()
.await? .await?,
); );
} }
return Ok(ctrl); return Ok(ctrl);

2
rog-dbus/src/zbus_fan_curves.rs
View File

@@ -57,6 +57,6 @@ pub trait FanCurves {
&self, &self,
profile: PlatformProfile, profile: PlatformProfile,
fan: FanCurvePU, fan: FanCurvePU,
enabled: bool enabled: bool,
) -> zbus::Result<()>; ) -> zbus::Result<()>;
} }

2
rog-dbus/src/zbus_platform.rs
View File

@@ -84,7 +84,7 @@ pub trait Platform {
#[zbus(property)] #[zbus(property)]
fn set_platform_profile_on_battery( fn set_platform_profile_on_battery(
&self, &self,
platform_profile: PlatformProfile platform_profile: PlatformProfile,
) -> zbus::Result<()>; ) -> zbus::Result<()>;
/// ChangeThrottlePolicyOnAc property /// ChangeThrottlePolicyOnAc property

8
rog-platform/examples/ally-gamepad-calibration.rs
View File

@@ -10,7 +10,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
usb_node = Some(node); usb_node = Some(node);
println!("Looked for keyboard controller 0x{}: Found", id); println!("Looked for keyboard controller 0x{}: Found", id);
} }
Err(err) => println!("Looked for keyboard controller: {err}") Err(err) => println!("Looked for keyboard controller: {err}"),
} }
if usb_node.is_none() { if usb_node.is_none() {
@@ -24,7 +24,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00,
]; ];
let x_stable = 2107; let x_stable = 2107;
@@ -72,7 +72,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
]; ];
node.write_bytes(&packet)?; node.write_bytes(&packet)?;
} }
@@ -82,7 +82,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00 0x00, 0x00, 0x00, 0x00,
]; ];
node.write_bytes(&packet)?; node.write_bytes(&packet)?;

16
rog-platform/examples/ally-gamepad-mode-changes.rs
View File

@@ -12,7 +12,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
usb_node = Some(node); usb_node = Some(node);
println!("Looked for keyboard controller 0x{}: Found", id); println!("Looked for keyboard controller 0x{}: Found", id);
} }
Err(err) => println!("Looked for keyboard controller: {err}") Err(err) => println!("Looked for keyboard controller: {err}"),
} }
if usb_node.is_none() { if usb_node.is_none() {
@@ -24,31 +24,31 @@ pub fn main() -> Result<(), Box<dyn Error>> {
// node.write_bytes(&[0x5a, 0xd1, 0x0a, 0x01])?; // TODO: need to CHECK // node.write_bytes(&[0x5a, 0xd1, 0x0a, 0x01])?; // TODO: need to CHECK
println!("Set mouse mode for 10 seconds"); println!("Set mouse mode for 10 seconds");
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x01, 0x01, 0x03 0x5a, 0xd1, 0x01, 0x01, 0x03,
])?; ])?;
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x0f, 0x20 0x5a, 0xd1, 0x0f, 0x20,
])?; ])?;
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x01, 0x01, 0x00 0x5a, 0xd1, 0x01, 0x01, 0x00,
])?; ])?;
sleep(Duration::from_secs(10)); sleep(Duration::from_secs(10));
println!("Set wasd mode for 10 seconds"); println!("Set wasd mode for 10 seconds");
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x01, 0x01, 0x02 0x5a, 0xd1, 0x01, 0x01, 0x02,
])?; ])?;
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x0f, 0x20 0x5a, 0xd1, 0x0f, 0x20,
])?; ])?;
sleep(Duration::from_secs(10)); sleep(Duration::from_secs(10));
println!("Set back to gamepad mode"); println!("Set back to gamepad mode");
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x01, 0x01, 0x01 0x5a, 0xd1, 0x01, 0x01, 0x01,
])?; ])?;
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x0f, 0x20 0x5a, 0xd1, 0x0f, 0x20,
])?; ])?;
Ok(()) Ok(())

8
rog-platform/examples/ally-set-qam-secondary.rs
View File

@@ -10,7 +10,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
usb_node = Some(node); usb_node = Some(node);
println!("Looked for keyboard controller 0x{}: Found", id); println!("Looked for keyboard controller 0x{}: Found", id);
} }
Err(err) => println!("Looked for keyboard controller: {err}") Err(err) => println!("Looked for keyboard controller: {err}"),
} }
if usb_node.is_none() { if usb_node.is_none() {
@@ -22,13 +22,13 @@ pub fn main() -> Result<(), Box<dyn Error>> {
// node.write_bytes(&[0x5a, 0xd1, 0x0a, 0x01])?; // TODO: need to CHECK // node.write_bytes(&[0x5a, 0xd1, 0x0a, 0x01])?; // TODO: need to CHECK
println!("Set mouse mode for 10 seconds"); println!("Set mouse mode for 10 seconds");
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x01, 0x01, 0x03 0x5a, 0xd1, 0x01, 0x01, 0x03,
])?; ])?;
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x0f, 0x20 0x5a, 0xd1, 0x0f, 0x20,
])?; ])?;
node.write_bytes(&[ node.write_bytes(&[
0x5a, 0xd1, 0x01, 0x01, 0x00 0x5a, 0xd1, 0x01, 0x01, 0x00,
])?; ])?;
// sleep(Duration::from_secs(10)); // sleep(Duration::from_secs(10));

24
rog-platform/src/asus_armoury.rs
View File

@@ -38,7 +38,7 @@ pub enum AttrValue {
EnumInt(Vec<i32>), EnumInt(Vec<i32>),
EnumStr(Vec<String>), EnumStr(Vec<String>),
#[default] #[default]
None None,
} }
#[derive(Debug, Default, Clone)] #[derive(Debug, Default, Clone)]
@@ -50,7 +50,7 @@ pub struct Attribute {
min_value: AttrValue, min_value: AttrValue,
max_value: AttrValue, max_value: AttrValue,
scalar_increment: AttrValue, scalar_increment: AttrValue,
base_path: PathBuf base_path: PathBuf,
} }
impl Attribute { impl Attribute {
@@ -72,7 +72,7 @@ impl Attribute {
Ok(AttrValue::String(val)) Ok(AttrValue::String(val))
} }
} }
Err(e) => Err(e) Err(e) => Err(e),
} }
} }
@@ -92,7 +92,7 @@ impl Attribute {
let value_str = match new_value { let value_str = match new_value {
AttrValue::Integer(val) => &val.to_string(), AttrValue::Integer(val) => &val.to_string(),
AttrValue::String(val) => val, AttrValue::String(val) => val,
_ => return Err(PlatformError::InvalidValue) _ => return Err(PlatformError::InvalidValue),
}; };
let mut file = OpenOptions::new().write(true).open(&path)?; let mut file = OpenOptions::new().write(true).open(&path)?;
@@ -128,7 +128,7 @@ impl Attribute {
/// change, if they do then it is possibly a driver issue - although this is /// change, if they do then it is possibly a driver issue - although this is
/// subject to `firmware_attributes` class changes in kernel. /// subject to `firmware_attributes` class changes in kernel.
fn read_base_values( fn read_base_values(
base_path: &Path base_path: &Path,
) -> (AttrValue, AttrValue, AttrValue, AttrValue, AttrValue) { ) -> (AttrValue, AttrValue, AttrValue, AttrValue, AttrValue) {
let default_value = match read_string(&base_path.join("default_value")) { let default_value = match read_string(&base_path.join("default_value")) {
Ok(val) => { Ok(val) => {
@@ -138,7 +138,7 @@ impl Attribute {
AttrValue::String(val) AttrValue::String(val)
} }
} }
Err(_) => AttrValue::None Err(_) => AttrValue::None,
}; };
let possible_values = match read_string(&base_path.join("possible_values")) { let possible_values = match read_string(&base_path.join("possible_values")) {
@@ -151,7 +151,7 @@ impl Attribute {
AttrValue::EnumStr(val.split(';').map(|s| s.to_string()).collect()) AttrValue::EnumStr(val.split(';').map(|s| s.to_string()).collect())
} }
} }
Err(_) => AttrValue::None Err(_) => AttrValue::None,
}; };
let min_value = read_i32(&base_path.join("min_value")) let min_value = read_i32(&base_path.join("min_value"))
@@ -168,7 +168,7 @@ impl Attribute {
.unwrap_or_default(); .unwrap_or_default();
( (
default_value, possible_values, min_value, max_value, scalar_increment default_value, possible_values, min_value, max_value, scalar_increment,
) )
} }
@@ -194,7 +194,7 @@ impl Attribute {
#[derive(Clone)] #[derive(Clone)]
pub struct FirmwareAttributes { pub struct FirmwareAttributes {
attrs: Vec<Attribute> attrs: Vec<Attribute>,
} }
#[allow(clippy::new_without_default)] #[allow(clippy::new_without_default)]
@@ -221,7 +221,7 @@ impl FirmwareAttributes {
min_value, min_value,
max_value, max_value,
scalar_increment, scalar_increment,
base_path base_path,
}); });
} }
} }
@@ -305,7 +305,7 @@ pub enum FirmwareAttribute {
MiniLedMode = 22, MiniLedMode = 22,
PendingReboot = 23, PendingReboot = 23,
PptEnabled = 24, PptEnabled = 24,
None = 25 None = 25,
} }
impl FirmwareAttribute { impl FirmwareAttribute {
@@ -395,7 +395,7 @@ impl From<FirmwareAttribute> for &str {
FirmwareAttribute::GpuMuxMode => "gpu_mux_mode", FirmwareAttribute::GpuMuxMode => "gpu_mux_mode",
FirmwareAttribute::MiniLedMode => "mini_led_mode", FirmwareAttribute::MiniLedMode => "mini_led_mode",
FirmwareAttribute::PendingReboot => "pending_reboot", FirmwareAttribute::PendingReboot => "pending_reboot",
FirmwareAttribute::None => "none" FirmwareAttribute::None => "none",
} }
} }
} }

24
rog-platform/src/cpu.rs
View File

@@ -18,7 +18,7 @@ const ATTR_EPP: &str = "cpufreq/energy_performance_preference";
/// which can drastically alter CPU performance. /// which can drastically alter CPU performance.
#[derive(Debug, PartialEq, Eq, PartialOrd, Clone)] #[derive(Debug, PartialEq, Eq, PartialOrd, Clone)]
pub struct CPUControl { pub struct CPUControl {
paths: Vec<PathBuf> paths: Vec<PathBuf>,
} }
impl CPUControl { impl CPUControl {
@@ -54,7 +54,7 @@ impl CPUControl {
} }
match device.attribute_value(ATTR_GOVERNOR) { match device.attribute_value(ATTR_GOVERNOR) {
Some(g) => info!("{ATTR_GOVERNOR}: {g:?}"), Some(g) => info!("{ATTR_GOVERNOR}: {g:?}"),
None => return Err(PlatformError::CPU(format!("{ATTR_GOVERNOR} not found"))) None => return Err(PlatformError::CPU(format!("{ATTR_GOVERNOR} not found"))),
} }
match device.attribute_value(ATTR_AVAILABLE_EPP) { match device.attribute_value(ATTR_AVAILABLE_EPP) {
Some(g) => info!("{ATTR_AVAILABLE_EPP}: {g:?}"), Some(g) => info!("{ATTR_AVAILABLE_EPP}: {g:?}"),
@@ -66,7 +66,7 @@ impl CPUControl {
} }
match device.attribute_value(ATTR_EPP) { match device.attribute_value(ATTR_EPP) {
Some(g) => info!("{ATTR_EPP}: {g:?}"), Some(g) => info!("{ATTR_EPP}: {g:?}"),
None => return Err(PlatformError::CPU(format!("{ATTR_EPP} not found"))) None => return Err(PlatformError::CPU(format!("{ATTR_EPP} not found"))),
} }
supported = true; supported = true;
} }
@@ -77,7 +77,7 @@ impl CPUControl {
} }
if cpu.paths.is_empty() { if cpu.paths.is_empty() {
return Err(PlatformError::MissingFunction( return Err(PlatformError::MissingFunction(
"asus-nb-wmi not found".into() "asus-nb-wmi not found".into(),
)); ));
} }
Ok(cpu) Ok(cpu)
@@ -154,7 +154,7 @@ impl CPUControl {
pub enum CPUGovernor { pub enum CPUGovernor {
Performance = 0, Performance = 0,
Powersave = 1, Powersave = 1,
BadValue = 2 BadValue = 2,
} }
impl From<&str> for CPUGovernor { impl From<&str> for CPUGovernor {
@@ -162,7 +162,7 @@ impl From<&str> for CPUGovernor {
match s { match s {
"performance" => Self::Performance, "performance" => Self::Performance,
"powersave" => Self::Powersave, "powersave" => Self::Powersave,
_ => Self::BadValue _ => Self::BadValue,
} }
} }
} }
@@ -172,7 +172,7 @@ impl From<CPUGovernor> for String {
match g { match g {
CPUGovernor::Performance => "performance".to_string(), CPUGovernor::Performance => "performance".to_string(),
CPUGovernor::Powersave => "powersave".to_string(), CPUGovernor::Powersave => "powersave".to_string(),
CPUGovernor::BadValue => "bad_value".to_string() CPUGovernor::BadValue => "bad_value".to_string(),
} }
} }
} }
@@ -198,7 +198,7 @@ pub enum CPUEPP {
Performance = 1, Performance = 1,
BalancePerformance = 2, BalancePerformance = 2,
BalancePower = 3, BalancePower = 3,
Power = 4 Power = 4,
} }
impl From<PlatformProfile> for CPUEPP { impl From<PlatformProfile> for CPUEPP {
@@ -206,7 +206,7 @@ impl From<PlatformProfile> for CPUEPP {
match value { match value {
PlatformProfile::Balanced => CPUEPP::BalancePerformance, PlatformProfile::Balanced => CPUEPP::BalancePerformance,
PlatformProfile::Performance => CPUEPP::Performance, PlatformProfile::Performance => CPUEPP::Performance,
PlatformProfile::Quiet => CPUEPP::Power PlatformProfile::Quiet => CPUEPP::Power,
} }
} }
} }
@@ -219,7 +219,7 @@ impl From<&str> for CPUEPP {
"balance_performance" => Self::BalancePerformance, "balance_performance" => Self::BalancePerformance,
"balance_power" => Self::BalancePower, "balance_power" => Self::BalancePower,
"power" => Self::Power, "power" => Self::Power,
_ => Self::Default _ => Self::Default,
} }
} }
} }
@@ -231,7 +231,7 @@ impl From<CPUEPP> for String {
CPUEPP::Performance => "performance".to_string(), CPUEPP::Performance => "performance".to_string(),
CPUEPP::BalancePerformance => "balance_performance".to_string(), CPUEPP::BalancePerformance => "balance_performance".to_string(),
CPUEPP::BalancePower => "balance_power".to_string(), CPUEPP::BalancePower => "balance_power".to_string(),
CPUEPP::Power => "power".to_string() CPUEPP::Power => "power".to_string(),
} }
} }
} }
@@ -244,7 +244,7 @@ impl From<i32> for CPUEPP {
2 => Self::BalancePerformance, 2 => Self::BalancePerformance,
3 => Self::BalancePower, 3 => Self::BalancePower,
4 => Self::Power, 4 => Self::Power,
_ => Self::Default _ => Self::Default,
} }
} }
} }

6
rog-platform/src/error.rs
View File

@@ -22,7 +22,7 @@ pub enum PlatformError {
InvalidValue, InvalidValue,
NoAuraKeyboard, NoAuraKeyboard,
NoAuraNode, NoAuraNode,
CPU(String) CPU(String),
} }
impl fmt::Display for PlatformError { impl fmt::Display for PlatformError {
@@ -52,7 +52,7 @@ impl fmt::Display for PlatformError {
PlatformError::IoPath(path, detail) => write!(f, "{} {}", path, detail), PlatformError::IoPath(path, detail) => write!(f, "{} {}", path, detail),
PlatformError::NoAuraKeyboard => write!(f, "No supported Aura keyboard"), PlatformError::NoAuraKeyboard => write!(f, "No supported Aura keyboard"),
PlatformError::NoAuraNode => write!(f, "No Aura keyboard node found"), PlatformError::NoAuraNode => write!(f, "No Aura keyboard node found"),
PlatformError::CPU(s) => write!(f, "CPU control: {s}") PlatformError::CPU(s) => write!(f, "CPU control: {s}"),
} }
} }
} }
@@ -76,7 +76,7 @@ impl From<PlatformError> for FdoErr {
log::error!("PlatformError: got: {error}"); log::error!("PlatformError: got: {error}");
match error { match error {
PlatformError::NotSupported => FdoErr::NotSupported("".to_owned()), PlatformError::NotSupported => FdoErr::NotSupported("".to_owned()),
_ => FdoErr::Failed(format!("Failed with {error}")) _ => FdoErr::Failed(format!("Failed with {error}")),
} }
} }
} }

8
rog-platform/src/hid_raw.rs
View File

@@ -19,7 +19,7 @@ pub struct HidRaw {
prod_id: String, prod_id: String,
_device_bcd: u32, _device_bcd: u32,
/// Retaining a handle to the file for the duration of `HidRaw` /// Retaining a handle to the file for the duration of `HidRaw`
file: RefCell<File> file: RefCell<File>,
} }
impl HidRaw { impl HidRaw {
@@ -66,7 +66,7 @@ impl HidRaw {
.unwrap_or_default() .unwrap_or_default()
.to_string_lossy() .to_string_lossy()
.parse() .parse()
.unwrap_or_default() .unwrap_or_default(),
}); });
} }
} }
@@ -98,13 +98,13 @@ impl HidRaw {
.unwrap_or_default() .unwrap_or_default()
.to_string_lossy() .to_string_lossy()
.parse() .parse()
.unwrap_or_default() .unwrap_or_default(),
}); });
} }
} }
} }
Err(PlatformError::MissingFunction( Err(PlatformError::MissingFunction(
"hidraw dev no dev path".to_string() "hidraw dev no dev path".to_string(),
)) ))
} }

6
rog-platform/src/keyboard_led.rs
View File

@@ -10,7 +10,7 @@ use crate::{attr_u8, has_attr, set_attr_u8_array, to_device};
/// for Aura keyboards /// for Aura keyboards
#[derive(Debug, Default, PartialEq, Eq, PartialOrd, Clone)] #[derive(Debug, Default, PartialEq, Eq, PartialOrd, Clone)]
pub struct KeyboardBacklight { pub struct KeyboardBacklight {
path: PathBuf path: PathBuf,
} }
impl KeyboardBacklight { impl KeyboardBacklight {
@@ -51,12 +51,12 @@ impl KeyboardBacklight {
if sys.contains("kbd_backlight") || sys.contains("ally:rgb:gamepad") { if sys.contains("kbd_backlight") || sys.contains("ally:rgb:gamepad") {
info!("Found keyboard LED controls at {:?}", device.sysname()); info!("Found keyboard LED controls at {:?}", device.sysname());
return Ok(Self { return Ok(Self {
path: device.syspath().to_owned() path: device.syspath().to_owned(),
}); });
} }
} }
Err(PlatformError::MissingFunction( Err(PlatformError::MissingFunction(
"KeyboardLed:new(), asus::kbd_backlight not found".into() "KeyboardLed:new(), asus::kbd_backlight not found".into(),
)) ))
} }
} }

2
rog-platform/src/lib.rs
View File

@@ -112,7 +112,7 @@ mod tests {
#[test] #[test]
fn check() { fn check() {
let data = [ let data = [
1, 2, 3, 4, 5 1, 2, 3, 4, 5,
]; ];
let mut tmp = String::new(); let mut tmp = String::new();
for n in data { for n in data {

28
rog-platform/src/platform.rs
View File

@@ -20,7 +20,7 @@ use crate::{attr_string, to_device};
#[derive(Debug, PartialEq, Eq, PartialOrd, Clone)] #[derive(Debug, PartialEq, Eq, PartialOrd, Clone)]
pub struct RogPlatform { pub struct RogPlatform {
path: PathBuf, path: PathBuf,
pp_path: PathBuf pp_path: PathBuf,
} }
impl RogPlatform { impl RogPlatform {
@@ -53,11 +53,11 @@ impl RogPlatform {
info!("Found platform support at {:?}", device.sysname()); info!("Found platform support at {:?}", device.sysname());
return Ok(Self { return Ok(Self {
path: device.syspath().to_owned(), path: device.syspath().to_owned(),
pp_path: PathBuf::from_str("/sys/firmware/acpi").unwrap() pp_path: PathBuf::from_str("/sys/firmware/acpi").unwrap(),
}); });
} }
Err(PlatformError::MissingFunction( Err(PlatformError::MissingFunction(
"asus-nb-wmi not found".into() "asus-nb-wmi not found".into(),
)) ))
} }
} }
@@ -67,7 +67,7 @@ impl Default for RogPlatform {
unsafe { unsafe {
Self { Self {
path: PathBuf::from_str("/this_shouldNeVErr_exisid").unwrap_unchecked(), path: PathBuf::from_str("/this_shouldNeVErr_exisid").unwrap_unchecked(),
pp_path: PathBuf::from_str("/this_shouldNeVErr_exisid").unwrap_unchecked() pp_path: PathBuf::from_str("/this_shouldNeVErr_exisid").unwrap_unchecked(),
} }
} }
} }
@@ -85,7 +85,7 @@ pub enum GpuMode {
Ultimate = 4, Ultimate = 4,
#[default] #[default]
Error = 254, Error = 254,
NotSupported = 255 NotSupported = 255,
} }
impl From<u8> for GpuMode { impl From<u8> for GpuMode {
@@ -97,7 +97,7 @@ impl From<u8> for GpuMode {
3 => GpuMode::Vfio, 3 => GpuMode::Vfio,
4 => GpuMode::Ultimate, 4 => GpuMode::Ultimate,
5 => GpuMode::Error, 5 => GpuMode::Error,
_ => GpuMode::NotSupported _ => GpuMode::NotSupported,
} }
} }
} }
@@ -164,7 +164,7 @@ impl Display for GpuMode {
GpuMode::Vfio => write!(f, "VFIO"), GpuMode::Vfio => write!(f, "VFIO"),
GpuMode::Ultimate => write!(f, "Ultimate"), GpuMode::Ultimate => write!(f, "Ultimate"),
GpuMode::Error => write!(f, "Error"), GpuMode::Error => write!(f, "Error"),
GpuMode::NotSupported => write!(f, "Not Supported") GpuMode::NotSupported => write!(f, "Not Supported"),
} }
} }
} }
@@ -191,7 +191,7 @@ pub enum PlatformProfile {
#[default] #[default]
Balanced = 0, Balanced = 0,
Performance = 1, Performance = 1,
Quiet = 2 Quiet = 2,
} }
impl PlatformProfile { impl PlatformProfile {
@@ -199,7 +199,7 @@ impl PlatformProfile {
match self { match self {
Self::Balanced => Self::Performance, Self::Balanced => Self::Performance,
Self::Performance => Self::Quiet, Self::Performance => Self::Quiet,
Self::Quiet => Self::Balanced Self::Quiet => Self::Balanced,
} }
} }
@@ -207,7 +207,7 @@ impl PlatformProfile {
[ [
Self::Balanced, Self::Balanced,
Self::Performance, Self::Performance,
Self::Quiet Self::Quiet,
] ]
} }
} }
@@ -237,7 +237,7 @@ impl From<PlatformProfile> for u8 {
match p { match p {
PlatformProfile::Balanced => 0, PlatformProfile::Balanced => 0,
PlatformProfile::Performance => 1, PlatformProfile::Performance => 1,
PlatformProfile::Quiet => 2 PlatformProfile::Quiet => 2,
} }
} }
} }
@@ -253,7 +253,7 @@ impl From<PlatformProfile> for &str {
match profile { match profile {
PlatformProfile::Balanced => "balanced", PlatformProfile::Balanced => "balanced",
PlatformProfile::Performance => "performance", PlatformProfile::Performance => "performance",
PlatformProfile::Quiet => "quiet" PlatformProfile::Quiet => "quiet",
} }
} }
} }
@@ -288,7 +288,7 @@ impl std::str::FromStr for PlatformProfile {
"performance" => Ok(PlatformProfile::Performance), "performance" => Ok(PlatformProfile::Performance),
"quiet" => Ok(PlatformProfile::Quiet), "quiet" => Ok(PlatformProfile::Quiet),
"low-power" => Ok(PlatformProfile::Quiet), "low-power" => Ok(PlatformProfile::Quiet),
_ => Err(PlatformError::NotSupported) _ => Err(PlatformError::NotSupported),
} }
} }
} }
@@ -311,5 +311,5 @@ pub enum Properties {
PanelOd, PanelOd,
MiniLedMode, MiniLedMode,
EgpuEnable, EgpuEnable,
ThrottlePolicy ThrottlePolicy,
} }

6
rog-platform/src/power.rs
View File

@@ -16,7 +16,7 @@ use crate::{attr_u8, to_device};
pub struct AsusPower { pub struct AsusPower {
mains: PathBuf, mains: PathBuf,
battery: PathBuf, battery: PathBuf,
usb: Option<PathBuf> usb: Option<PathBuf>,
} }
impl AsusPower { impl AsusPower {
@@ -97,12 +97,12 @@ impl AsusPower {
return Ok(Self { return Ok(Self {
mains, mains,
battery, battery,
usb usb,
}); });
} }
Err(PlatformError::MissingFunction( Err(PlatformError::MissingFunction(
"Did not find a battery".to_owned() "Did not find a battery".to_owned(),
)) ))
} }
} }

4
rog-platform/src/usb_raw.rs
View File

@@ -24,7 +24,7 @@ impl USBRaw {
} }
fn get_dev_handle( fn get_dev_handle(
device: &Device<rusb::GlobalContext> device: &Device<rusb::GlobalContext>,
) -> Result<DeviceHandle<rusb::GlobalContext>> { ) -> Result<DeviceHandle<rusb::GlobalContext>> {
// We don't expect this ID to ever change // We don't expect this ID to ever change
let device = device.open()?; let device = device.open()?;
@@ -42,7 +42,7 @@ impl USBRaw {
0x35e, // value 0x35e, // value
0x00, // index 0x00, // index
message, message,
Duration::from_millis(200) Duration::from_millis(200),
) )
.map_err(PlatformError::USB) .map_err(PlatformError::USB)
} }

4
rog-profiles/src/error.rs
View File

@@ -16,7 +16,7 @@ pub enum ProfileError {
/// (pwm/temp, prev, next) /// (pwm/temp, prev, next)
ParseFanCurvePrevHigher(&'static str, u8, u8), ParseFanCurvePrevHigher(&'static str, u8, u8),
ParseFanCurvePercentOver100(u8), ParseFanCurvePercentOver100(u8),
NotEnoughPoints // Zbus(zbus::Error), NotEnoughPoints, // Zbus(zbus::Error),
} }
impl fmt::Display for ProfileError { impl fmt::Display for ProfileError {
@@ -60,7 +60,7 @@ impl From<ProfileError> for FdoErr {
error!("ProfileError: got: {error}"); error!("ProfileError: got: {error}");
match error { match error {
ProfileError::NotSupported => FdoErr::NotSupported("".to_owned()), ProfileError::NotSupported => FdoErr::NotSupported("".to_owned()),
_ => FdoErr::Failed(format!("Failed with {error}")) _ => FdoErr::Failed(format!("Failed with {error}")),
} }
} }
} }

8
rog-profiles/src/fan_curve_set.rs
View File

@@ -36,7 +36,7 @@ pub struct CurveData {
pub fan: FanCurvePU, pub fan: FanCurvePU,
pub pwm: [u8; 8], pub pwm: [u8; 8],
pub temp: [u8; 8], pub temp: [u8; 8],
pub enabled: bool pub enabled: bool,
} }
impl From<&CurveData> for String { impl From<&CurveData> for String {
@@ -99,7 +99,7 @@ impl std::str::FromStr for CurveData {
if select == 0 { if select == 0 {
if temp_prev > r { if temp_prev > r {
return Err(ProfileError::ParseFanCurvePrevHigher( return Err(ProfileError::ParseFanCurvePrevHigher(
"temperature", temp_prev, r "temperature", temp_prev, r,
)); ));
} }
temp_prev = r; temp_prev = r;
@@ -114,7 +114,7 @@ impl std::str::FromStr for CurveData {
} }
if pwm_prev > p { if pwm_prev > p {
return Err(ProfileError::ParseFanCurvePrevHigher( return Err(ProfileError::ParseFanCurvePrevHigher(
"percentage", pwm_prev, p "percentage", pwm_prev, p,
)); ));
} }
pwm_prev = p; pwm_prev = p;
@@ -126,7 +126,7 @@ impl std::str::FromStr for CurveData {
fan: FanCurvePU::CPU, fan: FanCurvePU::CPU,
pwm, pwm,
temp, temp,
enabled: false enabled: false,
}) })
} }
} }

Some files were not shown because too many files have changed in this diff Show More