Changeset 31 in pacpussensors
- Timestamp:
- Jan 17, 2014, 6:18:04 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r30 r31 18 18 set(PacpusSensors_MAJOR_VERSION 0) 19 19 set(PacpusSensors_MINOR_VERSION 1) 20 set(PacpusSensors_PATCH_VERSION 1)20 set(PacpusSensors_PATCH_VERSION 0) 21 21 set(PacpusSensors_VERSION 22 22 "${PacpusSensors_MAJOR_VERSION}.${PacpusSensors_MINOR_VERSION}.${PacpusSensors_PATCH_VERSION}") … … 92 92 # Build the PacpusSensors' modules 93 93 # ======================================== 94 add_subdirectory(Alasca)94 #add_subdirectory(Alasca) 95 95 add_subdirectory(CanGateway) 96 #add_subdirectory(LMOComponent) 96 97 add_subdirectory(StdDbtPlayerComponents) 97 # add_subdirectory(Dualshock)98 # add_subdirectory(Dualshock) 98 99 #add_subdirectory(Wifibot) 99 #add_subdirectory(PacpusSocket) 100 #add_subdirectory(OpencvVideo) 101 #add_subdirectory(ShMemInterface) 100 add_subdirectory(PacpusSocket) 102 101 103 102 # ======================================== -
trunk/CanGateway/CMakeLists.txt
r11 r31 34 34 # Link directories 35 35 # ======================================== 36 link_directories( ${PACPUS_LIB_DIR} 36 link_directories( 37 ${PACPUS_LIB_DIR} 37 38 ${CanGateway_SOURCE_DIR}/driver/libs 38 39 ) 40 39 41 40 42 pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} ) … … 121 123 set(LIBS 122 124 # add your specific libraries to link here 123 vcandm32.lib 124 vxlapi.lib 125 126 optimized vcandm32.lib debug vcandm32.lib 127 optimized vxlapi.lib debug vxlapi.lib 125 128 ) 126 129 endif(WIN32) … … 129 132 set(LIBS 130 133 # add your specific libraries to link here 131 # pcan134 # pcan 132 135 ) 133 136 endif(UNIX) … … 140 143 ${PACPUS_DEPENDENCIES_LIB} 141 144 ${LIBS} 142 # PacpusTools145 # optimized PacpusTools debug PacpusTools_d 143 146 ) 144 147 pacpus_folder(${PROJECT_NAME} "components") -
trunk/CanGateway/CanFrameBase.h
r29 r31 16 16 #define CANFRAMEBASE_H 17 17 18 #include " driver/CanDriverBase.h"18 #include "../driver/CanDriverBase.h" 19 19 20 20 namespace pacpus { -
trunk/CanGateway/structureCan.h
r29 r31 1 1 // ********************************************************************* 2 2 // created: 2008/2/28 - 16:24 3 // filename: structureCan .h3 // filename: structureCanCarmen.h 4 4 // 5 5 // author: Gerald Dherbomez 6 // Copyright Heudiasyc UMR UTC/CNRS 72536 // Copyright Heudiasyc UMR UTC/CNRS 6599 7 7 // 8 8 // version: $Id: $ 9 9 // 10 // purpose: Description of the CAN structures 10 // purpose: Description of the CAN structures for Carmen 11 11 // 12 // to add: 13 // 094 - comodos 14 // 612 - eclairage 15 // 208 - couple 16 // 349 - couple boite vitesse 17 // 552 - heure 18 // 19 // to verify: 20 // 350 and 319 not present in real time acquisition 12 21 // ********************************************************************* 13 22 14 #ifndef __STRUCTURECAN_H__15 #define __STRUCTURECAN_H__23 #ifndef STRUCTURECANCARMEN_H 24 #define STRUCTURECANCARMEN_H 16 25 17 26 #include <cstddef> -
trunk/PacpusSocket/PacpusSocket.cpp
r21 r31 90 90 { 91 91 if (udpSocket_->bind(QHostAddress::Any, port2bind_, QUdpSocket::DontShareAddress)) 92 qDebug() << "Socket bound for server on port " << port2bind_;92 qDebug() << "Socket bound for server on port " << port2bind_; 93 93 else 94 qWarning() << "Failed to bind socket on port " << port2bind_;94 qWarning() << "Failed to bind socket on port " << port2bind_; 95 95 } 96 96 else if (socketType_ == "client") 97 97 { 98 98 if (udpSocket_->bind(QHostAddress::Any, port2send_ + 1, QUdpSocket::DontShareAddress)) 99 qDebug() << "Socket bound for client on port " << port2send_ + 1;99 qDebug() << "Socket bound for client on port " << port2send_ + 1; 100 100 else 101 qWarning() << "Failed to bind socket" << port2send_ + 1;101 qWarning() << "Failed to bind socket" << port2send_ + 1; 102 102 } 103 103 … … 113 113 { 114 114 if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), address2send_, port2send_)) == -1) 115 qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl;116 else117 qDebug() << "TO NETWORK:" << address2send_ << port2send_ << frame << "size" << sent;115 qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl; 116 //else 117 //qDebug() << "TO NETWORK:" << address2send_ << port2send_ << frame << "size" << sent; 118 118 } 119 119 else if (socketType_ == "server") … … 123 123 if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), listClients[i]->getAddress(), listClients[i]->getPort())) == -1) 124 124 qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl; 125 else126 qDebug() << "TO NETWORK:" << listClients[i]->getAddress() << listClients[i]->getPort() << frame << "size" << sent;125 //else 126 //qDebug() << "TO NETWORK:" << listClients[i]->getAddress() << listClients[i]->getPort() << frame << "size" << sent; 127 127 } 128 128 } … … 137 137 { 138 138 if ((sent = udpSocket_->writeDatagram(frame, address2send_, port2send_)) == -1) 139 qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl;140 else141 qDebug() << "TO NETWORK:" << address2send_ << port2send_ << frame << "size" << sent;139 qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl; 140 //else 141 //qDebug() << "TO NETWORK:" << address2send_ << port2send_ << frame << "size" << sent; 142 142 } 143 143 else if (socketType_ == "server") … … 145 145 for (int i = 0; i < listClients.size(); i++) 146 146 { 147 if ((sent = udpSocket_->writeDatagram(frame, listClients[i]->getAddress(), listClients[i]->getPort())) == -1)148 149 else150 147 if ((sent = udpSocket_->writeDatagram(frame, listClients[i]->getAddress(), listClients[i]->getPort())) == -1) 148 qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl; 149 //else 150 //qDebug() << "TO NETWORK:" << listClients[i]->getAddress() << listClients[i]->getPort() << frame << "size" << sent; 151 151 } 152 152 } -
trunk/StdDbtPlayerComponents/CMakeLists.txt
r27 r31 60 60 # Call MOC 61 61 # ======================================== 62 qt _wrap_cpp(62 qt4_wrap_cpp( 63 63 PROJECT_MOC_SRCS 64 64 ${FILES_TO_MOC} 65 65 ) 66 66 67 qt _wrap_ui(67 qt4_wrap_ui( 68 68 PROJECT_UI_SRCS 69 69 ${UI_FILES}
Note:
See TracChangeset
for help on using the changeset viewer.