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 'fix/aura-help-options-display' into 'main'

Browse Source 
Fixes all available led-mode commands not displaying with `asusctl led-mode --help`

See merge request asus-linux/asusctl!105
This commit is contained in:
Luke Jones
2022-06-05 02:54:31 +00:00
parent b6934bbf63 9f18c88153
commit 68cbf09e9f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asusctl/src/main.rs
View File

@@ -355,7 +355,7 @@ fn handle_led_mode(
let commands: Vec<String> = cmdlist.lines().map(|s| s.to_string()).collect(); let commands: Vec<String> = cmdlist.lines().map(|s| s.to_string()).collect();
for command in commands.iter().filter(|command| { for command in commands.iter().filter(|command| {
for mode in &supported.stock_led_modes { for mode in &supported.stock_led_modes {
if command.contains(&<&str>::from(mode).to_lowercase()) { if command.trim().starts_with(&<&str>::from(mode).to_lowercase()) {
return true; return true;
} }
} }

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

@@ -149,14 +149,14 @@ impl From<&AuraModeNum> for &str {
fn from(mode: &AuraModeNum) -> Self { fn from(mode: &AuraModeNum) -> Self {
match mode { match mode {
AuraModeNum::Static => "Static", AuraModeNum::Static => "Static",
AuraModeNum::Breathe => "Breathing", AuraModeNum::Breathe => "Breathe",
AuraModeNum::Strobe => "Strobing", AuraModeNum::Strobe => "Strobe",
AuraModeNum::Rainbow => "Rainbow", AuraModeNum::Rainbow => "Rainbow",
AuraModeNum::Star => "Stars", AuraModeNum::Star => "Stars",
AuraModeNum::Rain => "Rain", AuraModeNum::Rain => "Rain",
AuraModeNum::Highlight => "Keypress Highlight", AuraModeNum::Highlight => "Highlight",
AuraModeNum::Laser => "Keypress Laser", AuraModeNum::Laser => "Laser",
AuraModeNum::Ripple => "Keypress Ripple", AuraModeNum::Ripple => "Ripple",
AuraModeNum::Pulse => "Pulse", AuraModeNum::Pulse => "Pulse",
AuraModeNum::Comet => "Comet", AuraModeNum::Comet => "Comet",
AuraModeNum::Flash => "Flash", AuraModeNum::Flash => "Flash",
@@ -167,14 +167,14 @@ impl From<&str> for AuraModeNum {
fn from(mode: &str) -> Self { fn from(mode: &str) -> Self {
match mode { match mode {
"Static" => AuraModeNum::Static, "Static" => AuraModeNum::Static,
"Breathing" => AuraModeNum::Breathe, "Breathe" => AuraModeNum::Breathe,
"Strobing" => AuraModeNum::Strobe, "Strobe" => AuraModeNum::Strobe,
"Rainbow" => AuraModeNum::Rainbow, "Rainbow" => AuraModeNum::Rainbow,
"Stars" => AuraModeNum::Star, "Stars" => AuraModeNum::Star,
"Rain" => AuraModeNum::Rain, "Rain" => AuraModeNum::Rain,
"Keypress Highlight" => AuraModeNum::Highlight, "Highlight" => AuraModeNum::Highlight,
"Keypress Laser" => AuraModeNum::Laser, "Laser" => AuraModeNum::Laser,
"Keypress Ripple" => AuraModeNum::Ripple, "Ripple" => AuraModeNum::Ripple,
"Pulse" => AuraModeNum::Pulse, "Pulse" => AuraModeNum::Pulse,
"Comet" => AuraModeNum::Comet, "Comet" => AuraModeNum::Comet,
"Flash" => AuraModeNum::Flash, "Flash" => AuraModeNum::Flash,