Merge branch 'master' of gitlab.informatik.hu-berlin.de:badenhop/Hochautomatisiertes-Fahren

modules/catkin_ws/src/car/CMakeLists.txt

@@ -59,6 +59,7 @@ set(MAIN_NODE_SOURCE_FILES
 )
 
 set(USS_SOURCE_FILES
+        src/ultrasonic/StreamMedianFilter.cpp
         src/ultrasonic/Ultrasonic.cpp
         src/ultrasonic/USS_SRF02.cpp
 )

modules/catkin_ws/src/car/src/environment/StreamMedianFilter.cpp → modules/catkin_ws/src/car/src/ultrasonic/StreamMedianFilter.cpp

-#include "StreamMedianFilter.h"
+#include "ultrasonic/StreamMedianFilter.h"
 #include <iostream>
 #include <numeric>