Changeset 31 in pacpussensors


Ignore:
Timestamp:
Jan 17, 2014, 6:18:04 PM (11 years ago)
Author:
phudelai
Message:

ok

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r30 r31  
    1818set(PacpusSensors_MAJOR_VERSION 0)
    1919set(PacpusSensors_MINOR_VERSION 1)
    20 set(PacpusSensors_PATCH_VERSION 1)
     20set(PacpusSensors_PATCH_VERSION 0)
    2121set(PacpusSensors_VERSION
    2222    "${PacpusSensors_MAJOR_VERSION}.${PacpusSensors_MINOR_VERSION}.${PacpusSensors_PATCH_VERSION}")
     
    9292# Build the PacpusSensors' modules
    9393# ========================================
    94 add_subdirectory(Alasca)
     94#add_subdirectory(Alasca)
    9595add_subdirectory(CanGateway)
     96#add_subdirectory(LMOComponent)
    9697add_subdirectory(StdDbtPlayerComponents)
    97 #add_subdirectory(Dualshock)
     98# add_subdirectory(Dualshock)
    9899#add_subdirectory(Wifibot)
    99 #add_subdirectory(PacpusSocket)
    100 #add_subdirectory(OpencvVideo)
    101 #add_subdirectory(ShMemInterface)
     100add_subdirectory(PacpusSocket)
    102101
    103102# ========================================
  • trunk/CanGateway/CMakeLists.txt

    r11 r31  
    3434# Link directories
    3535# ========================================
    36 link_directories( ${PACPUS_LIB_DIR}
     36link_directories(
     37        ${PACPUS_LIB_DIR}
    3738        ${CanGateway_SOURCE_DIR}/driver/libs
    3839)
     40
    3941
    4042pacpus_plugin(PLUGIN_CPP PLUGIN_H ${PROJECT_NAME} )
     
    121123    set(LIBS
    122124        # 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
    125128    )
    126129endif(WIN32)
     
    129132    set(LIBS
    130133        # add your specific libraries to link here
    131        # pcan
     134        # pcan
    132135    )
    133136endif(UNIX)
     
    140143        ${PACPUS_DEPENDENCIES_LIB}
    141144        ${LIBS}
    142 #       PacpusTools
     145#       optimized PacpusTools debug PacpusTools_d
    143146)
    144147pacpus_folder(${PROJECT_NAME} "components")
  • trunk/CanGateway/CanFrameBase.h

    r29 r31  
    1616#define CANFRAMEBASE_H
    1717
    18 #include "driver/CanDriverBase.h"
     18#include "../driver/CanDriverBase.h"
    1919
    2020namespace pacpus {
  • trunk/CanGateway/structureCan.h

    r29 r31  
    11// *********************************************************************
    22//  created:    2008/2/28 - 16:24
    3 //  filename:   structureCan.h
     3//  filename:   structureCanCarmen.h
    44//
    55//  author:     Gerald Dherbomez
    6 //              Copyright Heudiasyc UMR UTC/CNRS 7253
     6//              Copyright Heudiasyc UMR UTC/CNRS 6599
    77//
    88//  version:    $Id: $
    99//
    10 //  purpose:    Description of the CAN structures
     10//  purpose:    Description of the CAN structures for Carmen
    1111//
     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
    1221// *********************************************************************
    1322
    14 #ifndef __STRUCTURECAN_H__
    15 #define __STRUCTURECAN_H__
     23#ifndef STRUCTURECANCARMEN_H
     24#define STRUCTURECANCARMEN_H
    1625
    1726#include <cstddef>
  • trunk/PacpusSocket/PacpusSocket.cpp

    r21 r31  
    9090        {
    9191            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_;
    9393            else
    94                 qWarning() << "Failed to bind socket on port " << port2bind_;
     94                        qWarning() << "Failed to bind socket on port " << port2bind_;
    9595        }
    9696        else if (socketType_ == "client")
    9797        {
    9898          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;
    100100            else
    101                 qWarning() << "Failed to bind socket" << port2send_ + 1;
     101                        qWarning() << "Failed to bind socket" << port2send_ + 1;
    102102        }
    103103           
     
    113113        {
    114114            if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), address2send_, port2send_)) == -1)
    115                 qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl;
    116             else
    117                 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;
    118118        }
    119119        else if (socketType_ == "server")
     
    123123                if ((sent = udpSocket_->writeDatagram(frame.toLocal8Bit(), listClients[i]->getAddress(), listClients[i]->getPort())) == -1)
    124124                    qDebug() << "Failed to send the frame: " << listClients[i]->getAddress() << listClients[i]->getPort() << frame << endl;
    125                 else
    126                     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;       
    127127            }
    128128        }
     
    137137        {
    138138            if ((sent = udpSocket_->writeDatagram(frame, address2send_, port2send_)) == -1)
    139                 qDebug() << "Failed to send the frame: " << address2send_ << port2send_ << frame << endl;
    140             else
    141                 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;
    142142        }
    143143        else if (socketType_ == "server")
     
    145145            for (int i = 0; i < listClients.size(); i++)
    146146            {
    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;         
     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;   
    151151            }
    152152        }
  • trunk/StdDbtPlayerComponents/CMakeLists.txt

    r27 r31  
    6060# Call MOC
    6161# ========================================
    62 qt_wrap_cpp(
     62qt4_wrap_cpp(
    6363    PROJECT_MOC_SRCS
    6464    ${FILES_TO_MOC}
    6565)
    6666
    67 qt_wrap_ui(
     67qt4_wrap_ui(
    6868    PROJECT_UI_SRCS
    6969    ${UI_FILES}
Note: See TracChangeset for help on using the changeset viewer.