Changeset 178 in flair-src for trunk/tools/Controller/Mavlink/src

Timestamp:

May 19, 2017, 4:15:52 PM (8 years ago)

Author:

Bayard Gildas

Message:

Change Udp socket object name (from "Socket" to "UdpSocket")

Location:

trunk/tools/Controller/Mavlink/src

Files:

• Forwarder.cpp (modified) (2 diffs)
• Forwarder.h (modified) (3 diffs)
• GuiFlair.cpp (modified) (2 diffs)
• GuiFlair.h (modified) (2 diffs)

trunk/tools/Controller/Mavlink/src/Forwarder.cpp

@@ -18 +18 @@
 #include "Forwarder.h"
 
-#include <Socket.h>
+#include <UdpSocket.h>
 #include <Thread.h>
 #include <FrameworkManager.h>
@@ -41 +41 @@
   // cout << "output socket : " << outputAddress + ":" + to_string(outputPort) << endl;
 
-  inputSocket = new Socket((Thread *)this, "input socket", inputPort);
-  outputSocket = new Socket((Thread *)this, "output socket", outputAddress + ":" + to_string(outputPort));
+  inputSocket = new UdpSocket((Thread *)this, "input socket", inputPort);
+  outputSocket = new UdpSocket((Thread *)this, "output socket", outputAddress + ":" + to_string(outputPort));
 }
 

trunk/tools/Controller/Mavlink/src/Forwarder.h

@@ -23 +23 @@
 #include <Thread.h>
 
-namespace flair {
-namespace core {
-  class Socket;
-}
-}
+namespace flair { namespace core {
+  class UdpSocket;
+} }
 
 class Forwarder : public flair::core::Thread {
@@ -41 +39 @@
   void Run();
 
-  flair::core::Socket *inputSocket;
+  flair::core::UdpSocket *inputSocket;
   std::string inputAddress;
   int inputPort;
@@ -47 +45 @@
   const int inputBufferSize = 200;
 
-  flair::core::Socket *outputSocket;
+  flair::core::UdpSocket *outputSocket;
   std::string outputAddress;
   int outputPort;

trunk/tools/Controller/Mavlink/src/GuiFlair.cpp

@@ -20 +20 @@
 #include "GuiInterface.h"
 
-#include <Socket.h>
+#include <UdpSocket.h>
 
 //todo remove for tests
@@ -34 +34 @@
         cout << "MavPlanner GuiFlair constructor" << endl;
 
-        outputSocket = new Socket((Thread *)this, "output socket", "127.0.0.1:5036");
+        outputSocket = new UdpSocket((Thread *)this, "output socket", "127.0.0.1:5036");
 
         // outputSocket = new Socket(parent, "output socket", "127.255.255.255:9001", true);
-        inputSocket = new Socket((Thread *)this, "input socket", 9001);
+        inputSocket = new UdpSocket((Thread *)this, "input socket", 9001);
 }
 

trunk/tools/Controller/Mavlink/src/GuiFlair.h

@@ -24 +24 @@
 #include "GuiInterface.h"
 
-namespace flair {
-namespace core {
-  class Socket;
-}
-}
+namespace flair { namespace core {
+  class UdpSocket;
+} }
 
 class GuiFlair : public GuiInterface {
@@ -44 +42 @@
 
 private:
-  flair::core::Socket *inputSocket;
-  flair::core::Socket *outputSocket;
+  flair::core::UdpSocket *inputSocket;
+  flair::core::UdpSocket *outputSocket;
   std::string outputAddress;
   int outputPort;