Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
Navigation
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
Skills
Navigation
Commits
ccc832f8
Commit
ccc832f8
authored
2 years ago
by
Fabian Reister
Browse files
Options
Downloads
Patches
Plain Diff
fixing includes and cmake targets
parent
e3ebd757
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!25
RT controller and simplification
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/armarx/navigation/platform_controller/PlatformTrajectoryController.h
+4
-7
4 additions, 7 deletions
...gation/platform_controller/PlatformTrajectoryController.h
source/armarx/navigation/server/CMakeLists.txt
+1
-1
1 addition, 1 deletion
source/armarx/navigation/server/CMakeLists.txt
with
5 additions
and
8 deletions
source/armarx/navigation/platform_controller/PlatformTrajectoryController.h
+
4
−
7
View file @
ccc832f8
...
...
@@ -29,12 +29,9 @@
#include
<RobotAPI/components/units/RobotUnit/RobotUnit.h>
#include
<RobotAPI/components/units/RobotUnit/SensorValues/SensorValueHolonomicPlatform.h>
#include
<armarx/navigation/trajectory_control/TrajectoryFollowingController.h>
#include
<armarx/control/common/control_law/ControllerCommonInterface.h>
#include
<armarx/control/njoint_controller/task_space/ControllerInterface.h>
#include
<armarx/control/njoint_qp_controller/ControllerInterface.h>
#include
<armarx/control/interface/ConfigurableNJointControllerInterface.h>
#include
<armarx/navigation/core/types.h>
#include
<armarx/navigation/trajectory_control/TrajectoryFollowingController.h>
namespace
armarx
{
...
...
@@ -88,7 +85,7 @@ namespace armarx::navigation::platform_controller::platform_trajectory
virtual
public
armarx
::
control
::
ConfigurableNJointControllerInterface
{
public:
using
ConfigPtrT
=
NJointTaskspace
Controller
Config
Ptr
;
using
ConfigPtrT
=
control
::
ConfigurableNJoint
Controller
Interface
Ptr
;
Controller
(
const
RobotUnitPtr
&
robotUnit
,
const
NJointControllerConfigPtr
&
config
,
...
...
@@ -149,4 +146,4 @@ namespace armarx::navigation::platform_controller::platform_trajectory
// const NameValueMap& targetJointAngles) const;
};
}
// namespace armarx::
control
::platform_controller::platform_trajectory
}
// namespace armarx::
navigation
::platform_controller::platform_trajectory
This diff is collapsed.
Click to expand it.
source/armarx/navigation/server/CMakeLists.txt
+
1
−
1
View file @
ccc832f8
...
...
@@ -57,7 +57,7 @@ armarx_add_library(server
armarx_navigation::safety_control
armarx_navigation::memory
armarx_control::client
armarx_control::
njoint_qp_controller_i
ce
armarx_control::
interfa
ce
DEPENDENCIES_PRIVATE
range-v3::range-v3
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment