[Robotflow-cvs] RobotFlow/Devices/include LaserDevice.h,1.2,1.3 SICKLMS200.h,1.2,1.3 SNCRZ30.h,1.10,1.11 SerialDriver.h,1.1,1.2

[Dominic L. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Devices/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Devices/include

Modified Files:
	LaserDevice.h SICKLMS200.h SNCRZ30.h SerialDriver.h 
Log Message:
Now using the RobotFlow namespace and the FD namespace

Index: SNCRZ30.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/SNCRZ30.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SNCRZ30.h	2 Jan 2005 14:43:55 -0000	1.10
--- SNCRZ30.h	29 Mar 2005 15:20:38 -0000	1.11
***************
*** 27,36 ****
  //(C) Dominic Letourneau 2004
  
  
! class SNCRZ30 : public BufferedNode{
  
   public:
  
!   SNCRZ30(std::string nodeName, ParameterSet params);
  
    ~SNCRZ30();
--- 27,37 ----
  //(C) Dominic Letourneau 2004
  
+ namespace RobotFlow {
  
! class SNCRZ30 : public FD::BufferedNode{
  
   public:
  
!   SNCRZ30(std::string nodeName, FD::ParameterSet params);
  
    ~SNCRZ30();
***************
*** 38,42 ****
    SNCRZ30(const std::string &host, int port = 80);
  
!   virtual void calculate(int output_id, int count, Buffer &out);
  
    int connect(const std::string &host);
--- 39,43 ----
    SNCRZ30(const std::string &host, int port = 80);
  
!   virtual void calculate(int output_id, int count, FD::Buffer &out);
  
    int connect(const std::string &host);
***************
*** 106,109 ****
--- 107,111 ----
  };
  
+ }//namespace RobotFlow
  
  #endif

Index: LaserDevice.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/LaserDevice.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LaserDevice.h	2 Jan 2005 14:43:55 -0000	1.2
--- LaserDevice.h	29 Mar 2005 15:20:37 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  #define LASERDEVICE_H
  
+ namespace RobotFlow {
  
  enum eMeasurementMode {
***************
*** 90,93 ****
  };
  
! 
  #endif
--- 91,94 ----
  };
  
! }//namespace RobotFlow
  #endif

Index: SerialDriver.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/SerialDriver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SerialDriver.h	24 Apr 2002 00:23:52 -0000	1.1
--- SerialDriver.h	29 Mar 2005 15:20:38 -0000	1.2
***************
*** 3,8 ****
  /*************************************/ 
  
! #define BAUDRATE B9600
  
  int Port_initialisation(const char *serial_port);
  void End_session(int fd);
--- 3,12 ----
  /*************************************/ 
  
! #define BAUDRATE B38400
! 
! namespace RobotFlow {
  
  int Port_initialisation(const char *serial_port);
  void End_session(int fd);
+ 
+ }//namespace RobotFlow

Index: SICKLMS200.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/SICKLMS200.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SICKLMS200.h	2 Jan 2005 14:43:55 -0000	1.2
--- SICKLMS200.h	29 Mar 2005 15:20:38 -0000	1.3
***************
*** 6,18 ****
  #include "BufferedNode.h"
  
  class LaserDevice;
  
! class SICKLMS200 : public BufferedNode
  {
  
    public:
!    SICKLMS200(std::string nodeName, ParameterSet params);
     ~SICKLMS200();
!    virtual void calculate(int output_id, int count, Buffer &out);
  
    private:
--- 6,20 ----
  #include "BufferedNode.h"
  
+ namespace RobotFlow {
+ 
  class LaserDevice;
  
! class SICKLMS200 : public FD::BufferedNode
  {
  
    public:
!   SICKLMS200(std::string nodeName, FD::ParameterSet params);
     ~SICKLMS200();
!    virtual void calculate(int output_id, int count, FD::Buffer &out);
  
    private:
***************
*** 35,38 ****
  };
  
! 
  #endif
--- 37,40 ----
  };
  
! }//namespace RobotFlow
  #endif