Changeset 178 in flair-src for trunk/lib/FlairSensorActuator


Ignore:
Timestamp:
May 19, 2017, 4:15:52 PM (5 years ago)
Author:
Bayard Gildas
Message:

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

Location:
trunk/lib/FlairSensorActuator/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairSensorActuator/src/EmulatedController.cpp

    r157 r178  
    1414#include <Controller.h>
    1515#include <TcpSocket.h>
    16 #include <Socket.h>
     16#include <UdpSocket.h>
    1717#include <cstring>
    1818#include <string>
  • trunk/lib/FlairSensorActuator/src/HostEthController.cpp

    r137 r178  
    2626#include <TargetController.h>
    2727#include <TcpSocket.h>
    28 #include <Socket.h>
     28#include <UdpSocket.h>
    2929#include <cstring>
    3030#include <string>
     
    5454  controlSocket = new TcpSocket((Thread *)this, "eth controller control socket",
    5555                                blocking, !blocking);
    56   dataSocket = new Socket((Thread *)this, "eth controller data socket",
     56  dataSocket = new UdpSocket((Thread *)this, "eth controller data socket",
    5757                          _address + ":" + std::to_string(_port + 1));
    5858  dataSender =
  • trunk/lib/FlairSensorActuator/src/HostEthController.h

    r137 r178  
    2828class cvmatrix;
    2929class TcpSocket;
    30 class Socket;
     30class UdpSocket;
    3131class Mutex;
    3232}
     
    6464  std::string controllerName;
    6565  core::TcpSocket *controlSocket; // connection to the target
    66   core::Socket *dataSocket;
     66  core::UdpSocket *dataSocket;
    6767  std::string targetAddress;
    6868  int targetPort;
  • trunk/lib/FlairSensorActuator/src/TargetEthController.cpp

    r137 r178  
    2121#include <FrameworkManager.h>
    2222#include <TcpSocket.h>
    23 #include <Socket.h>
     23#include <UdpSocket.h>
    2424#include <cstring>
    2525#include <string>
     
    4444      new TcpSocket(getFrameworkManager(), "TEC_listening_socket", blocking, blocking);
    4545  dataSocket =
    46       new Socket(getFrameworkManager(), "TEC_data_socket", _port + 1); // receiving side
     46      new UdpSocket(getFrameworkManager(), "TEC_data_socket", _port + 1); // receiving side
    4747}
    4848
  • trunk/lib/FlairSensorActuator/src/TargetEthController.h

    r137 r178  
    2929class cvmatrix;
    3030class TcpSocket;
    31 class Socket;
     31class UdpSocket;
    3232}
    3333namespace gui {
     
    7878  int listeningPort;
    7979  core::TcpSocket *controlSocket = NULL;
    80   core::Socket *dataSocket;
     80  core::UdpSocket *dataSocket;
    8181  std::string *axisName = NULL;
    8282  std::string *buttonName = NULL;
Note: See TracChangeset for help on using the changeset viewer.