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

Add support for GL703GE keyboard layout

Browse Source
This commit is contained in:
Luke D. Jones
2023-01-07 11:56:56 +13:00
parent 022a144705
commit ef6ca9e51e
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
### Added
- Support for GL703GE keyboard layout
### Changed ### Changed
- Better handling of `/etc/asusd` not existing - Better handling of `/etc/asusd` not existing
- Better handling of non-existant config files - Better handling of non-existant config files

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

@@ -335,6 +335,13 @@
basic_zones: [Key1, Key2, Key3, Key4], basic_zones: [Key1, Key2, Key3, Key4],
advanced_type: None, advanced_type: None,
), ),
(
board_name: "GL703G",
layout_name: "gl503",
basic_modes: [Static, Breathe, Strobe, Rainbow],
basic_zones: [],
advanced_type: None,
),
( (
board_name: "GM501G", board_name: "GM501G",
layout_name: "fa507", layout_name: "fa507",

21
rog-control-center/src/main.rs
View File

@@ -33,14 +33,14 @@ const APP_ICON_PATH: &str = "/usr/share/icons/hicolor/512x512/apps/rog-control-c
fn main() -> Result<()> { fn main() -> Result<()> {
let args: Vec<String> = args().skip(1).collect(); let args: Vec<String> = args().skip(1).collect();
let parsed = match CliStart::parse_args_default(&args) { let cli_parsed = match CliStart::parse_args_default(&args) {
Ok(p) => p, Ok(p) => p,
Err(err) => { Err(err) => {
panic!("source {}", err); panic!("source {}", err);
} }
}; };
if do_cli_help(&parsed) { if do_cli_help(&cli_parsed) {
return Ok(()); return Ok(());
} }
@@ -116,13 +116,15 @@ fn main() -> Result<()> {
let mut path = PathBuf::from(DATA_DIR); let mut path = PathBuf::from(DATA_DIR);
let mut layout_name = None; let mut layout_name = None;
let mut layouts = Vec::new(); let mut layouts = Vec::new();
if parsed.board_name.is_some() || parsed.layout_viewing { if cli_parsed.board_name.is_some() || cli_parsed.layout_viewing {
path.pop(); if cfg!(feature = "mocking") {
path.push("rog-aura"); path.pop();
path.push("data"); path.push("rog-aura");
path.push("data");
}
layouts = KeyLayout::layout_files(path.to_owned()).unwrap(); layouts = KeyLayout::layout_files(path.to_owned()).unwrap();
if let Some(name) = &parsed.board_name { if let Some(name) = &cli_parsed.board_name {
if let Some(modes) = LedSupportFile::load_from_config() { if let Some(modes) = LedSupportFile::load_from_config() {
if let Some(data) = modes.matcher(name) { if let Some(data) = modes.matcher(name) {
led_support = data; led_support = data;
@@ -143,7 +145,7 @@ fn main() -> Result<()> {
board_name = "GQ401QM".to_string() board_name = "GQ401QM".to_string()
}; };
if parsed.layout_viewing { if cli_parsed.layout_viewing {
layout_name = Some(layouts[0].clone()); layout_name = Some(layouts[0].clone());
board_name = layouts[0] board_name = layouts[0]
.file_name() .file_name()
@@ -193,7 +195,8 @@ fn main() -> Result<()> {
} }
let config = Config::load()?; let config = Config::load()?;
if !config.run_in_background || parsed.board_name.is_some() || parsed.layout_viewing { if !config.run_in_background || cli_parsed.board_name.is_some() || cli_parsed.layout_viewing
{
break; break;
} }