Please note that active projects have migrated to https://github.com/fawkesrobotics.

Merge remote-tracking branch 'origin/thofmann/laser-calibration'
authorTim Niemueller <niemueller@kbsg.rwth-aachen.de>
Tue, 29 May 2018 19:03:33 +0000 (21:03 +0200)
committerTim Niemueller <niemueller@kbsg.rwth-aachen.de>
Tue, 29 May 2018 19:03:33 +0000 (21:03 +0200)
1  2 
src/libs/tf/transform_listener.cpp
src/plugins/laser-lines/laser-lines-thread.cpp
src/plugins/laser-lines/laser-lines-thread.h
src/tools/Makefile

Simple merge
@@@ -61,7 -61,8 +61,8 @@@ using namespace fawkes
  LaserLinesThread::LaserLinesThread()
    : Thread("LaserLinesThread", Thread::OPMODE_WAITFORWAKEUP),
      BlockedTimingAspect(BlockedTimingAspect::WAKEUP_HOOK_SENSOR_PROCESS),
+     ConfigurationChangeHandler(CFG_PREFIX),
 -    TransformAspect(TransformAspect::BOTH, "laser_lines")
 +    TransformAspect(TransformAspect::BOTH_DEFER_PUBLISHER)
  {
  }
  
@@@ -17,7 -17,7 +17,7 @@@ BASEDIR = ../.
  
  SUBDIRS = plugin logview config plugin_gui netloggui \
          lasergui skillgui battery_monitor ffinfo vision set_pose \
-               eclipse_debugger plugin_generator pddl_parser
 -              eclipse_debugger plugin_generator laser_calibration
++              eclipse_debugger plugin_generator pddl_parser laser_calibration
  
  include $(BASEDIR)/etc/buildsys/config.mk
  include $(BUILDSYSDIR)/rules.mk