|
From: <hsu...@us...> - 2008-07-29 05:12:36
|
Revision: 2235
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=2235&view=rev
Author: hsujohnhsu
Date: 2008-07-29 05:12:45 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
added mission namespace specifications.
Modified Paths:
--------------
pkg/trunk/mechanism/mechanism_control/include/mechanism_control/base_control.h
pkg/trunk/mechanism/mechanism_control/include/mechanism_control/gazebo_control.h
pkg/trunk/mechanism/mechanism_control/include/mechanism_control/single_control.h
pkg/trunk/mechanism/mechanism_control/src/base_control.cpp
pkg/trunk/mechanism/mechanism_control/src/gazebo_control.cpp
pkg/trunk/mechanism/mechanism_control/src/single_control.cpp
pkg/trunk/robot_models/robot_mechanism_model/include/mechanism_model/robot.h
Modified: pkg/trunk/mechanism/mechanism_control/include/mechanism_control/base_control.h
===================================================================
--- pkg/trunk/mechanism/mechanism_control/include/mechanism_control/base_control.h 2008-07-29 04:56:32 UTC (rev 2234)
+++ pkg/trunk/mechanism/mechanism_control/include/mechanism_control/base_control.h 2008-07-29 05:12:45 UTC (rev 2235)
@@ -74,7 +74,7 @@
HardwareInterface *hw;
- Robot *r;
+ mechanism::Robot *r;
void initRobot();
Modified: pkg/trunk/mechanism/mechanism_control/include/mechanism_control/gazebo_control.h
===================================================================
--- pkg/trunk/mechanism/mechanism_control/include/mechanism_control/gazebo_control.h 2008-07-29 04:56:32 UTC (rev 2234)
+++ pkg/trunk/mechanism/mechanism_control/include/mechanism_control/gazebo_control.h 2008-07-29 05:12:45 UTC (rev 2235)
@@ -82,7 +82,7 @@
HardwareInterface *hardwareInterface;
- Robot *r;
+ mechanism::Robot *r;
void initRobot();
Modified: pkg/trunk/mechanism/mechanism_control/include/mechanism_control/single_control.h
===================================================================
--- pkg/trunk/mechanism/mechanism_control/include/mechanism_control/single_control.h 2008-07-29 04:56:32 UTC (rev 2234)
+++ pkg/trunk/mechanism/mechanism_control/include/mechanism_control/single_control.h 2008-07-29 05:12:45 UTC (rev 2235)
@@ -69,7 +69,7 @@
HardwareInterface *hw;
- Robot *r;
+ mechanism::Robot *r;
void initRobot();
Modified: pkg/trunk/mechanism/mechanism_control/src/base_control.cpp
===================================================================
--- pkg/trunk/mechanism/mechanism_control/src/base_control.cpp 2008-07-29 04:56:32 UTC (rev 2234)
+++ pkg/trunk/mechanism/mechanism_control/src/base_control.cpp 2008-07-29 05:12:45 UTC (rev 2235)
@@ -51,7 +51,7 @@
}
void BaseControl::initRobot(){
- r = new Robot("robot");
+ r = new mechanism::Robot("robot");
r->numJoints = NUM_JOINTS;
r->numLinks = NUM_JOINTS;
Modified: pkg/trunk/mechanism/mechanism_control/src/gazebo_control.cpp
===================================================================
--- pkg/trunk/mechanism/mechanism_control/src/gazebo_control.cpp 2008-07-29 04:56:32 UTC (rev 2234)
+++ pkg/trunk/mechanism/mechanism_control/src/gazebo_control.cpp 2008-07-29 05:12:45 UTC (rev 2235)
@@ -55,7 +55,7 @@
}
void GazeboMechanismControl::initRobot(){
- r = new Robot((char*)"robot");
+ r = new mechanism::Robot((char*)"robot");
r->numJoints = PR2::MAX_JOINTS;
r->numLinks = PR2::MAX_JOINTS;
Modified: pkg/trunk/mechanism/mechanism_control/src/single_control.cpp
===================================================================
--- pkg/trunk/mechanism/mechanism_control/src/single_control.cpp 2008-07-29 04:56:32 UTC (rev 2234)
+++ pkg/trunk/mechanism/mechanism_control/src/single_control.cpp 2008-07-29 05:12:45 UTC (rev 2235)
@@ -45,7 +45,7 @@
void SingleControl::init(HardwareInterface *hw){
this->hw = hw;
- r = new Robot((char*)"robot");
+ r = new mechanism::Robot((char*)"robot");
r->numJoints = NUM_JOINTS;
r->numTransmissions = NUM_JOINTS;
Modified: pkg/trunk/robot_models/robot_mechanism_model/include/mechanism_model/robot.h
===================================================================
--- pkg/trunk/robot_models/robot_mechanism_model/include/mechanism_model/robot.h 2008-07-29 04:56:32 UTC (rev 2234)
+++ pkg/trunk/robot_models/robot_mechanism_model/include/mechanism_model/robot.h 2008-07-29 05:12:45 UTC (rev 2235)
@@ -54,6 +54,8 @@
int numLinks;
Joint *joint; // TODO: delete
int numJoints;
+ int numTransmissions;
+ SimpleTransmission *transmission; // TODO: delete
std::vector<Joint*> joints_;
std::vector<Transmission*> transmissions_;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|