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

ridiculous refactor to allow enums to be dbus strings for better TS generation

Browse Source
This commit is contained in:
Luke D. Jones
2023-06-27 21:16:13 +12:00
parent fca7d23a31
commit 7b17a13ce7
43 changed files with 1516 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
use std::collections::BTreeMap;
use rog_aura::usb::{AuraDev19b6, AuraDevice, AuraPowerDev};
use rog_aura::usb::{AuraDevRog2, AuraDevice, AuraPowerDev};
use rog_aura::{AuraEffect, AuraModeNum, AuraZone};
use rog_platform::platform::GpuMode;
use rog_platform::supported::{
@@ -192,10 +192,10 @@ impl Led {
tuf: vec![],
x1866: vec![],
x19b6: vec![
AuraDev19b6::BootKeyb,
AuraDev19b6::AwakeKeyb,
AuraDev19b6::SleepLogo,
AuraDev19b6::AwakeLogo,
AuraDevRog2::BootKeyb,
AuraDevRog2::AwakeKeyb,
AuraDevRog2::SleepLogo,
AuraDevRog2::AwakeLogo,
],
})
}
@@ -241,7 +241,7 @@ impl Supported {
fan_curves: true,
},
keyboard_led: LedSupportedFunctions {
dev_id: AuraDevice::X19B6,
dev_id: AuraDevice::X19b6,
brightness: true,
basic_modes: vec![
AuraModeNum::Rain,
@@ -266,6 +266,7 @@ impl Supported {
gpu_mux: true,
panel_overdrive: true,
dgpu_disable: true,
mini_led_mode: true,
egpu_enable: true,
},
})

22
rog-control-center/src/pages/aura_page.rs
View File

@@ -22,7 +22,7 @@ impl RogApp {
let green = oscillator2.load(Ordering::SeqCst) as u32;
let blue = oscillator3.load(Ordering::SeqCst) as u32;
states.aura.nudge_wave(red as u8, green as u8, blue as u8);
// let osc = c.0 * 255 / osc;
// let osc = c.r * 255 / osc;
let c1 = states
.aura
.modes
@@ -37,25 +37,25 @@ impl RogApp {
.unwrap_or(&AuraEffect::default())
.colour2;
let mut colour = Color32::from_rgb(c1.0, c1.1, c1.2);
let mut colour = Color32::from_rgb(c1.r, c1.g, c1.b);
if states.aura.current_mode == AuraModeNum::Pulse {
colour = Color32::from_rgb(
(red * c1.0 as u32 / 100) as u8,
(red * c1.1 as u32 / 100) as u8,
(red * c1.2 as u32 / 100) as u8,
(red * c1.r as u32 / 100) as u8,
(red * c1.g as u32 / 100) as u8,
(red * c1.b as u32 / 100) as u8,
);
} else if states.aura.current_mode == AuraModeNum::Breathe {
if self.oscillator_toggle.load(Ordering::SeqCst) {
colour = Color32::from_rgb(
(red * c2.0 as u32 / 100) as u8,
(red * c2.1 as u32 / 100) as u8,
(red * c2.2 as u32 / 100) as u8,
(red * c2.r as u32 / 100) as u8,
(red * c2.g as u32 / 100) as u8,
(red * c2.b as u32 / 100) as u8,
);
} else {
colour = Color32::from_rgb(
(red * c1.0 as u32 / 100) as u8,
(red * c1.1 as u32 / 100) as u8,
(red * c1.2 as u32 / 100) as u8,
(red * c1.r as u32 / 100) as u8,
(red * c1.g as u32 / 100) as u8,
(red * c1.b as u32 / 100) as u8,
);
}
} else if states.aura.current_mode == AuraModeNum::Strobe {