Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mrpt 2.0 devel #454

Merged
merged 458 commits into from
Feb 25, 2017
Merged

Mrpt 2.0 devel #454

merged 458 commits into from
Feb 25, 2017

Conversation

olzhas
Copy link
Contributor

@olzhas olzhas commented Feb 24, 2017

Changed apps/libraries:

I acknowledge to have:

(Notify: @MRPT/owners )

jlblancoc and others added 30 commits November 14, 2016 01:18
[CReactiveNavigationSystem] Make loggingGetWSObstaclesAndShape protected
Generalize CLogFileRecord for other cmd types
This reverts commit 5216ab7, reversing
changes made to 08f40a8.
Template <> for pimpl template specialization
Added to rawlog-viewer and ptg-configurator
jlblancoc and others added 28 commits January 5, 2017 10:43
Fix warnings with signed/unsigned int
Log an emergency stop command in navlog
This is an extension of the gasmap gridmap-defined connectivity pattern:
via a visitor object, users can now supply any arbitrary connectivity
pattern (and variances for each edge) in a 2D or 3D MRF. This applies to
gasmaps and all other MRF classes.

(cc: @JGMonroy , FYI)
Conflicts:
	apps/ReactiveNav3D-Demo/CMakeLists.txt
	doc/doxygen-pages/lib_mrpt_reactivenav.h
	doc/doxygen-pages/lib_mrpt_scanmatching.h
	libs/maps/include/mrpt/slam/CBeacon.h
	libs/maps/include/mrpt/slam/CBeaconMap.h
	libs/maps/include/mrpt/slam/CColouredOctoMap.h
	libs/maps/include/mrpt/slam/CColouredPointsMap.h
	libs/maps/include/mrpt/slam/CGasConcentrationGridMap2D.h
	libs/maps/include/mrpt/slam/CHeightGridMap2D.h
	libs/maps/include/mrpt/slam/CLogOddsGridMap2D.h
	libs/maps/include/mrpt/slam/COccupancyGridMap2D.h
	libs/maps/include/mrpt/slam/COctoMap.h
	libs/maps/include/mrpt/slam/COctoMapBase.h
	libs/maps/include/mrpt/slam/CPointsMap.h
	libs/maps/include/mrpt/slam/CRandomFieldGridMap2D.h
	libs/maps/include/mrpt/slam/CReflectivityGridMap2D.h
	libs/maps/include/mrpt/slam/CSimplePointsMap.h
	libs/maps/include/mrpt/slam/CWeightedPointsMap.h
	libs/maps/include/mrpt/slam/CWirelessPowerGridMap2D.h
	libs/maps/include/mrpt/slam/PCL_adapters.h
	libs/nav/include/mrpt/reactivenav.h
	libs/nav/include/mrpt/reactivenav/CReactiveNavigationSystem.h
	libs/nav/include/mrpt/reactivenav/CReactiveNavigationSystem3D.h
	libs/obs/include/mrpt/slam/CAction.h
	libs/obs/include/mrpt/slam/CActionCollection.h
	libs/obs/include/mrpt/slam/CActionRobotMovement2D.h
	libs/obs/include/mrpt/slam/CActionRobotMovement3D.h
	libs/obs/include/mrpt/slam/CMetricMap.h
	libs/obs/include/mrpt/slam/CMetricMapEvents.h
	libs/obs/include/mrpt/slam/CObservation.h
	libs/obs/include/mrpt/slam/CObservation2DRangeScan.h
	libs/obs/include/mrpt/slam/CObservation3DRangeScan.h
	libs/obs/include/mrpt/slam/CObservation6DFeatures.h
	libs/obs/include/mrpt/slam/CObservationBatteryState.h
	libs/obs/include/mrpt/slam/CObservationBeaconRanges.h
	libs/obs/include/mrpt/slam/CObservationBearingRange.h
	libs/obs/include/mrpt/slam/CObservationCANBusJ1939.h
	libs/obs/include/mrpt/slam/CObservationComment.h
	libs/obs/include/mrpt/slam/CObservationGPS.h
	libs/obs/include/mrpt/slam/CObservationGasSensors.h
	libs/obs/include/mrpt/slam/CObservationIMU.h
	libs/obs/include/mrpt/slam/CObservationImage.h
	libs/obs/include/mrpt/slam/CObservationOdometry.h
	libs/obs/include/mrpt/slam/CObservationRFID.h
	libs/obs/include/mrpt/slam/CObservationRGBD360.h
	libs/obs/include/mrpt/slam/CObservationRange.h
	libs/obs/include/mrpt/slam/CObservationRawDAQ.h
	libs/obs/include/mrpt/slam/CObservationReflectivity.h
	libs/obs/include/mrpt/slam/CObservationStereoImages.h
	libs/obs/include/mrpt/slam/CObservationStereoImagesFeatures.h
	libs/obs/include/mrpt/slam/CObservationWindSensor.h
	libs/obs/include/mrpt/slam/CObservationWirelessPower.h
	libs/obs/include/mrpt/slam/CRawlog.h
	libs/obs/include/mrpt/slam/CSensoryFrame.h
	libs/obs/include/mrpt/slam/CSimpleMap.h
	libs/obs/include/mrpt/slam/CSinCosLookUpTableFor2DScans.h
	libs/tfest/include/mrpt/scanmatching/scan_matching.h
	libs/tfest/src/scanmatching_backwards_compat.cpp
@jlblancoc jlblancoc merged commit 1b885e8 into MRPT:mrpt-2.0-devel Feb 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants