From 8f219a3255be61da64c28bea963ccf3210f884d9 Mon Sep 17 00:00:00 2001 From: drokath Date: Wed, 29 Nov 2023 01:47:25 +0000 Subject: [PATCH] Improve AMD 6800 handheld detection (#132) Related to #131 tested on Aokzoe A1 Co-authored-by: Vincent Guilbert Reviewed-on: https://git.ngni.us/NG-SD-Plugins/PowerTools/pulls/132 Co-authored-by: drokath Co-committed-by: drokath --- backend/limits_core/src/json/base.rs | 4 ++-- backend/limits_core/src/json_v2/base.rs | 4 ++-- backend/limits_srv/pt_limits.json | 2 +- backend/limits_srv/pt_limits_v2.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/limits_core/src/json/base.rs b/backend/limits_core/src/json/base.rs index c08372a..7abf32d 100644 --- a/backend/limits_core/src/json/base.rs +++ b/backend/limits_core/src/json/base.rs @@ -1,5 +1,5 @@ -use std::default::Default; use serde::{Deserialize, Serialize}; +use std::default::Default; /// Base JSON limits information #[derive(Serialize, Deserialize, Debug, Clone)] @@ -131,7 +131,7 @@ impl Default for Base { name: "AMD R7 6800U".to_owned(), conditions: super::Conditions { dmi: None, - cpuinfo: Some("model name\t+: AMD Ryzen 7 6800U\n".to_owned()), + cpuinfo: Some("model name\t+: AMD Ryzen 7 6800U( with Radeon Graphics)?\n".to_owned()), os: None, command: None, file_exists: None, diff --git a/backend/limits_core/src/json_v2/base.rs b/backend/limits_core/src/json_v2/base.rs index 81643d9..60cac16 100644 --- a/backend/limits_core/src/json_v2/base.rs +++ b/backend/limits_core/src/json_v2/base.rs @@ -1,5 +1,5 @@ -use std::default::Default; use serde::{Deserialize, Serialize}; +use std::default::Default; /// Base JSON limits information #[derive(Serialize, Deserialize, Debug, Clone)] @@ -191,7 +191,7 @@ impl Default for Base { name: "AMD R7 6800U".to_owned(), conditions: super::Conditions { dmi: None, - cpuinfo: Some("model name\t+: AMD Ryzen 7 6800U\n".to_owned()), + cpuinfo: Some("model name\t+: AMD Ryzen 7 6800U( with Radeon Graphics)?\n".to_owned()), os: None, command: None, file_exists: None, diff --git a/backend/limits_srv/pt_limits.json b/backend/limits_srv/pt_limits.json index eea7711..198e5ee 100644 --- a/backend/limits_srv/pt_limits.json +++ b/backend/limits_srv/pt_limits.json @@ -214,7 +214,7 @@ "name": "AMD R7 6800U", "conditions": { "dmi": null, - "cpuinfo": "model name\t+: AMD Ryzen 7 6800U\n", + "cpuinfo": "model name\t+: AMD Ryzen 7 6800U( with Radeon Graphics)?\n", "os": null, "command": null, "file_exists": null diff --git a/backend/limits_srv/pt_limits_v2.json b/backend/limits_srv/pt_limits_v2.json index fc515c6..3556db8 100644 --- a/backend/limits_srv/pt_limits_v2.json +++ b/backend/limits_srv/pt_limits_v2.json @@ -895,7 +895,7 @@ "name": "AMD R7 6800U", "conditions": { "dmi": null, - "cpuinfo": "model name\t+: AMD Ryzen 7 6800U\n", + "cpuinfo": "model name\t+: AMD Ryzen 7 6800U( with Radeon Graphics)?\n", "os": null, "command": null, "file_exists": null