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

Feat: GA403WR -> GA403W

Browse Source
This commit is contained in:
Denis Benato
2025-12-13 13:21:58 +01:00
parent 7024941663
commit e565ce748a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rog-slash/src/data.rs
View File

@@ -13,7 +13,7 @@ use crate::usb::{PROD_ID1, PROD_ID1_STR, PROD_ID2, PROD_ID2_STR};
#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)] #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
pub enum SlashType { pub enum SlashType {
GA403, GA403,
GA403WR, GA403W,
GA605, GA605,
GU605, GU605,
#[default] #[default]
@@ -23,7 +23,7 @@ pub enum SlashType {
impl SlashType { impl SlashType {
pub const fn prod_id(&self) -> u16 { pub const fn prod_id(&self) -> u16 {
match self { match self {
SlashType::GA403WR => PROD_ID2, SlashType::GA403W => PROD_ID2,
SlashType::GA403 => PROD_ID1, SlashType::GA403 => PROD_ID1,
SlashType::GA605 => PROD_ID2, SlashType::GA605 => PROD_ID2,
SlashType::GU605 => PROD_ID1, SlashType::GU605 => PROD_ID1,
@@ -33,7 +33,7 @@ impl SlashType {
pub const fn prod_id_str(&self) -> &str { pub const fn prod_id_str(&self) -> &str {
match self { match self {
SlashType::GA403WR => PROD_ID2_STR, SlashType::GA403W => PROD_ID2_STR,
SlashType::GA403 => PROD_ID1_STR, SlashType::GA403 => PROD_ID1_STR,
SlashType::GA605 => PROD_ID2_STR, SlashType::GA605 => PROD_ID2_STR,
SlashType::GU605 => PROD_ID1_STR, SlashType::GU605 => PROD_ID1_STR,
@@ -43,8 +43,8 @@ impl SlashType {
pub fn from_dmi() -> Self { pub fn from_dmi() -> Self {
let board_name = DMIID::new().unwrap_or_default().board_name.to_uppercase(); let board_name = DMIID::new().unwrap_or_default().board_name.to_uppercase();
if board_name.contains("GA403WR") { if board_name.contains("GA403W") {
SlashType::GA403WR SlashType::GA403W
} else if board_name.contains("GA403") { } else if board_name.contains("GA403") {
SlashType::GA403 SlashType::GA403
} else if board_name.contains("GA605") { } else if board_name.contains("GA605") {
@@ -61,11 +61,11 @@ impl FromStr for SlashType {
type Err = SlashError; type Err = SlashError;
fn from_str(s: &str) -> std::result::Result<Self, Self::Err> { fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
Ok(match s { Ok(match s.to_uppercase().as_str() {
"ga403wr" | "GA403WR" => Self::GA403WR, "GA403W" => Self::GA403W,
"ga403" | "GA403" => Self::GA403, "GA403" => Self::GA403,
"ga605" | "GA605" => Self::GA605, "GA605" => Self::GA605,
"gu605" | "GU605" => Self::GU605, "GU605" => Self::GU605,
_ => Self::Unsupported, _ => Self::Unsupported,
}) })
} }

6
rog-slash/src/usb.rs
View File

@@ -38,8 +38,8 @@ pub fn get_slash_type() -> SlashType {
.map_err(|_| SlashError::NoDevice) .map_err(|_| SlashError::NoDevice)
.unwrap_or_default(); .unwrap_or_default();
let board_name = dmi.board_name; let board_name = dmi.board_name;
if board_name.contains("GA403WR") { if board_name.contains("GA403W") {
SlashType::GA403WR SlashType::GA403W
} else if board_name.contains("GA403") { } else if board_name.contains("GA403") {
SlashType::GA403 SlashType::GA403
} else if board_name.contains("GA605") { } else if board_name.contains("GA605") {
@@ -53,7 +53,7 @@ pub fn get_slash_type() -> SlashType {
pub const fn report_id(slash_type: SlashType) -> u8 { pub const fn report_id(slash_type: SlashType) -> u8 {
match slash_type { match slash_type {
SlashType::GA403WR => REPORT_ID_19B6, SlashType::GA403W => REPORT_ID_19B6,
SlashType::GA403 => REPORT_ID_193B, SlashType::GA403 => REPORT_ID_193B,
SlashType::GA605 => REPORT_ID_19B6, SlashType::GA605 => REPORT_ID_19B6,
SlashType::GU605 => REPORT_ID_193B, SlashType::GU605 => REPORT_ID_193B,