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

Refactor, rename, organise rog-aura stuff better

Browse Source
This commit is contained in:
Luke D. Jones
2024-04-05 21:20:34 +13:00
parent 4701c019a8
commit 1c729316f7
27 changed files with 770 additions and 974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
asusd/src/ctrl_aura/config.rs
View File

@@ -3,8 +3,8 @@ use std::collections::{BTreeMap, HashSet};
use config_traits::{StdConfig, StdConfigLoad};
use log::{debug, info};
use rog_aura::aura_detection::LaptopLedData;
use rog_aura::power::AuraPower;
use rog_aura::usb::{AuraDevRog1, AuraDevTuf, AuraDevice, AuraPowerDev};
use rog_aura::keyboard::{LaptopAuraPower, LaptopOldAuraPower, LaptopTufAuraPower};
use rog_aura::usb::{AuraDevice, AuraPowerDev};
use rog_aura::{AuraEffect, AuraModeNum, AuraZone, Direction, LedBrightness, Speed, GRADIENT};
use serde_derive::{Deserialize, Serialize};
@@ -13,9 +13,9 @@ use serde_derive::{Deserialize, Serialize};
/// booting.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub enum AuraPowerConfig {
AuraDevTuf(HashSet<AuraDevTuf>),
AuraDevRog1(HashSet<AuraDevRog1>),
AuraDevRog2(AuraPower),
AuraDevTuf(HashSet<LaptopTufAuraPower>),
AuraDevRog1(HashSet<LaptopOldAuraPower>),
AuraDevRog2(LaptopAuraPower),
}
impl Default for AuraPowerConfig {
@@ -30,8 +30,8 @@ impl AuraPowerConfig {
match control {
AuraPowerConfig::AuraDevTuf(_) => [0, 0, 0, 0],
AuraPowerConfig::AuraDevRog1(c) => {
let c: Vec<AuraDevRog1> = c.iter().copied().collect();
AuraDevRog1::to_bytes(&c)
let c: Vec<LaptopOldAuraPower> = c.iter().copied().collect();
LaptopOldAuraPower::to_bytes(&c)
}
AuraPowerConfig::AuraDevRog2(c) => c.to_bytes(),
}
@@ -41,27 +41,27 @@ impl AuraPowerConfig {
if let Self::AuraDevTuf(c) = control {
return Some([
true,
c.contains(&AuraDevTuf::Boot),
c.contains(&AuraDevTuf::Awake),
c.contains(&AuraDevTuf::Sleep),
c.contains(&AuraDevTuf::Keyboard),
c.contains(&LaptopTufAuraPower::Boot),
c.contains(&LaptopTufAuraPower::Awake),
c.contains(&LaptopTufAuraPower::Sleep),
c.contains(&LaptopTufAuraPower::Keyboard),
]);
}
if let Self::AuraDevRog1(c) = control {
return Some([
true,
c.contains(&AuraDevRog1::Boot),
c.contains(&AuraDevRog1::Awake),
c.contains(&AuraDevRog1::Sleep),
c.contains(&AuraDevRog1::Keyboard),
c.contains(&LaptopOldAuraPower::Boot),
c.contains(&LaptopOldAuraPower::Awake),
c.contains(&LaptopOldAuraPower::Sleep),
c.contains(&LaptopOldAuraPower::Keyboard),
]);
}
None
}
pub fn set_tuf(&mut self, power: AuraDevTuf, on: bool) {
pub fn set_tuf(&mut self, power: LaptopTufAuraPower, on: bool) {
if let Self::AuraDevTuf(p) = self {
if on {
p.insert(power);
@@ -71,7 +71,7 @@ impl AuraPowerConfig {
}
}
pub fn set_0x1866(&mut self, power: AuraDevRog1, on: bool) {
pub fn set_0x1866(&mut self, power: LaptopOldAuraPower, on: bool) {
if let Self::AuraDevRog1(p) = self {
if on {
p.insert(power);
@@ -81,7 +81,7 @@ impl AuraPowerConfig {
}
}
pub fn set_0x19b6(&mut self, power: AuraPower) {
pub fn set_0x19b6(&mut self, power: LaptopAuraPower) {
if let Self::AuraDevRog2(p) = self {
*p = power;
}
@@ -151,21 +151,21 @@ impl AuraConfig {
pub fn from_default_support(prod_id: AuraDevice, support_data: &LaptopLedData) -> Self {
// create a default config here
let enabled = if prod_id.is_new_style() {
AuraPowerConfig::AuraDevRog2(AuraPower::new_all_on())
AuraPowerConfig::AuraDevRog2(LaptopAuraPower::new_all_on())
} else if prod_id.is_tuf_style() {
AuraPowerConfig::AuraDevTuf(HashSet::from([
AuraDevTuf::Awake,
AuraDevTuf::Boot,
AuraDevTuf::Sleep,
AuraDevTuf::Keyboard,
LaptopTufAuraPower::Awake,
LaptopTufAuraPower::Boot,
LaptopTufAuraPower::Sleep,
LaptopTufAuraPower::Keyboard,
]))
} else {
AuraPowerConfig::AuraDevRog1(HashSet::from([
AuraDevRog1::Awake,
AuraDevRog1::Boot,
AuraDevRog1::Sleep,
AuraDevRog1::Keyboard,
AuraDevRog1::Lightbar,
LaptopOldAuraPower::Awake,
LaptopOldAuraPower::Boot,
LaptopOldAuraPower::Sleep,
LaptopOldAuraPower::Keyboard,
LaptopOldAuraPower::Lightbar,
]))
};
let mut config = AuraConfig {

6
asusd/src/ctrl_aura/controller.rs
View File

@@ -3,8 +3,8 @@ use std::collections::{BTreeMap, HashSet};
use config_traits::{StdConfig, StdConfigLoad};
use inotify::Inotify;
use log::{debug, info, warn};
use rog_aura::advanced::{LedUsbPackets, UsbPackets};
use rog_aura::aura_detection::LaptopLedData;
use rog_aura::keyboard::{LedUsbPackets, UsbPackets};
use rog_aura::usb::{AuraDevice, LED_APPLY, LED_SET};
use rog_aura::{AuraEffect, Direction, LedBrightness, Speed, GRADIENT, LED_MSG_LEN};
use rog_platform::hid_raw::HidRaw;
@@ -362,7 +362,7 @@ mod tests {
layout_name: "ga401".to_owned(),
basic_modes: vec![AuraModeNum::Static],
basic_zones: vec![],
advanced_type: rog_aura::AdvancedAuraType::None,
advanced_type: rog_aura::keyboard::AdvancedAuraType::None,
power_zones: vec![PowerZones::Keyboard, PowerZones::RearGlow],
};
let mut controller = CtrlKbdLed {
@@ -405,7 +405,7 @@ mod tests {
layout_name: "ga401".to_owned(),
basic_modes: vec![AuraModeNum::Static],
basic_zones: vec![AuraZone::Key1, AuraZone::Key2],
advanced_type: rog_aura::AdvancedAuraType::None,
advanced_type: rog_aura::keyboard::AdvancedAuraType::None,
power_zones: vec![PowerZones::Keyboard, PowerZones::RearGlow],
};
let mut controller = CtrlKbdLed {

2
asusd/src/ctrl_aura/trait_impls.rs
View File

@@ -3,8 +3,8 @@ use std::sync::Arc;
use config_traits::StdConfig;
use log::{debug, error, info, warn};
use rog_aura::advanced::UsbPackets;
use rog_aura::aura_detection::PowerZones;
use rog_aura::keyboard::UsbPackets;
use rog_aura::usb::{AuraDevice, AuraPowerDev};
use rog_aura::{AuraEffect, AuraModeNum, AuraZone, LedBrightness};
use zbus::export::futures_util::lock::{Mutex, MutexGuard};