From: Dominic L. <ma...@us...> - 2005-03-29 15:21:38
|
Update of /cvsroot/robotflow/RobotFlow/Pioneer2/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Pioneer2/include Modified Files: PSOSPacket.h Pioneer2Connect.h Pioneer2GripperState.h Pioneer2PacketManager.h Log Message: Now using the RobotFlow namespace and the FD namespace Index: Pioneer2GripperState.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/include/Pioneer2GripperState.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pioneer2GripperState.h 2 Jan 2005 14:43:58 -0000 1.3 --- Pioneer2GripperState.h 29 Mar 2005 15:20:44 -0000 1.4 *************** *** 20,25 **** #include "Object.h" ! ! class TP2GripperState : public Object { public: --- 20,26 ---- #include "Object.h" ! namespace RobotFlow { ! ! class TP2GripperState : public FD::Object { public: *************** *** 54,56 **** --- 55,58 ---- }; + }//namespace RobotFlow #endif Index: Pioneer2Connect.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/include/Pioneer2Connect.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Pioneer2Connect.h 2 Jan 2005 14:43:58 -0000 1.7 --- Pioneer2Connect.h 29 Mar 2005 15:20:44 -0000 1.8 *************** *** 20,32 **** #include "BufferedNode.h" ! ! class Pioneer2Connect : public BufferedNode{ public: ! Pioneer2Connect(std::string nodeName, ParameterSet params); ! void calculate(int output_id, int count, Buffer &out); virtual ~Pioneer2Connect(); --- 20,32 ---- #include "BufferedNode.h" + namespace RobotFlow { ! class Pioneer2Connect : public FD::BufferedNode{ public: ! Pioneer2Connect(std::string nodeName, FD::ParameterSet params); ! void calculate(int output_id, int count, FD::Buffer &out); virtual ~Pioneer2Connect(); *************** *** 48,50 **** --- 48,52 ---- }; + + }//namespace RobotFlow #endif Index: Pioneer2PacketManager.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/include/Pioneer2PacketManager.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Pioneer2PacketManager.h 2 Jan 2005 14:43:58 -0000 1.6 --- Pioneer2PacketManager.h 29 Mar 2005 15:20:44 -0000 1.7 *************** *** 25,28 **** --- 25,30 ---- #include "pseudosem.h" + namespace RobotFlow { + // data for all the robots #define P2OS_CYCLETIME_USEC 50000 *************** *** 50,54 **** ! class Pioneer2Data : public Object { public: --- 52,56 ---- ! class Pioneer2Data : public FD::Object { public: *************** *** 285,289 **** ! #endif --- 287,291 ---- ! }//namespace RobotFlow #endif Index: PSOSPacket.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/include/PSOSPacket.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PSOSPacket.h 2 Jan 2005 14:43:58 -0000 1.3 --- PSOSPacket.h 29 Mar 2005 15:20:43 -0000 1.4 *************** *** 20,23 **** --- 20,25 ---- #include <iostream> + namespace RobotFlow { + class PSOSPacket { *************** *** 45,47 **** --- 47,50 ---- }; + }//namespace RobotFlow #endif |