Changeset 74 in flair-dev for trunk/include

Timestamp:

05/24/18 11:46:38 (6 years ago)

Author:

Sanahuja Guillaume

Message:

added simupressuresensor

Location:

trunk/include

Files:

• FlairCore/ConnectedSocket.h (modified) (4 diffs)
• FlairCore/IODevice.h (modified) (2 diffs)
• FlairCore/Semaphore.h (modified) (3 diffs)
• FlairCore/SharedMem.h (modified) (1 diff)
• FlairCore/TcpSocket.h (modified) (2 diffs)
• FlairSensorActuator/HostEthController.h (modified) (3 diffs)
• FlairSensorActuator/SimuPressureSensor.h (added)
• FlairSimulator/SimuPressureSensor.h (added)
• FlairSimulator/SimuUs.h (modified) (1 diff)

trunk/include/FlairCore/ConnectedSocket.h

@@ -53 +53 @@
   * \brief Returns a socket on a new incoming connexion
   *
-  * \param ConnectedSocket &listeningSocket
+  * \param timeout timeout (in nanoseconds)
   */
   virtual ConnectedSocket *Accept(
@@ -65 +65 @@
   * \param unsigned int port
   * \param const distantAddress
-  * \param timeout timeout (in milliseconds)
+  * \param timeout timeout (in nanoseconds)
   */
   virtual bool Connect(const unsigned int port,
@@ -71 +71 @@
 
   /*!
-  * \brief Send a message
+  * \brief Send a message waiting up to timeout ns
   *
   * \param message message
   * \param message_len message length
-  * \param timeout timeout (in milliseconds)
+  * \param timeout timeout (in nanoseconds)
   */
   virtual ssize_t SendMessage(const char *message, size_t message_len,
@@ -83 +83 @@
   * \brief Receive a message
   *
-  * Receive a message and wait up to timeout. \n
+  * Receive a message and wait up to timeout ns. \n
   *
   * \param buf buffer to put the message
   * \param buf_len buffer length
-  * \param timeout timeout (in milliseconds)
+  * \param timeout timeout (in nanoseconds)
   *
   * \return size of the received message

trunk/include/FlairCore/IODevice.h

@@ -151 +151 @@
     void SetIsReady(bool status);
 
-private:
   /*!
   * \brief Update using provided datas
@@ -164 +163 @@
   virtual void UpdateFrom(const io_data *data) = 0;
 
+  private:
   class IODevice_impl *pimpl_;
 };

trunk/include/FlairCore/Semaphore.h

@@ -31 +31 @@
 
 public:
+  enum class Type { anonymous, named };
   /*!
   * \brief Constructor
@@ -39 +40 @@
   * \param name name
   */
-  Semaphore(const Object *parent, uint32_t initialValue, std::string name = "");
+  Semaphore(const Object *parent, uint32_t initialValue, std::string name = "", Type type=Type::anonymous);
 
   /*!
@@ -74 +75 @@
 private:
   class Semaphore_impl *pimpl_;
+  Type type;
 };
 

trunk/include/FlairCore/SharedMem.h

@@ -40 +40 @@
   * \param parent parent
   * \param name name
-  * \param size size of the shared memory
-  * \param blockOnRead if true reading will block if nothing written
+  * \param size size of the shared memory:w
+   *
+  * \param type mutex or producerConsumer. Mutex type is for symmetrical use (default)
   */
   SharedMem(const Object *parent, std::string name, size_t size, Type type=Type::mutex);

trunk/include/FlairCore/TcpSocket.h

@@ -30 +30 @@
   void Listen(const unsigned int port, const std::string localAddress = "ANY");
   TcpSocket *Accept(
-      Time timeout = 0); // should throw an exception if not a listening socket
+      Time timeout = TIME_INFINITE);
   bool Connect(const unsigned int distantPort, const std::string distantAddress,
-               Time timeout = 0); // timeout in milliseconds
-  ssize_t SendMessage(const char *message, size_t message_len,
-                      Time timeout = 0); // timeout in milliseconds
-  ssize_t RecvMessage(char *buf, size_t buf_len,
-                      Time timeout = 0); // timeout in milliseconds
+               Time timeout = TIME_INFINITE);
+  ssize_t SendMessage(const char *message, size_t message_len, Time timeout = TIME_INFINITE);
+  ssize_t RecvMessage(char *buf, size_t buf_len, Time timeout = TIME_INFINITE);
 
   uint16_t NetworkToHost16(uint16_t data);
@@ -48 +46 @@
   bool blockOnReceive;
   bool isConnected;
+  bool isListening;
   unsigned int distantPort;
   std::string distantAddress;
+  char *sendRingBuffer, *recvRingBuffer;
 };
 

trunk/include/FlairSensorActuator/HostEthController.h

@@ -25 +25 @@
 
 namespace flair {
-namespace core {
-class Matrix;
-class TcpSocket;
-class UdpSocket;
-class Mutex;
-}
-namespace gui {
-class Tab;
-class TabWidget;
-class DataPlot1D;
-}
+  namespace core {
+    class Matrix;
+    class TcpSocket;
+    class UdpSocket;
+    class Mutex;
+  }
+  namespace gui {
+    class Tab;
+    class TabWidget;
+    class DataPlot1D;
+  }
 }
 
@@ -47 +47 @@
 *through ethernet connection
 *
-* There are 2 communication channels:
+* There are 3 communication channels:
 *   - 1 connection with the ground station to display the values. Output for
-*analog sticks is normalized in the range [-1, 1] (float values)
-*   - 1 connection with the target to send the controller values (and receive
-*controller state modification requests)
+*analog sticks is normalized in the range [-1, 1] (float values) (through DrawUserInterface, use a UDT socket)
+*   - 1 connection with the target to send the controller values (through udp socket - high bandwitdh, packets may be discarded)
+*   - 1 connection with the target to receive controller state modification requests (through tcp socket - low bandwidth, packets must not be discarded)
 */
 class HostEthController : public core::Thread, public core::IODevice {
@@ -107 +107 @@
 
   bool ControllerInitialization();
-  bool ConnectedWithTarget();
+  bool ConnectWithTarget();
   void SendControllerInfo();
   void Run();

trunk/include/FlairSimulator/SimuUs.h

@@ -67 +67 @@
   */
   void UpdateFrom(const core::io_data *data){};
-
-  /*!
-  * \brief Run function
-  *
-  * Reimplemented from Thread.
-  *
-  */
-  void Run(void);
   
   std::string ShMemName(uint32_t modelId,uint32_t deviceId);