accela: use spline mapper for gain

3 files changed, 38 insertions, 34 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4413f712..1662c89f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -239,6 +239,7 @@ set_target_properties(opentrack-version PROPERTIES
     "IN_VERSION_UNIT;OPENTRACK_VERSION=\"${OPENTRACK__COMMIT}\"")
 
 opentrack_library(opentrack-filter-accela ftnoir_filter_accela)
+target_link_libraries(opentrack-filter-accela opentrack-spline-widget)
 opentrack_library(opentrack-filter-kalman ftnoir_filter_kalman)
 opentrack_library(opentrack-filter-ewma ftnoir_filter_ewma2)
 
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index 77964d32..5a042f81 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
@@ -12,20 +12,42 @@
 #include "opentrack/plugin-api.hpp"
 using namespace std;
 
-FTNoIR_Filter::FTNoIR_Filter() : first_run(true)
-{
-}
+static constexpr double rot_gains[][2] = {
+    { 7, 200 },
+    { 6, 100 },
+    { 5, 45 },
+    { 4, 15 },
+    { 3, 5 },
+    { 2, 1.4 },
+    { 1, .4 },
+    { 0, .2 },
+    { -1, 0 }
+};
+static constexpr double trans_gains[][2] = {
+    { 5, 180 },
+    { 4, 64 },
+    { 3, 20 },
+    { 2, 5 },
+    { 1, .7 },
+    { 0, .1 },
+    { -1, 0 }
+};
 
-double FTNoIR_Filter::f(double val, const double gains[][2])
+FTNoIR_Filter::FTNoIR_Filter() : first_run(true)
 {
-    for (int i = 0; gains[i][0] >= 0; i++)
+    rot.setMaxInput(rot_gains[0][0]);
+    trans.setMaxInput(trans_gains[0][0]);
+    rot.setMaxOutput(rot_gains[0][1]);
+    trans.setMaxOutput(trans_gains[0][1]);
+    
+    for (int i = 0; rot_gains[i][0] >= 0; i++)
     {
-        if (val >= gains[i][0])
-        {
-            return gains[i][1] * val;
-        }
+        rot.addPoint(QPointF(rot_gains[i][0], rot_gains[i][1]));
+    }
+    for (int i = 0; trans_gains[i][0] >= 0; i++)
+    {
+        trans.addPoint(QPointF(trans_gains[i][0], trans_gains[i][1]));
     }
-    return 0;
 }
 
 void FTNoIR_Filter::filter(const double* input, double *output)
@@ -43,25 +65,6 @@ void FTNoIR_Filter::filter(const double* input, double *output)
         return;
     }
     
-    static const double rot_gains[][2] = {
-        { 6, 15 },
-        { 5, 8 },
-        { 4, 4 },
-        { 3, 1.6 },
-        { 2, .7 },
-        { 1, .4 },
-        { 0, .2 },
-        { -1, 0 }
-    };
-    static const double trans_gains[][2] = {
-        { 4, 8 },
-        { 3, 4 },
-        { 2, 2 },
-        { 1, .5 },
-        { 0, .1 },
-        { -1, 0 }
-    };
-
     const double rot_t = 10. * (1+s.rot_threshold) / 100.;
     const double trans_t = 5. * (1+s.trans_threshold) / 100.;
     
@@ -75,6 +78,8 @@ void FTNoIR_Filter::filter(const double* input, double *output)
     
     for (int i = 0; i < 6; i++)
     {
+        Map& m = i >= 3 ? rot : trans;
+        
         smoothed_input[i] = smoothed_input[i] * (1.-alpha) + input[i] * alpha;
         
         const double in = smoothed_input[i];
@@ -83,14 +88,12 @@ void FTNoIR_Filter::filter(const double* input, double *output)
         const double dz = i >= 3 ? rot_dz : trans_dz;
         const double vec_ = max(0., fabs(vec) - dz);
         const double thres = i >= 3 ? rot_t : trans_t;
-        const double val = f(vec_ / thres, i >= 3 ? rot_gains : trans_gains) * thres;
+        const double val = m.getValue(vec_ / thres) * thres;
         const double result = last_output[i] + (vec < 0 ? -1 : 1) * dt * val;
         const bool negp = vec < 0.;
         const bool done = negp
             ? result <= in
             : result >= in;
-        if (i == 3 && val > 0.1 && done)
-            qDebug() << "done";
         const double ret = done ? in : result;
         
         last_output[i] = output[i] = ret;
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h
index aa10e161..e45af03a 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.h
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "ui_ftnoir_accela_filtercontrols.h"
 #include "opentrack/plugin-api.hpp"
+#include "qfunctionconfigurator/functionconfig.h"
 #include <atomic>
 #include <QMutex>
 #include <QTimer>
@@ -26,14 +27,13 @@ class FTNoIR_Filter : public IFilter
 public:
     FTNoIR_Filter();
     void filter(const double* input, double *output);
+    Map rot, trans;
 private:
     settings s;
     bool first_run;
     double last_output[6];
     double smoothed_input[6];
     Timer t;
-    
-    double f(double val, const double gains[][2]);
 };
 
 class FilterControls: public IFilterDialog