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


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed

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

    r137 r178  
    1818#include "Forwarder.h"
    1919
    20 #include <Socket.h>
     20#include <UdpSocket.h>
    2121#include <Thread.h>
    2222#include <FrameworkManager.h>
    … …  
    4141  // cout << "output socket : " << outputAddress + ":" + to_string(outputPort) << endl;
    4242
    43   inputSocket = new Socket((Thread *)this, "input socket", inputPort);
    44   outputSocket = new Socket((Thread *)this, "output socket", outputAddress + ":" + to_string(outputPort));
     43  inputSocket = new UdpSocket((Thread *)this, "input socket", inputPort);
     44  outputSocket = new UdpSocket((Thread *)this, "output socket", outputAddress + ":" + to_string(outputPort));
    4545}
    4646

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

    r137 r178  
    2323#include <Thread.h>
    2424
    25 namespace flair {
    26 namespace core {
    27   class Socket;
    28 }
    29 }
     25namespace flair { namespace core {
     26  class UdpSocket;
     27} }
    3028
    3129class Forwarder : public flair::core::Thread {
    … …  
    4139  void Run();
    4240
    43   flair::core::Socket *inputSocket;
     41  flair::core::UdpSocket *inputSocket;
    4442  std::string inputAddress;
    4543  int inputPort;
    … …  
    4745  const int inputBufferSize = 200;
    4846
    49   flair::core::Socket *outputSocket;
     47  flair::core::UdpSocket *outputSocket;
    5048  std::string outputAddress;
    5149  int outputPort;

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

    r137 r178  
    2020#include "GuiInterface.h"
    2121
    22 #include <Socket.h>
     22#include <UdpSocket.h>
    2323
    2424//todo remove for tests
    … …  
    3434        cout << "MavPlanner GuiFlair constructor" << endl;
    3535
    36         outputSocket = new Socket((Thread *)this, "output socket", "127.0.0.1:5036");
     36        outputSocket = new UdpSocket((Thread *)this, "output socket", "127.0.0.1:5036");
    3737
    3838        // outputSocket = new Socket(parent, "output socket", "127.255.255.255:9001", true);
    39         inputSocket = new Socket((Thread *)this, "input socket", 9001);
     39        inputSocket = new UdpSocket((Thread *)this, "input socket", 9001);
    4040}
    4141

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

    r137 r178  
    2424#include "GuiInterface.h"
    2525
    26 namespace flair {
    27 namespace core {
    28   class Socket;
    29 }
    30 }
     26namespace flair { namespace core {
     27  class UdpSocket;
     28} }
    3129
    3230class GuiFlair : public GuiInterface {
    … …  
    4442
    4543private:
    46   flair::core::Socket *inputSocket;
    47   flair::core::Socket *outputSocket;
     44  flair::core::UdpSocket *inputSocket;
     45  flair::core::UdpSocket *outputSocket;
    4846  std::string outputAddress;
    4947  int outputPort;       
Note: See TracChangeset for help on using the changeset viewer.