gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-01-22 09:23:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'as/issue_176_1' into 'main'

Browse Source 
Fix for fan_curve related integer divison bug

Closes #176

See merge request asus-linux/asusctl!102
This commit is contained in:
Luke Jones
2022-04-08 21:18:47 +00:00
parent 272be2aaad 3cd6eb13a9
commit b6934bbf63
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ pub enum AuraZone {
/// Default factory modes structure. This easily converts to an USB HID packet with:
/// ```rust
/// let bytes: [u8; LED_MSG_LEN] = mode.into();
/// // let bytes: [u8; LED_MSG_LEN] = mode.into();
/// ```
#[cfg_attr(feature = "dbus", derive(Type))]
#[derive(Debug, Clone, Deserialize, Serialize)]

4
rog-profiles/src/fan_curve_set.rs
View File

@@ -71,10 +71,10 @@ impl std::str::FromStr for CurveData {
} else {
let mut p = r;
if percentages {
p *= 255 / 100;
if r > 100 {
return Err(ProfileError::ParseFanCurvePercentOver100(r));
}
p = (p as f32 * 2.55).round() as u8;
}
if pwm_prev > p {
return Err(ProfileError::ParseFanCurvePrevHigher(
@@ -222,7 +222,7 @@ mod tests {
.unwrap();
assert_eq!(curve.fan, FanCurvePU::CPU);
assert_eq!(curve.temp, [30, 49, 59, 69, 79, 89, 99, 109]);
assert_eq!(curve.pwm, [1, 2, 3, 4, 31, 49, 56, 58]);
assert_eq!(curve.pwm, [3, 5, 8, 10, 79, 125, 143, 148]);
}
#[test]