|
22 | 22 |
|
23 | 23 | using pid_controller::feedforward_mode_type;
|
24 | 24 |
|
25 |
| -class PidControllerDualInterfaceTest: public PidControllerFixture<TestablePidController> |
| 25 | +class PidControllerDualInterfaceTest : public PidControllerFixture<TestablePidController> |
26 | 26 | {
|
27 | 27 | public:
|
28 | 28 | void SetUp()
|
29 | 29 | {
|
30 | 30 | PidControllerFixture::SetUp();
|
31 |
| - |
| 31 | + |
32 | 32 | dof_names_ = {"joint1", "joint2"};
|
33 | 33 |
|
34 | 34 | // set up interfaces
|
35 | 35 | command_interface_ = "velocity";
|
36 | 36 | state_interfaces_ = {"position", "velocity"};
|
37 | 37 | dof_state_values_ = {
|
38 |
| - get_joint1_state_position(), |
39 |
| - get_joint2_state_position(), |
40 |
| - get_joint1_state_velocity(), |
41 |
| - get_joint2_state_velocity() |
42 |
| - }; |
| 38 | + get_joint1_state_position(), get_joint2_state_position(), get_joint1_state_velocity(), |
| 39 | + get_joint2_state_velocity()}; |
43 | 40 | }
|
44 | 41 |
|
45 | 42 | double get_joint1_state_position() const { return 10.0; }
|
@@ -86,13 +83,10 @@ TEST_F(PidControllerDualInterfaceTest, test_chained_feedforward_with_gain_dual_i
|
86 | 83 | controller_->control_mode_.writeFromNonRT(feedforward_mode_type::ON);
|
87 | 84 | ASSERT_EQ(*(controller_->control_mode_.readFromRT()), feedforward_mode_type::ON);
|
88 | 85 |
|
89 |
| - // set up the reference interface, |
| 86 | + // set up the reference interface, |
90 | 87 | controller_->reference_interfaces_ = {
|
91 |
| - get_joint1_reference_position(), |
92 |
| - get_joint2_reference_position(), |
93 |
| - get_joint1_reference_velocity(), |
94 |
| - get_joint2_reference_velocity() |
95 |
| - }; |
| 88 | + get_joint1_reference_position(), get_joint2_reference_position(), |
| 89 | + get_joint1_reference_velocity(), get_joint2_reference_velocity()}; |
96 | 90 |
|
97 | 91 | // run update
|
98 | 92 | ASSERT_EQ(
|
|
0 commit comments