Skip to content

Commit a0d227e

Browse files
committed
add SensorBase class as base class for sensors
1 parent e0a24b2 commit a0d227e

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

  • urdf_model/include/urdf_model
  • urdf_sensor/include/urdf_sensor

urdf_model/include/urdf_model/model.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include <boost/function.hpp>
4343
#include <urdf_model/link.h>
4444
#include <urdf_exception/exception.h>
45+
#include <urdf_sensor/sensor.h>
4546

4647
namespace urdf {
4748

@@ -197,7 +198,7 @@ class ModelInterface
197198
/// \brief The root is always a link (the parent of the tree describing the robot)
198199
boost::shared_ptr<Link> root_link_;
199200

200-
201+
std::map<std::string, boost::shared_ptr<Sensor> > sensors_;
201202

202203
};
203204

urdf_sensor/include/urdf_sensor/sensor.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,18 @@
7272

7373
namespace urdf{
7474

75-
class VisualSensor
75+
class SensorBase {
76+
public:
77+
enum {VISUAL, FORCE, TACTILE, IMU, GYRO, ACCELERATION, GPS} sensor_type;
78+
virtual ~SensorBase(void)
79+
{
80+
}
81+
};
82+
83+
class VisualSensor : public SensorBase
7684
{
7785
public:
78-
enum {CAMERA, RAY} type;
86+
enum {CAMERA, RAY, DEPTH} type;
7987
virtual ~VisualSensor(void)
8088
{
8189
}
@@ -148,8 +156,7 @@ class Sensor
148156
Pose origin;
149157

150158
/// sensor
151-
boost::shared_ptr<VisualSensor> sensor;
152-
159+
boost::shared_ptr<SensorBase> sensor;
153160

154161
/// Parent link element name. A pointer is stored in parent_link_.
155162
std::string parent_link_name;

0 commit comments

Comments
 (0)