From d50376d2149afdf74996eafb98ed62dcb73a2cf7 Mon Sep 17 00:00:00 2001 From: Jacob Palecki Date: Fri, 24 Jul 2020 12:04:58 -0700 Subject: Apply k to speed, allow values over 0 --- common/rawaccel.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/rawaccel.hpp b/common/rawaccel.hpp index a60fe1c..1b4263c 100644 --- a/common/rawaccel.hpp +++ b/common/rawaccel.hpp @@ -99,7 +99,7 @@ struct accel_function { break; case mode::sigmoid: accel_val = k / (exp(-b * (speed - m)) + 1); break; - case mode::power: accel_val = (speed_offset > 0 && speed < 1) ? 0 : pow(speed, b*k) - 1; + case mode::power: accel_val = (speed_offset > 0 && speed < 1) ? 0 : pow(speed*k, b) - 1; break; default: break; @@ -132,7 +132,7 @@ struct accel_function { if (args.time_min <= 0) error("min time must be positive"); if (args.lim_exp <= 1) { if (args.accel_mode == mode::classic) error("exponent must be greater than 1"); - else if (args.accel_mode == mode::power) error("scale factor must be greater than 1"); + else if (args.accel_mode == mode::power) { if (args.lim_exp <= 0) error("scale factor must be greater than 0"); } else error("limit must be greater than 1"); } -- cgit v1.2.3