Changeset 309 in flair-src for trunk/lib/FlairSensorActuator/src/unexported

Timestamp:

Mar 13, 2019, 4:40:18 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

vrpnlite support

File:

• trunk/lib/FlairSensorActuator/src/unexported/VrpnClient_impl.h (modified) (4 diffs)

trunk/lib/FlairSensorActuator/src/unexported/VrpnClient_impl.h

@@ -29 +29 @@
 class Mutex;
 class SerialPort;
+class UdpSocket;
 }
 namespace gui {
@@ -50 +51 @@
   VrpnClient_impl(flair::sensor::VrpnClient *self, std::string name,
                   flair::core::SerialPort *serialport, uint16_t us_period);
+  VrpnClient_impl(flair::sensor::VrpnClient *self, std::string name,
+                  uint16_t port);
   ~VrpnClient_impl();
   void AddTrackable(VrpnObject_impl *obj);    // normal
@@ -56 +59 @@
   void ComputeRotations(flair::core::Vector3Df &point);
   void ComputeRotations(flair::core::Quaternion &quat);
-  bool UseXbee(void);
   void Run(void);
   flair::gui::Tab *setup_tab;
   flair::gui::TabWidget *tab;
   vrpn_Connection *connection;
+  flair::sensor::VrpnClient::ConnectionType_t connectionType;
 
 private:
+  void CommonConstructor(std::string name);
   flair::sensor::VrpnClient *self;
   flair::core::Mutex *mutex;
   uint16_t us_period;
   std::vector<VrpnObject_impl *> trackables;
-  typedef struct xbee_object {
+  typedef struct liteObject_t {
     VrpnObject_impl *vrpnobject;
     uint8_t id;
-  } xbee_object;
+  } liteObject_t;
 
-  std::vector<xbee_object> xbee_objects;
+  std::vector<liteObject_t> liteObjects;
   flair::gui::Tab *main_tab;
   flair::core::OneAxisRotation *rotation_1, *rotation_2;
@@ -78 +82 @@
         bool isConnected;//only for ip connection, not for xbee
   std::string address;
+  flair::core::UdpSocket* dataSocket;
+  
 };