Skip to content

Fix rounding for conversion of PWM/RPM values. #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qquique wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix rounding for conversion of PWM/RPM values. #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kernel_module/legion-laptop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2248,7 +2248,7 @@ static bool fancurve_set_speed_pwm(struct fancurve *fancurve, int point_id,
*speed = clamp_t(u8, value, 0, 255);
return true;
case FAN_SPEED_UNIT_RPM_HUNDRED:
*speed = clamp_t(u8, value * MAX_RPM / 100 / 255, 0, 255);
*speed = clamp_t(u8, (value * MAX_RPM + (100 * 255) - 1) / (100 * 255), 0, 255);
return true;
default:
pr_info("No method to set for fan_speed_unit %d.",
Expand Down Expand Up @@ -2424,7 +2424,7 @@ static ssize_t fancurve_print_seqfile(const struct fancurve *fancurve,
const struct fancurve_point *point = &fancurve->points[i];

fancurve_get_speed_pwm(fancurve, i, 0, &speed_pwm1);
fancurve_get_speed_pwm(fancurve, i, 0, &speed_pwm2);
fancurve_get_speed_pwm(fancurve, i, 1, &speed_pwm2);

seq_printf(
s,
Expand Down
8 changes: 4 additions & 4 deletions python/legion_linux/legion_linux/legion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,10 +816,10 @@ def set_fan_2_speed_pwm(self, point_id, value):
self._write_file(file_path, value)

def set_fan_1_speed_rpm(self, point_id, value):
return self.set_fan_1_speed_pwm(point_id, round(value/self.get_fan_1_max_rpm()*255.0))
return self.set_fan_1_speed_pwm(point_id, int(value // 100 * (100 * 255) / self.get_fan_1_max_rpm()))

def set_fan_2_speed_rpm(self, point_id, value):
return self.set_fan_2_speed_pwm(point_id, round(value/self.get_fan_2_max_rpm()*255.0))
return self.set_fan_2_speed_pwm(point_id, int(value // 100 * (100 * 255) / self.get_fan_2_max_rpm()))

def set_lower_cpu_temperature(self, point_id, value):
point_id = self._validate_point_id(point_id)
Expand Down Expand Up @@ -872,10 +872,10 @@ def get_fan_2_speed_pwm(self, point_id):
return self._read_file(file_path)

def get_fan_1_speed_rpm(self, point_id):
return round(self.get_fan_1_speed_pwm(point_id)/255.0*self.get_fan_1_max_rpm(), ndigits=2)
return round(((self.get_fan_1_speed_pwm(point_id) * self.get_fan_1_max_rpm() + (100 * 255) - 1) // (100 * 255)) * 100 , ndigits=2)

def get_fan_2_speed_rpm(self, point_id):
return round(self.get_fan_2_speed_pwm(point_id)/255.0*self.get_fan_2_max_rpm(), ndigits=2)
return round(((self.get_fan_2_speed_pwm(point_id) * self.get_fan_2_max_rpm() + (100 * 225) - 1) // (100 * 255)) * 100, ndigits=2)

def get_lower_cpu_temperature(self, point_id):
point_id = self._validate_point_id(point_id)
Expand Down