From 16dc4df3d438142ae378c9c6983585d06e0c6a33 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Mon, 29 Mar 2021 17:14:49 -0400 Subject: refactor common/settings only driver compiles remove accel-base types merge linear + classic move gain cap logic into classic impl, cap is now set in terms of output use cap/limit to determine negation remove weight, add replacement for power mode only remove legacy offset option remove naturalgain mode add legacy mode flag naturalgain -> natural natural -> natural + legacy flag add dpi setting and more accel args + defaults (prep for ips mode) replace output speed cap with input cap --- common/accel-power.hpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'common/accel-power.hpp') diff --git a/common/accel-power.hpp b/common/accel-power.hpp index 5d0c451..17977a0 100644 --- a/common/accel-power.hpp +++ b/common/accel-power.hpp @@ -2,25 +2,25 @@ #include -#include "accel-base.hpp" +#include "rawaccel-settings.h" namespace rawaccel { /// Struct to hold power (non-additive) acceleration implementation. - struct power_impl { - double scale; + struct power { + double pre_scale; double exponent; + double post_scale; - power_impl(const accel_args& args) : - scale(args.scale), exponent(args.exponent) - {} + power(const accel_args& args) : + pre_scale(args.scale), + exponent(args.exponent), + post_scale(args.weight) {} inline double operator()(double speed) const { // f(x) = (mx)^k - return pow(speed * scale, exponent); + return post_scale * pow(speed * pre_scale, exponent); } }; - using accel_power = nonadditive_accel; - } -- cgit v1.2.3 From ed0bbc22681681a16b7d45b05133c38a0b82006f Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Mon, 29 Mar 2021 18:01:20 -0400 Subject: formatting + file renames --- common/accel-power.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'common/accel-power.hpp') diff --git a/common/accel-power.hpp b/common/accel-power.hpp index 17977a0..c8faabb 100644 --- a/common/accel-power.hpp +++ b/common/accel-power.hpp @@ -1,8 +1,8 @@ #pragma once -#include +#include "rawaccel-base.hpp" -#include "rawaccel-settings.h" +#include namespace rawaccel { @@ -17,7 +17,8 @@ namespace rawaccel { exponent(args.exponent), post_scale(args.weight) {} - inline double operator()(double speed) const { + double operator()(double speed) const + { // f(x) = (mx)^k return post_scale * pow(speed * pre_scale, exponent); } -- cgit v1.2.3 From fa3ebfb1eb054ba88824a908c996094bb98e85c5 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Tue, 30 Mar 2021 18:27:02 -0400 Subject: refactor lut/motivity --- common/accel-power.hpp | 1 + 1 file changed, 1 insertion(+) (limited to 'common/accel-power.hpp') diff --git a/common/accel-power.hpp b/common/accel-power.hpp index c8faabb..a21f926 100644 --- a/common/accel-power.hpp +++ b/common/accel-power.hpp @@ -24,4 +24,5 @@ namespace rawaccel { } }; + using power_legacy = power; } -- cgit v1.2.3 From a6926be0e911b7b7637861866f41c3bca31a87a3 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Tue, 13 Apr 2021 23:59:21 -0400 Subject: move arbitrary input into settings separate arbitrary mode from spaced modes, arbitrary now deserializes from default settings file --- common/accel-power.hpp | 1 - 1 file changed, 1 deletion(-) (limited to 'common/accel-power.hpp') diff --git a/common/accel-power.hpp b/common/accel-power.hpp index a21f926..c8faabb 100644 --- a/common/accel-power.hpp +++ b/common/accel-power.hpp @@ -24,5 +24,4 @@ namespace rawaccel { } }; - using power_legacy = power; } -- cgit v1.2.3