Skip to content

Commit bd87644

Browse files
Use int64_t as type for signal time.
1 parent f7a8ce6 commit bd87644

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/device.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void SoTRobotArmDevice::setSensors(map<string,SensorValues> &SensorsIn)
9090
{
9191
sotDEBUGIN(25) ;
9292
map<string,SensorValues>::iterator it;
93-
int t = stateSOUT.getTime () + 1;
93+
sigtime_t t = stateSOUT.getTime () + 1;
9494
bool setRobotState = false;
9595

9696
it = SensorsIn.find("forces");

src/device.hh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ using dynamicgraph::sot::SensorValues;
3939
class SoTRobotArmDevice : public dynamicgraph::sot::Device
4040
{
4141
public:
42+
typedef dynamicgraph::sigtime_t sigtime_t;
4243
static const std::string CLASS_NAME;
4344
static const double TIMESTEP_DEFAULT;
4445

@@ -79,9 +80,9 @@ protected:
7980
dynamicgraph::Vector previousState_;
8081

8182
/// proportional and derivative position-control gains
82-
dynamicgraph::Signal <dynamicgraph::Vector, int> p_gainsSOUT_;
83+
dynamicgraph::Signal <dynamicgraph::Vector, sigtime_t> p_gainsSOUT_;
8384

84-
dynamicgraph::Signal <dynamicgraph::Vector, int> d_gainsSOUT_;
85+
dynamicgraph::Signal <dynamicgraph::Vector, sigtime_t> d_gainsSOUT_;
8586

8687
/// Intermediate variables to avoid allocation during control
8788
dynamicgraph::Vector dgforces_;
@@ -99,6 +100,7 @@ protected:
99100
class DeviceToDynamic : public dynamicgraph::Entity
100101
{
101102
public:
103+
typedef dynamicgraph::sigtime_t sigtime_t;
102104
static const std::string CLASS_NAME;
103105
DeviceToDynamic(const std::string& name) :
104106
dynamicgraph::Entity(name), sinSIN(0x0, "DeviceToDynamic("+name+")::input(vector)::sin"),
@@ -112,14 +114,14 @@ public:
112114
inputSize_ = size;
113115
}
114116
private:
115-
dynamicgraph::Vector& compute(dynamicgraph::Vector& res, int time)
117+
dynamicgraph::Vector& compute(dynamicgraph::Vector& res, sigtime_t time)
116118
{
117119
res.head<7>() = sinSIN(time);
118120
res[7] = 0;
119121
return res;
120122
}
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;
123125
int inputSize_;
124126
};
125127

0 commit comments

Comments
 (0)