Changeset 105 in pacpussensors
- Timestamp:
- Nov 24, 2015, 4:58:59 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Alasca/AlascaComponent.cpp
r66 r105 98 98 } 99 99 } 100 shmem_ = new ShMem(kAlaskaMemoryName.c_str(), sizeof(ScanAlascaData));100 //shmem_ = new ShMem(kAlaskaMemoryName.c_str(), sizeof(ScanAlascaData)); 101 101 } 102 102 … … 110 110 dataFile_.close(); 111 111 } 112 delete shmem_;112 //delete shmem_; 113 113 // delete generator; 114 114 } … … 491 491 if (isRecording()) writeData(); 492 492 // push data in shared memory 493 shmem_->write(&alascaData, sizeof(alascaData));493 //shmem_->write(&alascaData, sizeof(alascaData)); 494 494 } 495 495 -
trunk/Alasca/AlascaComponent.h
r1 r105 170 170 std::ofstream dataFile_; 171 171 172 ShMem * shmem_;172 //ShMem * shmem_; 173 173 174 174 // The alasca IP or hostname -
trunk/CMakeLists.txt
r99 r105 70 70 # 71 71 72 #add_subdirectory(Alasca)72 add_subdirectory(Alasca) 73 73 add_subdirectory(CanGateway) #require kvaser libcan 74 add_subdirectory(PtGreyCameras)74 #add_subdirectory(PtGreyCameras) 75 75 #add_subdirectory(Dualshock) 76 76 add_subdirectory(NMEA0183) 77 77 add_subdirectory(Gps) #require NMEA0183 78 78 add_subdirectory(SpanCPTComponent) #require NMEA0183 79 #add_subdirectory(Sick)79 add_subdirectory(Sick) 80 80 add_subdirectory(PacpusSocket) 81 81 #add_subdirectory(OpencvVideo) -
trunk/CanGateway/CMakeLists.txt
r99 r105 67 67 if(WIN32) 68 68 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 72 74 driver/XLVectorCanDriver.h 73 75 driver/PeakCanDriverWin.h … … 129 131 # add your specific libraries to link here 130 132 131 optimized vcandm32.lib debug vcandm32.lib 133 # Works only on Windows XP 134 #optimized vcandm32.lib debug vcandm32.lib 132 135 optimized vxlapi.lib debug vxlapi.lib 133 optimized PCANBasic.lib debug PCANBasic.lib134 optimized canlib32.lib debug canlib32.lib136 optimized PCANBasic.lib debug PCANBasic.lib 137 optimized canlib32.lib debug canlib32.lib 135 138 ) 136 139 endif(WIN32) -
trunk/Gps/CMakeLists.txt
r100 r105 39 39 gpsComponent.h 40 40 GpsFrames.h 41 SeptentrioSocket.h42 SbfFrames.h43 41 structure_gps.h 44 gps_nmea.xml45 42 ) 46 43 set(PROJECT_SRCS 47 44 ${PLUGIN_CPP} 48 45 gpsComponent.cpp 49 SeptentrioSocket.cpp 50 ui/polarxmainwindow.cpp 46 51 47 ) 52 48 … … 72 68 gpsComponent.h 73 69 GpsFrames.h 74 #SeptentrioComponent.h75 SeptentrioSocket.h76 70 ../driver/PosixSerialPort.h 77 ui/polarxmainwindow.hpp78 71 ${PLUGIN_HDR} 79 72 ) … … 84 77 # add here the header files that you want to MOC 85 78 gpsComponent.h 86 # SeptentrioComponent.h87 # SeptentrioSocket.h88 79 ../driver/Win32SerialPort.h 89 # ui/polarxmainwindow.hpp90 80 ${PLUGIN_HDR} 91 81 ) … … 122 112 optimized PacpusLib debug PacpusLib_d 123 113 optimized PacpusTools debug PacpusTools_d 124 optimized NMEA0183LIB debug NMEA0183LIB_d114 NMEA0183LIB 125 115 ) 126 116 if (WIN32) -
trunk/Sick/SickLDMRSData.h
r104 r105 151 151 * @see DataHeader 152 152 */ 153 struct SICKLDMRS_APISickLDMRSScan{153 struct /*SICKLDMRS_API*/ SickLDMRSScan{ 154 154 uint64_t timeStartFromSensor; //!< NTP time (creation of the message on sensor). 155 155 ScanHeader header; //!< General information about points recorded. -
trunk/SpanCPTComponent/CMakeLists.txt
r100 r105 111 111 optimized PacpusLib debug PacpusLib_d 112 112 optimized PacpusTools debug PacpusTools_d 113 optimized NMEA0183LIB debug NMEA0183LIB_d113 NMEA0183LIB 114 114 ) 115 115 if (WIN32) -
trunk/SpanCPTComponent/CPTComponent.cpp
r99 r105 73 73 74 74 //ShMems allocation 75 mShMem = new ShMem("SPAN_FRAMES", AllFramesSize);75 // mShMem = new ShMem("SPAN_FRAMES", AllFramesSize); 76 76 mAllFramesBuffer = new char[AllFramesSize]; 77 77 } … … 80 80 CPTComponent::~CPTComponent() 81 81 { 82 delete mShMem;82 // delete mShMem; 83 83 delete[] mAllFramesBuffer; 84 84 } … … 232 232 ; 233 233 } 234 mShMem->write(allFramesBuffer, AllFramesSize);234 //mShMem->write(allFramesBuffer, AllFramesSize); 235 235 236 236 if (position2DENUOutput_ && position2DENUOutput_->hasConnection()) … … 261 261 262 262 //ShMem refresh 263 mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)263 /*mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame) 264 264 +sizeof(TimestampedRawimusaFrame) 265 265 +sizeof(TimestampedInspvaaFrame) 266 +sizeof(TimestampedInscovFrame)); 266 +sizeof(TimestampedInscovFrame));*/ 267 267 break; 268 268 case TRAME_INSPVAA: … … 293 293 294 294 //ShMem refresh 295 mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)295 /* mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame) 296 296 +sizeof(TimestampedRawimusaFrame) 297 297 +sizeof(TimestampedInspvaaFrame) 298 +sizeof(TimestampedInscovFrame)); 298 +sizeof(TimestampedInscovFrame));*/ 299 299 break; 300 300 case TRAME_INSCOV: … … 321 321 322 322 //ShMem refresh 323 mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame)323 /* mShMem->write(allFramesBuffer, sizeof(TimestampedBestgpsposaFrame) 324 324 +sizeof(TimestampedRawimusaFrame) 325 325 +sizeof(TimestampedInspvaaFrame) 326 +sizeof(TimestampedInscovFrame)); 326 +sizeof(TimestampedInscovFrame));*/ 327 327 break; 328 328 default: -
trunk/SpanCPTComponent/CPTComponent.h
r99 r105 50 50 namespace pacpus { 51 51 52 class ShMem;52 //class ShMem; 53 53 54 54 struct CPTCOMPONENT_API Stream8Position … … 100 100 101 101 //ShMems 102 ShMem * mShMem;102 //ShMem * mShMem; 103 103 104 104 //Dbt files -
trunk/build/build.bat
r89 r105 1 cmake -G "Visual Studio 10"..1 cmake .. 2 2 pause
Note:
See TracChangeset
for help on using the changeset viewer.