summaryrefslogtreecommitdiffhomepage
path: root/filter-accela/accela-settings.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'filter-accela/accela-settings.hpp')
-rw-r--r--filter-accela/accela-settings.hpp23
1 files changed, 14 insertions, 9 deletions
diff --git a/filter-accela/accela-settings.hpp b/filter-accela/accela-settings.hpp
index 63173aa8..b2f62a43 100644
--- a/filter-accela/accela-settings.hpp
+++ b/filter-accela/accela-settings.hpp
@@ -1,8 +1,11 @@
#pragma once
+#include "spline/spline.hpp"
#include "options/options.hpp"
+
+namespace detail::accela {
+
using namespace options;
-#include "spline/spline.hpp"
// ------------------------------------
// debug knobs
@@ -19,8 +22,7 @@ struct settings_accela : opts
double x, y;
};
- static constexpr inline gains const rot_gains[16] =
- {
+ static constexpr gains const rot_gains[] {
{ 9, 300 },
{ 8, 200 },
{ 5, 100 },
@@ -30,8 +32,7 @@ struct settings_accela : opts
{ .5, .4 },
};
- static constexpr inline gains const pos_gains[16] =
- {
+ static constexpr gains const pos_gains[] {
{ 9, 200 },
{ 8, 150 },
{ 7, 110 },
@@ -47,10 +48,14 @@ struct settings_accela : opts
static void make_splines(spline& rot, spline& pos);
- value<slider_value> rot_smoothing { b, "rotation-sensitivity", slider_value(1.5, .05, 2.5) },
- pos_smoothing { b, "translation-sensitivity", slider_value(1., .05, 1.5) },
- rot_deadzone { b, "rotation-deadzone", slider_value(.03, 0, .2) },
- pos_deadzone { b, "translation-deadzone", slider_value(.1, 0, 1) };
+ value<slider_value> rot_smoothing { b, "rotation-sensitivity", { 1.5, .05, 2.5 } },
+ pos_smoothing { b, "translation-sensitivity", { 1., .05, 1.5 } },
+ rot_deadzone { b, "rotation-deadzone", { .03, 0, .2 } },
+ pos_deadzone { b, "translation-deadzone", { .1, 0, 1 } };
settings_accela() : opts("accela-sliders") {}
};
+
+} // ns detail::accela
+
+using detail::accela::settings_accela;