Changeset 178 in flair-src for trunk/lib/FlairSensorActuator/src
- Timestamp:
- May 19, 2017, 4:15:52 PM (7 years ago)
- Location:
- trunk/lib/FlairSensorActuator/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairSensorActuator/src/EmulatedController.cpp
r157 r178 14 14 #include <Controller.h> 15 15 #include <TcpSocket.h> 16 #include < Socket.h>16 #include <UdpSocket.h> 17 17 #include <cstring> 18 18 #include <string> -
trunk/lib/FlairSensorActuator/src/HostEthController.cpp
r137 r178 26 26 #include <TargetController.h> 27 27 #include <TcpSocket.h> 28 #include < Socket.h>28 #include <UdpSocket.h> 29 29 #include <cstring> 30 30 #include <string> … … 54 54 controlSocket = new TcpSocket((Thread *)this, "eth controller control socket", 55 55 blocking, !blocking); 56 dataSocket = new Socket((Thread *)this, "eth controller data socket",56 dataSocket = new UdpSocket((Thread *)this, "eth controller data socket", 57 57 _address + ":" + std::to_string(_port + 1)); 58 58 dataSender = -
trunk/lib/FlairSensorActuator/src/HostEthController.h
r137 r178 28 28 class cvmatrix; 29 29 class TcpSocket; 30 class Socket;30 class UdpSocket; 31 31 class Mutex; 32 32 } … … 64 64 std::string controllerName; 65 65 core::TcpSocket *controlSocket; // connection to the target 66 core:: Socket *dataSocket;66 core::UdpSocket *dataSocket; 67 67 std::string targetAddress; 68 68 int targetPort; -
trunk/lib/FlairSensorActuator/src/TargetEthController.cpp
r137 r178 21 21 #include <FrameworkManager.h> 22 22 #include <TcpSocket.h> 23 #include < Socket.h>23 #include <UdpSocket.h> 24 24 #include <cstring> 25 25 #include <string> … … 44 44 new TcpSocket(getFrameworkManager(), "TEC_listening_socket", blocking, blocking); 45 45 dataSocket = 46 new Socket(getFrameworkManager(), "TEC_data_socket", _port + 1); // receiving side46 new UdpSocket(getFrameworkManager(), "TEC_data_socket", _port + 1); // receiving side 47 47 } 48 48 -
trunk/lib/FlairSensorActuator/src/TargetEthController.h
r137 r178 29 29 class cvmatrix; 30 30 class TcpSocket; 31 class Socket;31 class UdpSocket; 32 32 } 33 33 namespace gui { … … 78 78 int listeningPort; 79 79 core::TcpSocket *controlSocket = NULL; 80 core:: Socket *dataSocket;80 core::UdpSocket *dataSocket; 81 81 std::string *axisName = NULL; 82 82 std::string *buttonName = NULL;
Note:
See TracChangeset
for help on using the changeset viewer.