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

Fix: correction to wrong matching function used for aura data find

Browse Source 
Closes #607
This commit is contained in:
Luke Jones
2025-02-07 09:43:18 +13:00
parent d30f7dc2ea
commit c77e7cf1ce
4 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -2,6 +2,9 @@
## [Unreleased] ## [Unreleased]
### Changed
- Fix aura data matching
## [v6.1.0] ## [v6.1.0]
### Changed ### Changed

9
rog-aura/data/aura_support.ron
View File

@@ -566,15 +566,6 @@
advanced_type: Zoned([SingleZone]), advanced_type: Zoned([SingleZone]),
power_zones: [Keyboard], power_zones: [Keyboard],
), ),
(
device_name: "GA605W",
product_id: "",
layout_name: "ga401q",
basic_modes: [Static, Breathe, RainbowCycle, RainbowWave, Pulse],
basic_zones: [],
advanced_type: Zoned([SingleZone]),
power_zones: [Keyboard],
),
( (
device_name: "GL503", device_name: "GL503",
product_id: "", product_id: "",

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

@@ -91,7 +91,7 @@ impl LedSupportFile {
/// to ensure we match to *whole names* first before doing a glob match /// to ensure we match to *whole names* first before doing a glob match
fn match_device(&self, device_name: &str, product_id: &str) -> LedSupportData { fn match_device(&self, device_name: &str, product_id: &str) -> LedSupportData {
for config in self.0.iter().rev() { for config in self.0.iter().rev() {
if device_name.eq_ignore_ascii_case(&config.device_name) { if device_name.contains(&config.device_name) {
info!("Matched to {}", config.device_name); info!("Matched to {}", config.device_name);
if !config.product_id.is_empty() { if !config.product_id.is_empty() {
info!("Checking product ID"); info!("Checking product ID");

50
rog-control-center/translations/en/rog-control-center.po
View File

@@ -2,7 +2,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2025-02-01 07:31+0000\n" "POT-Creation-Date: 2025-02-06 20:42+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -119,131 +119,131 @@ msgid ""
"Higher values may increase heat and power consumption." "Higher values may increase heat and power consumption."
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:279 rog-control-center/ui/pages/system.slint:280 #: rog-control-center/ui/pages/system.slint:280 rog-control-center/ui/pages/system.slint:281
msgctxt "ppt_pl2_sppt" msgctxt "ppt_pl2_sppt"
msgid "CPU Turbo Power Limit" msgid "CPU Turbo Power Limit"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:281 #: rog-control-center/ui/pages/system.slint:282
msgctxt "ppt_pl2_sppt_help" msgctxt "ppt_pl2_sppt_help"
msgid "" msgid ""
"Short-term CPU power limit for boost periods. Controls maximum power during " "Short-term CPU power limit for boost periods. Controls maximum power during "
"brief high-performance bursts." "brief high-performance bursts."
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:296 rog-control-center/ui/pages/system.slint:297 #: rog-control-center/ui/pages/system.slint:298 rog-control-center/ui/pages/system.slint:299
msgctxt "ppt_pl3_fppt" msgctxt "ppt_pl3_fppt"
msgid "CPU Fast Burst Power Limit" msgid "CPU Fast Burst Power Limit"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:298 #: rog-control-center/ui/pages/system.slint:300
msgctxt "ppt_pl3_fppt_help" msgctxt "ppt_pl3_fppt_help"
msgid "" msgid ""
"Ultra-short duration power limit for instantaneous CPU bursts. Affects " "Ultra-short duration power limit for instantaneous CPU bursts. Affects "
"responsiveness during sudden workload spikes." "responsiveness during sudden workload spikes."
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:312 rog-control-center/ui/pages/system.slint:313 #: rog-control-center/ui/pages/system.slint:315 rog-control-center/ui/pages/system.slint:316
msgctxt "ppt_fppt" msgctxt "ppt_fppt"
msgid "Fast Package Power Limit" msgid "Fast Package Power Limit"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:314 #: rog-control-center/ui/pages/system.slint:317
msgctxt "ppt_fppt_help" msgctxt "ppt_fppt_help"
msgid "" msgid ""
"Ultra-short duration power limit for system package. Controls maximum power " "Ultra-short duration power limit for system package. Controls maximum power "
"during millisecond-scale load spikes." "during millisecond-scale load spikes."
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:329 rog-control-center/ui/pages/system.slint:330 #: rog-control-center/ui/pages/system.slint:333 rog-control-center/ui/pages/system.slint:334
msgctxt "ppt_apu_sppt" msgctxt "ppt_apu_sppt"
msgid "APU Sustained Power Limit" msgid "APU Sustained Power Limit"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:331 #: rog-control-center/ui/pages/system.slint:335
msgctxt "ppt_apu_sppt_help" msgctxt "ppt_apu_sppt_help"
msgid "" msgid ""
"Long-term power limit for integrated graphics and CPU combined. Affects " "Long-term power limit for integrated graphics and CPU combined. Affects "
"sustained performance of APU-based workloads." "sustained performance of APU-based workloads."
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:346 rog-control-center/ui/pages/system.slint:347 #: rog-control-center/ui/pages/system.slint:351 rog-control-center/ui/pages/system.slint:352
msgctxt "ppt_platform_sppt" msgctxt "ppt_platform_sppt"
msgid "Platform Sustained Power Limit" msgid "Platform Sustained Power Limit"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:348 #: rog-control-center/ui/pages/system.slint:353
msgctxt "ppt_platform_sppt_help" msgctxt "ppt_platform_sppt_help"
msgid "" msgid ""
"Overall system power limit for sustained operations. Controls total platform " "Overall system power limit for sustained operations. Controls total platform "
"power consumption over extended periods." "power consumption over extended periods."
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:363 rog-control-center/ui/pages/system.slint:364 #: rog-control-center/ui/pages/system.slint:369 rog-control-center/ui/pages/system.slint:370
msgctxt "nv_dynamic_boost" msgctxt "nv_dynamic_boost"
msgid "GPU Power Boost" msgid "GPU Power Boost"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:365 #: rog-control-center/ui/pages/system.slint:371
msgctxt "nv_dynamic_boost_help" msgctxt "nv_dynamic_boost_help"
msgid "" msgid ""
"Additional power allocation for GPU dynamic boost. Higher values increase " "Additional power allocation for GPU dynamic boost. Higher values increase "
"GPU performance but generate more heat." "GPU performance but generate more heat."
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:380 rog-control-center/ui/pages/system.slint:381 #: rog-control-center/ui/pages/system.slint:387 rog-control-center/ui/pages/system.slint:388
msgctxt "nv_temp_target" msgctxt "nv_temp_target"
msgid "GPU Temperature Limit" msgid "GPU Temperature Limit"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:382 #: rog-control-center/ui/pages/system.slint:389
msgctxt "nv_temp_target_help" msgctxt "nv_temp_target_help"
msgid "" msgid ""
"Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain " "Maximum GPU temperature threshold in Celsius. GPU will throttle to maintain "
"temperature below this limit." "temperature below this limit."
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:433 #: rog-control-center/ui/pages/system.slint:441
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "Energy Performance Preference linked to Throttle Policy" msgid "Energy Performance Preference linked to Throttle Policy"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:437 #: rog-control-center/ui/pages/system.slint:445
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "Change EPP based on Throttle Policy" msgid "Change EPP based on Throttle Policy"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:445 #: rog-control-center/ui/pages/system.slint:453
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "EPP for Balanced Policy" msgid "EPP for Balanced Policy"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:455 #: rog-control-center/ui/pages/system.slint:463
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "EPP for Performance Policy" msgid "EPP for Performance Policy"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:465 #: rog-control-center/ui/pages/system.slint:473
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "EPP for Quiet Policy" msgid "EPP for Quiet Policy"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:483 #: rog-control-center/ui/pages/system.slint:491
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "Throttle Policy for power state" msgid "Throttle Policy for power state"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:489 #: rog-control-center/ui/pages/system.slint:497
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "Throttle Policy on Battery" msgid "Throttle Policy on Battery"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:499 rog-control-center/ui/pages/system.slint:520 #: rog-control-center/ui/pages/system.slint:507 rog-control-center/ui/pages/system.slint:528
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr ""
#: rog-control-center/ui/pages/system.slint:510 #: rog-control-center/ui/pages/system.slint:518
msgctxt "PageSystem" msgctxt "PageSystem"
msgid "Throttle Policy on AC" msgid "Throttle Policy on AC"
msgstr "" msgstr ""
@@ -728,7 +728,7 @@ msgctxt "AuraPowerGroupOld"
msgid "Sleep" msgid "Sleep"
msgstr "" msgstr ""
#: rog-control-center/ui/widgets/common.slint:133 #: rog-control-center/ui/widgets/common.slint:136
msgctxt "confirm_reset" msgctxt "confirm_reset"
msgid "Are you sure you want to reset this?" msgid "Are you sure you want to reset this?"
msgstr "" msgstr ""