Changeset 31 in pacpussensors

Timestamp:

01/17/14 18:18:04 (10 years ago)

Author:

phudelai

Message:

ok

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• CanGateway/CMakeLists.txt (modified) (4 diffs)
• CanGateway/CanFrameBase.h (modified) (1 diff)
• CanGateway/structureCan.h (modified) (1 diff)
• PacpusSocket/PacpusSocket.cpp (modified) (5 diffs)
• StdDbtPlayerComponents/CMakeLists.txt (modified) (1 diff)

trunk/CMakeLists.txt

@@ -18 +18 @@
 set(PacpusSensors_MAJOR_VERSION 0)
 set(PacpusSensors_MINOR_VERSION 1)
-set(PacpusSensors_PATCH_VERSION 1)
+set(PacpusSensors_PATCH_VERSION 0)
 set(PacpusSensors_VERSION
     "${PacpusSensors_MAJOR_VERSION}.${PacpusSensors_MINOR_VERSION}.${PacpusSensors_PATCH_VERSION}")
@@ -92 +92 @@
 # Build the PacpusSensors' modules
 # ========================================
-add_subdirectory(Alasca)
+#add_subdirectory(Alasca)
 add_subdirectory(CanGateway)
+#add_subdirectory(LMOComponent)
 add_subdirectory(StdDbtPlayerComponents)
-#add_subdirectory(Dualshock)
+# add_subdirectory(Dualshock)
 #add_subdirectory(Wifibot)
-#add_subdirectory(PacpusSocket)
-#add_subdirectory(OpencvVideo)
-#add_subdirectory(ShMemInterface)
+add_subdirectory(PacpusSocket)
 
 # ========================================

trunk/CanGateway/CMakeLists.txt

@@ -34 +34 @@
 # Link directories
 # ========================================
-link_directories( ${PACPUS_LIB_DIR}
+link_directories( 
+        ${PACPUS_LIB_DIR}
         ${CanGateway_SOURCE_DIR}/driver/libs
 )
+
 
 pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
@@ -121 +123 @@
     set(LIBS
         # add your specific libraries to link here
-        vcandm32.lib
-        vxlapi.lib
+        
+                optimized vcandm32.lib debug vcandm32.lib
+        optimized vxlapi.lib debug vxlapi.lib
     )
 endif(WIN32)
@@ -129 +132 @@
     set(LIBS
         # add your specific libraries to link here
-       # pcan
+        # pcan
     )
 endif(UNIX)
@@ -140 +143 @@
         ${PACPUS_DEPENDENCIES_LIB}
         ${LIBS}
-#       PacpusTools
+#       optimized PacpusTools debug PacpusTools_d
 )
 pacpus_folder(${PROJECT_NAME} "components")

trunk/CanGateway/CanFrameBase.h

@@ -16 +16 @@
 #define CANFRAMEBASE_H
 
-#include "driver/CanDriverBase.h"
+#include "../driver/CanDriverBase.h"
 
 namespace pacpus {

trunk/CanGateway/structureCan.h

@@ -1 +1 @@
 // *********************************************************************
 //  created:    2008/2/28 - 16:24
-//  filename:   structureCan.h
+//  filename:   structureCanCarmen.h
 //
 //  author:     Gerald Dherbomez
-//              Copyright Heudiasyc UMR UTC/CNRS 7253
+//              Copyright Heudiasyc UMR UTC/CNRS 6599
 //
 //  version:    $Id: $
 //
-//  purpose:    Description of the CAN structures
+//  purpose:    Description of the CAN structures for Carmen
 //
+// to add:
+// 094 - comodos
+// 612 - eclairage
+// 208 - couple
+// 349 - couple boite vitesse
+// 552 - heure
+//
+// to verify:
+//  350 and 319 not present in real time acquisition
 // *********************************************************************
 
-#ifndef __STRUCTURECAN_H__
-#define __STRUCTURECAN_H__
+#ifndef STRUCTURECANCARMEN_H
+#define STRUCTURECANCARMEN_H
 
 #include <cstddef>

trunk/PacpusSocket/PacpusSocket.cpp

@@ -90 +90 @@
         {
             if (udpSocket_->bind(QHostAddress::Any, port2bind_, QUdpSocket::DontShareAddress))
-                qDebug() << "Socket bound for server on port " << port2bind_;
+                        qDebug() << "Socket bound for server on port " << port2bind_;
             else
-                qWarning() << "Failed to bind socket on port " << port2bind_;
+                        qWarning() << "Failed to bind socket on port " << port2bind_;
         }
         else if (socketType_ == "client")
         {
           if (udpSocket_->bind(QHostAddress::Any, port2send_ + 1, QUdpSocket::DontShareAddress))
-                qDebug() << "Socket bound for client on port " << port2send_ + 1;
+                        qDebug() << "Socket bound for client on port " << port2send_ + 1;
             else
-                qWarning() << "Failed to bind socket" << port2send_ + 1;
+                        qWarning() << "Failed to bind socket" << port2send_ + 1;
         }
             
@@ -113 +113 @@
         {
             if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), address2send_, port2send_)) == -1) 
-                qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl; 
-            else 
-                qDebug() << "TO NETWORK:" << address2send_ << port2send_ << frame << "size" << sent;
+                        qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl; 
+            //else 
+                        //qDebug() << "TO NETWORK:" << address2send_ << port2send_ << frame << "size" << sent;
         }
         else if (socketType_ == "server")
@@ -123 +123 @@
                 if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), listClients[i]->getAddress(), listClients[i]->getPort())) == -1) 
                     qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl; 
-                else 
-                    qDebug() << "TO NETWORK:" << listClients[i]->getAddress() << listClients[i]->getPort() << frame << "size" << sent;          
+                //else 
+                    //qDebug() << "TO NETWORK:" << listClients[i]->getAddress() << listClients[i]->getPort() << frame << "size" << sent;        
             }
         }
@@ -137 +137 @@
         {
             if ((sent = udpSocket_->writeDatagram(frame, address2send_, port2send_)) == -1) 
-                qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl; 
-            else 
-                qDebug() << "TO NETWORK:" << address2send_ << port2send_ << frame << "size" << sent;
+                        qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl; 
+            //else 
+                        //qDebug() << "TO NETWORK:" << address2send_ << port2send_ << frame << "size" << sent;
         }
         else if (socketType_ == "server")
@@ -145 +145 @@
             for (int i = 0; i < listClients.size(); i++)
             {
-                if ((sent = udpSocket_->writeDatagram(frame, listClients[i]->getAddress(), listClients[i]->getPort())) == -1) 
-                    qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl; 
-                else 
-                    qDebug() << "TO NETWORK:" << listClients[i]->getAddress() << listClients[i]->getPort() << frame << "size" << sent;          
+                        if ((sent = udpSocket_->writeDatagram(frame, listClients[i]->getAddress(), listClients[i]->getPort())) == -1) 
+                                qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl; 
+                        //else 
+                                //qDebug() << "TO NETWORK:" << listClients[i]->getAddress() << listClients[i]->getPort() << frame << "size" << sent;    
             }
         }

trunk/StdDbtPlayerComponents/CMakeLists.txt

@@ -60 +60 @@
 # Call MOC
 # ========================================
-qt_wrap_cpp(
+qt4_wrap_cpp(
     PROJECT_MOC_SRCS
     ${FILES_TO_MOC}
 )
 
-qt_wrap_ui(
+qt4_wrap_ui(
     PROJECT_UI_SRCS
     ${UI_FILES}