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

Merge branch 'fluke/18c6-keyboard'

Browse Source
This commit is contained in:
Luke D. Jones
2023-04-24 20:15:11 +12:00
parent e864dfb0e7 6e19c16e70
commit c40029f5e7
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ use crate::{AdvancedAuraType, AuraModeNum, AuraZone};
pub const ASUS_LED_MODE_CONF: &str = "/usr/share/asusd/aura_support.ron"; pub const ASUS_LED_MODE_CONF: &str = "/usr/share/asusd/aura_support.ron";
pub const ASUS_LED_MODE_USER_CONF: &str = "/etc/asusd/asusd_user_ledmodes.ron"; pub const ASUS_LED_MODE_USER_CONF: &str = "/etc/asusd/asusd_user_ledmodes.ron";
pub const ASUS_KEYBOARD_DEVICES: [&str; 4] = ["1866", "1869", "1854", "19b6"]; pub const ASUS_KEYBOARD_DEVICES: [&str; 5] = ["1866", "18c6", "1869", "1854", "19b6"];
#[derive(Debug, Default, Clone, PartialEq, Eq, Deserialize, Serialize)] #[derive(Debug, Default, Clone, PartialEq, Eq, Deserialize, Serialize)]
pub struct LedSupportFile(Vec<LaptopLedData>); pub struct LedSupportFile(Vec<LaptopLedData>);

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

@@ -29,6 +29,7 @@ pub enum AuraDevice {
X1854, X1854,
X1869, X1869,
X1866, X1866,
X18c6,
#[default] #[default]
X19B6, X19B6,
Unknown, Unknown,
@@ -39,6 +40,7 @@ impl From<&str> for AuraDevice {
match s.to_lowercase().as_str() { match s.to_lowercase().as_str() {
"tuf" => AuraDevice::Tuf, "tuf" => AuraDevice::Tuf,
"1866" | "0x1866" => AuraDevice::X1866, "1866" | "0x1866" => AuraDevice::X1866,
"18c6" | "0x18c6" => AuraDevice::X18c6,
"1869" | "0x1869" => AuraDevice::X1869, "1869" | "0x1869" => AuraDevice::X1869,
"1854" | "0x1854" => AuraDevice::X1854, "1854" | "0x1854" => AuraDevice::X1854,
"19b6" | "0x19b6" => AuraDevice::X19B6, "19b6" | "0x19b6" => AuraDevice::X19B6,
@@ -54,6 +56,7 @@ impl Debug for AuraDevice {
Self::X1854 => write!(f, "0x1854"), Self::X1854 => write!(f, "0x1854"),
Self::X1869 => write!(f, "0x1869"), Self::X1869 => write!(f, "0x1869"),
Self::X1866 => write!(f, "0x1866"), Self::X1866 => write!(f, "0x1866"),
Self::X18c6 => write!(f, "0x18c6"),
Self::X19B6 => write!(f, "0x19B6"), Self::X19B6 => write!(f, "0x19B6"),
Self::Unknown => write!(f, "Unknown"), Self::Unknown => write!(f, "Unknown"),
} }

2
rog-control-center/src/widgets/aura_power.rs
View File

@@ -9,7 +9,7 @@ pub fn aura_power_group(supported: &SupportedFunctions, states: &mut SystemState
ui.heading("LED settings"); ui.heading("LED settings");
match supported.keyboard_led.dev_id { match supported.keyboard_led.dev_id {
AuraDevice::X1854 | AuraDevice::X1869 | AuraDevice::X1866 => { AuraDevice::X1854 | AuraDevice::X1869 | AuraDevice::X1866 | AuraDevice::X18c6 => {
aura_power1(supported, states, ui); aura_power1(supported, states, ui);
} }
AuraDevice::X19B6 => aura_power2(supported, states, ui), AuraDevice::X19B6 => aura_power2(supported, states, ui),