@@ -81,19 +81,6 @@ SoTRobotArmDevice::SoTRobotArmDevice(std::string RobotName):
81
81
timestep_ = TIMESTEP_DEFAULT;
82
82
sotDEBUGIN (25 ) ;
83
83
signalRegistration (p_gainsSOUT_ << d_gainsSOUT_);
84
- dynamicgraph::Vector data (3 ); data.setZero ();
85
- using namespace dynamicgraph ::command;
86
- std::string docstring;
87
- docstring =
88
- " Set the integration in closed loop\n "
89
- " \n "
90
- " - Input: boolean\n "
91
- " \n " ;
92
- addCommand (" setClosedLoop" ,
93
- makeCommandVoid1 (*this ,
94
- &SoTRobotArmDevice::setClosedLoop,
95
- docstring));
96
- sotDEBUGOUT (25 );
97
84
}
98
85
99
86
SoTRobotArmDevice::~SoTRobotArmDevice ()
@@ -197,47 +184,4 @@ void SoTRobotArmDevice::cleanupSetSensors(map<string, SensorValues>&
197
184
setSensors (SensorsIn);
198
185
}
199
186
200
- void SoTRobotArmDevice::integrate (const double &dt)
201
- {
202
- using dynamicgraph::Vector;
203
- const Vector &controlIN = controlSIN.accessCopy ();
204
-
205
- if (sanityCheck_ && controlIN.hasNaN ()) {
206
- dgRTLOG () << " Device::integrate: Control has NaN values: " << ' \n '
207
- << controlIN.transpose () << ' \n ' ;
208
- return ;
209
- }
210
-
211
- if (controlInputType_ == dynamicgraph::sot::CONTROL_INPUT_NO_INTEGRATION) {
212
- state_ = controlIN;
213
- return ;
214
- }
215
-
216
- if (vel_control_.size () == 0 )
217
- vel_control_ = Vector::Zero (controlIN.size ());
218
-
219
- if (controlInputType_ == dynamicgraph::sot::CONTROL_INPUT_TWO_INTEGRATION) {
220
- // TODO check acceleration
221
- // Position increment
222
- vel_control_ = velocity_ + (0.5 * dt) * controlIN;
223
- // Velocity integration.
224
- velocity_ += controlIN * dt;
225
- } else {
226
- vel_control_ = controlIN;
227
- }
228
-
229
- // Velocity bounds check
230
- if (sanityCheck_) {
231
- CHECK_BOUNDS (velocity_, lowerVelocity_, upperVelocity_, " velocity" );
232
- }
233
-
234
- // Position integration
235
- state_ += vel_control_ * dt;
236
-
237
- // Position bounds check
238
- if (sanityCheck_) {
239
- CHECK_BOUNDS (state_, lowerPosition_, upperPosition_, " position" );
240
- }
241
- }
242
-
243
187
DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN (DeviceToDynamic, " DeviceToDynamic" );
0 commit comments