diff --git a/src/angle-estimator.cpp b/src/angle-estimator.cpp index 229f13e59bae99fee3eeea1186529d042a3858fb..958c5ddcf3690761d8f4af97c6d23a20afa6f9cb 100644 --- a/src/angle-estimator.cpp +++ b/src/angle-estimator.cpp @@ -91,13 +91,21 @@ AngleEstimator( const std::string & name ) { sotDEBUGIN(5); - signalRegistration( sensorWorldRotationSIN << sensorEmbeddedPositionSIN - << contactWorldPositionSIN << contactEmbeddedPositionSIN - << anglesSOUT << flexibilitySOUT - << driftSOUT << sensorWorldRotationSOUT - << waistWorldRotationSOUT - << waistWorldPositionSOUT << waistWorldPoseRPYSOUT - << jacobianSIN << qdotSIN << xff_dotSOUT << qdotSOUT ); + signalRegistration(sensorWorldRotationSIN); + signalRegistration(sensorEmbeddedPositionSIN); + signalRegistration(contactWorldPositionSIN); + signalRegistration(contactEmbeddedPositionSIN); + signalRegistration(anglesSOUT); + signalRegistration(flexibilitySOUT); + signalRegistration(driftSOUT); + signalRegistration(sensorWorldRotationSOUT); + signalRegistration(waistWorldRotationSOUT); + signalRegistration(waistWorldPositionSOUT); + signalRegistration(waistWorldPoseRPYSOUT); + signalRegistration(jacobianSIN); + signalRegistration(qdotSIN); + signalRegistration(xff_dotSOUT); + signalRegistration(qdotSOUT); /* Commands. */ { diff --git a/src/dynamic.cpp b/src/dynamic.cpp index 05d91ca89c187aebe387b98487479ac1d66608d8..dd1ae977c1d50aa6fd6a91f2b9d3e415c7066125 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -145,13 +145,25 @@ Dynamic( const std::string & name, bool build ) firstSINTERN.setDependencyType(TimeDependency<int>::BOOL_DEPENDENT); //DEBUG: Why =0? should be function. firstSINTERN.setConstant(0); - signalRegistration( jointPositionSIN<<freeFlyerPositionSIN - <<jointVelocitySIN<<freeFlyerVelocitySIN - <<jointAccelerationSIN<<freeFlyerAccelerationSIN); - signalRegistration( zmpSOUT<<comSOUT<<JcomSOUT<<footHeightSOUT); - signalRegistration(upperJlSOUT<<lowerJlSOUT<<inertiaSOUT - <<inertiaRealSOUT << inertiaRotorSOUT << gearRatioSOUT ); - signalRegistration( MomentaSOUT << AngularMomentumSOUT << dynamicDriftSOUT); + signalRegistration(jointPositionSIN); + signalRegistration(freeFlyerPositionSIN); + signalRegistration(jointVelocitySIN); + signalRegistration(freeFlyerVelocitySIN); + signalRegistration(jointAccelerationSIN); + signalRegistration(freeFlyerAccelerationSIN); + signalRegistration(zmpSOUT); + signalRegistration(comSOUT); + signalRegistration(JcomSOUT); + signalRegistration(footHeightSOUT); + signalRegistration(upperJlSOUT); + signalRegistration(lowerJlSOUT); + signalRegistration(inertiaSOUT); + signalRegistration(inertiaRealSOUT); + signalRegistration(inertiaRotorSOUT); + signalRegistration(gearRatioSOUT); + signalRegistration( MomentaSOUT); + signalRegistration(AngularMomentumSOUT); + signalRegistration(dynamicDriftSOUT); // // Commands diff --git a/src/force-compensation.cpp b/src/force-compensation.cpp index 36249e30bd3a1d1ed1a8a126c49cbf1cfb0b80ce..a102384b9fbb8ad3f1781458a027b872b336122f 100644 --- a/src/force-compensation.cpp +++ b/src/force-compensation.cpp @@ -99,18 +99,27 @@ ForceCompensationPlugin( const std::string & name ) { sotDEBUGIN(5); - signalRegistration( torsorSIN<< worldRhandSIN - << handRsensorSIN << translationSensorComSIN - << gravitySIN << precompensationSIN << gainSensorSIN - << deadZoneLimitSIN - << transSensorJointSIN << inertiaJointSIN - << velocitySIN << accelerationSIN - - << handXworldSOUT << handVsensorSOUT << torsorDeadZoneSIN - << sensorXhandSOUT //<< inertiaSensorSOUT - << momentumSOUT << momentumSIN - << torsorCompensatedSOUT << torsorDeadZoneSOUT - << calibrationTrigerSOUT ); + signalRegistration(torsorSIN); + signalRegistration(worldRhandSIN); + signalRegistration(handRsensorSIN); + signalRegistration(translationSensorComSIN); + signalRegistration(gravitySIN); + signalRegistration(precompensationSIN); + signalRegistration(gainSensorSIN); + signalRegistration(deadZoneLimitSIN); + signalRegistration(transSensorJointSIN); + signalRegistration(inertiaJointSIN); + signalRegistration(velocitySIN ); + signalRegistration(accelerationSIN); + signalRegistration(handXworldSOUT); + signalRegistration(handVsensorSOUT); + signalRegistration(torsorDeadZoneSIN); + signalRegistration(sensorXhandSOUT); + signalRegistration(momentumSOUT); + signalRegistration(momentumSIN); + signalRegistration(torsorCompensatedSOUT); + signalRegistration(torsorDeadZoneSOUT); + signalRegistration(calibrationTrigerSOUT); torsorDeadZoneSIN.plug(&torsorCompensatedSOUT); // By default, I choose: momentum is not compensated. diff --git a/src/integrator-force.cpp b/src/integrator-force.cpp index ce06345ea9dd857229d4b52383dd2d2c99c8e957..27b200fde8298fb060792fb52ab9c943b6fb0f48 100644 --- a/src/integrator-force.cpp +++ b/src/integrator-force.cpp @@ -52,10 +52,14 @@ IntegratorForce( const std::string & name ) { sotDEBUGIN(5); - signalRegistration( forceSIN << massInverseSIN - << frictionSIN << velocityPrecSIN - << velocityDerivativeSOUT << velocitySOUT - << massInverseSOUT << massSIN ); + signalRegistration(forceSIN); + signalRegistration(massInverseSIN); + signalRegistration(frictionSIN); + signalRegistration(velocityPrecSIN); + signalRegistration(velocityDerivativeSOUT ); + signalRegistration(velocitySOUT ); + signalRegistration(massInverseSOUT ); + signalRegistration(massSIN ); massInverseSIN.plug( &massInverseSOUT ); diff --git a/src/mass-apparent.cpp b/src/mass-apparent.cpp index aea9fcad4cdf21b417bf2e37e953227f69462374..5598345288800c80d431917b532bc93d975a0cb6 100644 --- a/src/mass-apparent.cpp +++ b/src/mass-apparent.cpp @@ -46,8 +46,12 @@ MassApparent( const std::string & name ) { sotDEBUGIN(5); - signalRegistration( jacobianSIN << inertiaInverseSIN << massInverseSOUT << massSOUT - << inertiaSIN << inertiaInverseSOUT); + signalRegistration(jacobianSIN); + signalRegistration(inertiaInverseSIN); + signalRegistration(massInverseSOUT); + signalRegistration(massSOUT); + signalRegistration(inertiaSIN); + signalRegistration(inertiaInverseSOUT); inertiaInverseSIN.plug( &inertiaInverseSOUT ); sotDEBUGOUT(5); diff --git a/src/waist-attitude-from-sensor.cpp b/src/waist-attitude-from-sensor.cpp index 69034b6a5a3ef7fddb1066765061b4263a3b54e5..660d74d60c07644023788b753a657adb677a88f8 100644 --- a/src/waist-attitude-from-sensor.cpp +++ b/src/waist-attitude-from-sensor.cpp @@ -41,8 +41,9 @@ WaistAttitudeFromSensor( const std::string & name ) { sotDEBUGIN(5); - signalRegistration( attitudeSensorSIN<<positionSensorSIN - <<attitudeWaistSOUT ); + signalRegistration(attitudeSensorSIN); + signalRegistration(positionSensorSIN); + signalRegistration(attitudeWaistSOUT); sotDEBUGOUT(5); } @@ -117,7 +118,8 @@ WaistPoseFromSensorAndContact( const std::string & name ) { sotDEBUGIN(5); - signalRegistration( positionContactSIN<<positionWaistSOUT ); + signalRegistration( positionContactSIN); + signalRegistration(positionWaistSOUT ); // Commands std::string docstring; diff --git a/src/zmpreffromcom.cpp b/src/zmpreffromcom.cpp index 6f30f74f6ec5ce32a864d60f31ccdda3fde4c26f..a941603e565b688c53fa7a7a1b3b1d81561382ea 100644 --- a/src/zmpreffromcom.cpp +++ b/src/zmpreffromcom.cpp @@ -44,7 +44,10 @@ ZmprefFromCom( const std::string & name ) { sotDEBUGIN(5); - signalRegistration(waistPositionSIN<<comPositionSIN<<dcomSIN<<zmprefSOUT ); + signalRegistration(waistPositionSIN); + signalRegistration(comPositionSIN); + signalRegistration(dcomSIN); + signalRegistration(zmprefSOUT); sotDEBUGOUT(5); }