Changeset 105 in pacpussensors for trunk


Ignore:
Timestamp:
Nov 24, 2015, 4:58:59 PM (9 years ago)
Author:
cerichar
Message:

compilation OK under Windows 10 64 bits, Qt5.5, pacpus 0.2.2, boost 1.54

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Alasca/AlascaComponent.cpp

    r66 r105  
    9898        }
    9999    }
    100     shmem_ = new ShMem(kAlaskaMemoryName.c_str(), sizeof(ScanAlascaData));
     100    //shmem_ = new ShMem(kAlaskaMemoryName.c_str(), sizeof(ScanAlascaData));
    101101}
    102102
    … …  
    110110        dataFile_.close();
    111111    }
    112     delete shmem_;
     112    //delete shmem_;
    113113    // delete generator;
    114114}
    … …  
    491491            if (isRecording()) writeData();
    492492            // push data in shared memory
    493             shmem_->write(&alascaData, sizeof(alascaData));
     493            //shmem_->write(&alascaData, sizeof(alascaData));
    494494        }
    495495

  • trunk/Alasca/AlascaComponent.h

    r1 r105  
    170170    std::ofstream dataFile_;
    171171
    172     ShMem * shmem_;
     172    //ShMem * shmem_;
    173173
    174174    // The alasca IP or hostname

  • trunk/CMakeLists.txt

    r99 r105  
    7070#
    7171
    72 #add_subdirectory(Alasca)
     72add_subdirectory(Alasca)
    7373add_subdirectory(CanGateway)       #require kvaser libcan
    74 add_subdirectory(PtGreyCameras)
     74#add_subdirectory(PtGreyCameras)
    7575#add_subdirectory(Dualshock)
    7676add_subdirectory(NMEA0183)
    7777add_subdirectory(Gps)              #require NMEA0183
    7878add_subdirectory(SpanCPTComponent) #require NMEA0183
    79 #add_subdirectory(Sick)
     79add_subdirectory(Sick)
    8080add_subdirectory(PacpusSocket)
    8181#add_subdirectory(OpencvVideo)

  • trunk/CanGateway/CMakeLists.txt

    r99 r105  
    6767if(WIN32)
    6868    list(APPEND PROJECT_SRCS
    69         driver/VectorCanDriver.cpp
    70         driver/VectorCanDriver.h
    71         driver/XLVectorCanDriver.cpp
     69        # Works only on Windows XP
     70                #driver/VectorCanDriver.cpp
     71        #driver/VectorCanDriver.h
     72       
     73                driver/XLVectorCanDriver.cpp
    7274        driver/XLVectorCanDriver.h
    7375        driver/PeakCanDriverWin.h
    … …  
    129131        # add your specific libraries to link here
    130132       
    131         optimized vcandm32.lib  debug vcandm32.lib
     133                # Works only on Windows XP
     134                #optimized vcandm32.lib  debug vcandm32.lib
    132135        optimized vxlapi.lib    debug vxlapi.lib
    133         optimized PCANBasic.lib debug PCANBasic.lib
    134         optimized canlib32.lib  debug canlib32.lib
     136                optimized PCANBasic.lib debug PCANBasic.lib
     137                optimized canlib32.lib  debug canlib32.lib
    135138    )
    136139endif(WIN32)

  • trunk/Gps/CMakeLists.txt

    r100 r105  
    3939    gpsComponent.h
    4040    GpsFrames.h
    41     SeptentrioSocket.h
    42     SbfFrames.h
    4341    structure_gps.h
    44     gps_nmea.xml
    4542)
    4643set(PROJECT_SRCS
    4744    ${PLUGIN_CPP}
    4845    gpsComponent.cpp
    49     SeptentrioSocket.cpp
    50     ui/polarxmainwindow.cpp
     46   
    5147)
    5248
    … …  
    7268  gpsComponent.h
    7369  GpsFrames.h
    74   #SeptentrioComponent.h
    75   SeptentrioSocket.h 
    7670  ../driver/PosixSerialPort.h
    77   ui/polarxmainwindow.hpp
    7871  ${PLUGIN_HDR}
    7972  )
    … …  
    8477  # add here the header files that you want to MOC
    8578  gpsComponent.h
    86   # SeptentrioComponent.h
    87   # SeptentrioSocket.h   
    8879  ../driver/Win32SerialPort.h
    89   #  ui/polarxmainwindow.hpp
    9080  ${PLUGIN_HDR}
    9181  )
    … …  
    122112    optimized PacpusLib debug PacpusLib_d
    123113    optimized PacpusTools debug PacpusTools_d
    124     optimized NMEA0183LIB debug NMEA0183LIB_d
     114    NMEA0183LIB
    125115)
    126116if (WIN32)

  • trunk/Sick/SickLDMRSData.h

    r104 r105  
    151151 * @see DataHeader
    152152 */
    153 struct SICKLDMRS_API SickLDMRSScan{
     153struct /*SICKLDMRS_API*/ SickLDMRSScan{
    154154    uint64_t timeStartFromSensor;   //!< NTP time (creation of the message on sensor).
    155155    ScanHeader header;              //!< General information about points recorded.

  • trunk/SpanCPTComponent/CMakeLists.txt

    r100 r105  
    111111    optimized PacpusLib debug PacpusLib_d
    112112    optimized PacpusTools debug PacpusTools_d
    113     optimized NMEA0183LIB debug NMEA0183LIB_d
     113    NMEA0183LIB
    114114)
    115115if (WIN32)

  • trunk/SpanCPTComponent/CPTComponent.cpp

    r99 r105  
    7373
    7474    //ShMems allocation
    75     mShMem = new ShMem("SPAN_FRAMES", AllFramesSize);
     75//    mShMem = new ShMem("SPAN_FRAMES", AllFramesSize);
    7676    mAllFramesBuffer = new char[AllFramesSize];
    7777}
    … …  
    8080CPTComponent::~CPTComponent()
    8181{
    82     delete mShMem;
     82//    delete mShMem;
    8383    delete[] mAllFramesBuffer;
    8484}
    … …  
    232232                                ;
    233233                    }
    234                     mShMem->write(allFramesBuffer, AllFramesSize);
     234                    //mShMem->write(allFramesBuffer, AllFramesSize);
    235235
    236236                                        if (position2DENUOutput_ && position2DENUOutput_->hasConnection())
    … …  
    261261
    262262                    //ShMem refresh
    263                     mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)
     263                    /*mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)
    264264                                  +sizeof(TimestampedRawimusaFrame)
    265265                                  +sizeof(TimestampedInspvaaFrame)
    266                                   +sizeof(TimestampedInscovFrame));
     266                                  +sizeof(TimestampedInscovFrame));*/
    267267                    break;
    268268                case TRAME_INSPVAA:
    … …  
    293293
    294294                    //ShMem refresh
    295                     mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)
     295                   /* mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)
    296296                                  +sizeof(TimestampedRawimusaFrame)
    297297                                  +sizeof(TimestampedInspvaaFrame)
    298                                   +sizeof(TimestampedInscovFrame));
     298                                  +sizeof(TimestampedInscovFrame));*/
    299299                    break;
    300300                case TRAME_INSCOV:
    … …  
    321321
    322322                    //ShMem refresh
    323                     mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)
     323                   /* mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)
    324324                                  +sizeof(TimestampedRawimusaFrame)
    325325                                  +sizeof(TimestampedInspvaaFrame)
    326                                   +sizeof(TimestampedInscovFrame));
     326                                  +sizeof(TimestampedInscovFrame));*/
    327327                    break;
    328328                default:

  • trunk/SpanCPTComponent/CPTComponent.h

    r99 r105  
    5050namespace pacpus {
    5151
    52 class ShMem;
     52//class ShMem;
    5353
    5454struct CPTCOMPONENT_API Stream8Position
    … …  
    100100
    101101    //ShMems
    102     ShMem * mShMem;
     102    //ShMem * mShMem;
    103103
    104104    //Dbt files

  • trunk/build/build.bat

    r89 r105  
    1 cmake -G "Visual Studio 10" ..
     1cmake ..
    22pause
Note: See TracChangeset for help on using the changeset viewer.