@@ -39,6 +39,7 @@ using dynamicgraph::sot::SensorValues;
39
39
class SoTRobotArmDevice : public dynamicgraph ::sot::Device
40
40
{
41
41
public:
42
+ typedef dynamicgraph::sigtime_t sigtime_t ;
42
43
static const std::string CLASS_NAME;
43
44
static const double TIMESTEP_DEFAULT;
44
45
@@ -79,9 +80,9 @@ protected:
79
80
dynamicgraph::Vector previousState_;
80
81
81
82
// / proportional and derivative position-control gains
82
- dynamicgraph::Signal <dynamicgraph::Vector, int > p_gainsSOUT_;
83
+ dynamicgraph::Signal <dynamicgraph::Vector, sigtime_t > p_gainsSOUT_;
83
84
84
- dynamicgraph::Signal <dynamicgraph::Vector, int > d_gainsSOUT_;
85
+ dynamicgraph::Signal <dynamicgraph::Vector, sigtime_t > d_gainsSOUT_;
85
86
86
87
// / Intermediate variables to avoid allocation during control
87
88
dynamicgraph::Vector dgforces_;
@@ -99,6 +100,7 @@ protected:
99
100
class DeviceToDynamic : public dynamicgraph ::Entity
100
101
{
101
102
public:
103
+ typedef dynamicgraph::sigtime_t sigtime_t ;
102
104
static const std::string CLASS_NAME;
103
105
DeviceToDynamic (const std::string& name) :
104
106
dynamicgraph::Entity (name), sinSIN(0x0 , " DeviceToDynamic(" +name+" )::input(vector)::sin" ),
@@ -112,14 +114,14 @@ public:
112
114
inputSize_ = size;
113
115
}
114
116
private:
115
- dynamicgraph::Vector& compute (dynamicgraph::Vector& res, int time)
117
+ dynamicgraph::Vector& compute (dynamicgraph::Vector& res, sigtime_t time)
116
118
{
117
119
res.head <7 >() = sinSIN (time );
118
120
res[7 ] = 0 ;
119
121
return res;
120
122
}
121
- dynamicgraph::SignalPtr<dynamicgraph::Vector, int > sinSIN;
122
- dynamicgraph::SignalTimeDependent<dynamicgraph::Vector, int > soutSOUT;
123
+ dynamicgraph::SignalPtr<dynamicgraph::Vector, sigtime_t > sinSIN;
124
+ dynamicgraph::SignalTimeDependent<dynamicgraph::Vector, sigtime_t > soutSOUT;
123
125
int inputSize_;
124
126
};
125
127
0 commit comments