diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-18 23:08:30 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-18 23:08:30 +0100 |
commit | e0866f30d25abd62fadb4b29fff90143c288e9ff (patch) | |
tree | 8e482e9d549e6bed4f6843d103b39c2591cb92d8 /logic/pipeline.hpp | |
parent | ee7a635a4c2222b8a77f26956dadcd9d515536a7 (diff) |
logic: change relative translation triggering
Relative translation mode now has three states:
- disabled
- always enabled
- enabled when not aiming
In the third mode, looking very close to center disables reltrans. The
exact values aren't final.
Diffstat (limited to 'logic/pipeline.hpp')
-rw-r--r-- | logic/pipeline.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/logic/pipeline.hpp b/logic/pipeline.hpp index dc04d44b..0061e439 100644 --- a/logic/pipeline.hpp +++ b/logic/pipeline.hpp @@ -37,10 +37,10 @@ using euler_t = euler::euler_t; class reltrans { - euler_t tcomp_interp_pos, tcomp_last_value; - Timer tcomp_interp_timer; - bool tcomp_state = false; - bool tcomp_in_zone = false; + euler_t interp_pos, last_value; + Timer interp_timer; + bool cur = false; + bool in_zone = false; public: reltrans(); @@ -50,7 +50,7 @@ public: bool disable_tx, bool disable_ty, bool disable_tz) const; warn_result_unused - Pose apply_pipeline(bool enable, const Pose& value, const Mat<bool, 6, 1>& disable); + Pose apply_pipeline(reltrans_state cur, const Pose& value, const Mat<bool, 6, 1>& disable); }; using namespace time_units; |