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

daemon: revert zbus to 1.9.1 in daemon

Browse Source
This commit is contained in:
Luke D Jones
2021-04-07 15:05:26 +12:00
parent 9b4ed6eb62
commit 2af33a0416
18 changed files with 125 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asusctl/examples/animatrix-gif.rs
View File

@@ -1,6 +1,6 @@
use std::{env, path::Path, thread::sleep};
use rog_anime::AniMeSequence;
use rog_anime::AniMeBlock;
use rog_dbus::AuraDbusClient;
fn main() {
@@ -14,7 +14,7 @@ fn main() {
let path = Path::new(&args[1]);
let brightness = args[2].parse::<f32>().unwrap();
let gif = AniMeSequence::gif(path, brightness).unwrap();
let gif = AniMeBlock::asus_gif(path, brightness).unwrap();
loop {
for frame in gif.get_animation().unwrap().frames() {

22
asusctl/examples/animatrix-png-gif.rs
View File

@@ -1,20 +1,30 @@
use std::{env, path::Path, thread::sleep};
use rog_anime::AniMeSequence;
use glam::Vec2;
use rog_anime::AniMeBlock;
use rog_dbus::AuraDbusClient;
fn main() {
let (client, _) = AuraDbusClient::new().unwrap();
let args: Vec<String> = env::args().into_iter().collect();
if args.len() != 3 {
println!("Please supply filepath and brightness");
if args.len() != 7 {
println!("Usage: <filepath> <scale> <angle> <x pos> <y pos> <brightness>");
println!("e.g, asusctl/examples/file.gif 0.9 0.4 0.0 0.0 0.8");
return;
}
let path = Path::new(&args[1]);
let brightness = args[2].parse::<f32>().unwrap();
let gif = AniMeSequence::png_gif(path, brightness).unwrap();
let gif = AniMeBlock::image_gif(
Path::new(&args[1]),
args[2].parse::<f32>().unwrap(),
args[3].parse::<f32>().unwrap(),
Vec2::new(
args[4].parse::<f32>().unwrap(),
args[5].parse::<f32>().unwrap(),
),
args[6].parse::<f32>().unwrap(),
)
.unwrap();
loop {
for frame in gif.get_animation().unwrap().frames() {

17
asusctl/examples/animatrix-png.rs
View File

@@ -9,24 +9,21 @@ fn main() -> Result<(), Box<dyn Error>> {
let (client, _) = AuraDbusClient::new().unwrap();
let args: Vec<String> = env::args().into_iter().collect();
if args.len() != 8 {
println!("Usage: <filepath> <x scale> <y scale> <angle> <x pos> <y pos> <brightness>");
println!("e.g, asusctl/examples/doom_large.png 0.9 0.9 0.4 0.0 0.0,0.8");
if args.len() != 7 {
println!("Usage: <filepath> <scale> <angle> <x pos> <y pos> <brightness>");
println!("e.g, asusctl/examples/doom_large.png 0.9 0.4 0.0 0.0 0.8");
exit(-1);
}
let matrix = AniMeImage::from_png(
Path::new(&args[1]),
args[2].parse::<f32>().unwrap(),
args[3].parse::<f32>().unwrap(),
Vec2::new(
args[2].parse::<f32>().unwrap(),
args[3].parse::<f32>().unwrap(),
),
args[4].parse::<f32>().unwrap(),
Vec2::new(
args[4].parse::<f32>().unwrap(),
args[5].parse::<f32>().unwrap(),
args[6].parse::<f32>().unwrap(),
),
args[7].parse::<f32>().unwrap(),
args[6].parse::<f32>().unwrap(),
)?;
client

18
asusctl/examples/animatrix-spinning.rs
View File

@@ -11,25 +11,21 @@ fn main() -> Result<(), Box<dyn Error>> {
let (client, _) = AuraDbusClient::new().unwrap();
let args: Vec<String> = env::args().into_iter().collect();
if args.len() != 8 {
println!("Usage: <filepath> <x scale> <y scale> <angle> <x pos> <y pos> <brightness>");
println!("e.g, asusctl/examples/doom_large.bmp 0.9 0.9 0.4 0.0 0.0, 0.8");
println!("All args except path and fineness are floats");
if args.len() != 7 {
println!("Usage: <filepath> <scale> <angle> <x pos> <y pos> <brightness>");
println!("e.g, asusctl/examples/doom_large.png 0.9 0.4 0.0 0.0 0.8");
exit(-1);
}
let mut matrix = AniMeImage::from_png(
Path::new(&args[1]),
args[2].parse::<f32>().unwrap(),
args[3].parse::<f32>().unwrap(),
Vec2::new(
args[2].parse::<f32>().unwrap(),
args[3].parse::<f32>().unwrap(),
),
args[4].parse::<f32>().unwrap(),
Vec2::new(
args[4].parse::<f32>().unwrap(),
args[5].parse::<f32>().unwrap(),
args[6].parse::<f32>().unwrap(),
),
args[7].parse::<f32>().unwrap(),
args[6].parse::<f32>().unwrap(),
)?;
loop {

2
asusctl/src/main.rs
View File

@@ -177,7 +177,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let matrix = AniMeImage::from_png(
Path::new(&image.path),
Vec2::new(image.scale, image.scale),
image.scale,
image.angle,
Vec2::new(image.x_pos, image.y_pos),
image.bright,