diff --git a/modules/catkin_ws/src/car/CMakeLists.txt b/modules/catkin_ws/src/car/CMakeLists.txt
index e03393dfe974a139ed62c2d12b1c18943ab5b4ec..529d1068e0689c1e6b9a69a145fc9f7788879563 100644
--- a/modules/catkin_ws/src/car/CMakeLists.txt
+++ b/modules/catkin_ws/src/car/CMakeLists.txt
@@ -109,6 +109,7 @@ catkin_package(
LIBRARIES main_node
LIBRARIES environment
LIBRARIES ultrasonic
+ LIBRARIES camera
CATKIN_DEPENDS roscpp std_msgs nodelet rospy #message_runtime
)
@@ -136,11 +137,16 @@ set(NOTIFIABLE_THREAD_TEST_SOURCE_FILES
test/mainNode/NotifiableThreadTest.cpp)
add_executable(NotifiableThreadTest ${NOTIFIABLE_THREAD_TEST_SOURCE_FILES})
+add_library(camera src/camera/camera.cpp)
+add_dependencies(camera ${catkin_EXPORTED_TARGETS} ${PROJECT_NAME}_generate_messages_cpp)
+target_link_libraries(camera ${catkin_LIBRARIES})
+
install(
TARGETS
main_node
environment
ultrasonic
+ camera
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeCache.txt b/modules/catkin_ws/src/car/cmake-build-debug/CMakeCache.txt
index 1b641e23a27deb1fb53c214cb330f7f20b888b52..795368edaa7e7e8a6a219cab6a39a1aa7e6fd21a 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/CMakeCache.txt
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeCache.txt
@@ -293,6 +293,9 @@ bond_DIR:PATH=/opt/ros/kinetic/share/bond/cmake
//The directory containing a CMake configuration file for bondcpp.
bondcpp_DIR:PATH=/opt/ros/kinetic/share/bondcpp/cmake
+//Dependencies for the target
+camera_LIB_DEPENDS:STATIC=general;/opt/ros/kinetic/lib/libnodeletlib.so;general;/opt/ros/kinetic/lib/libbondcpp.so;general;/usr/lib/x86_64-linux-gnu/libuuid.so;general;/usr/lib/x86_64-linux-gnu/libtinyxml2.so;general;/opt/ros/kinetic/lib/libclass_loader.so;general;/usr/lib/libPocoFoundation.so;general;/usr/lib/x86_64-linux-gnu/libdl.so;general;/opt/ros/kinetic/lib/libroslib.so;general;/opt/ros/kinetic/lib/librospack.so;general;/usr/lib/x86_64-linux-gnu/libpython2.7.so;general;/usr/lib/x86_64-linux-gnu/libboost_program_options.so;general;/usr/lib/x86_64-linux-gnu/libtinyxml.so;general;/opt/ros/kinetic/lib/libroscpp.so;general;/usr/lib/x86_64-linux-gnu/libboost_filesystem.so;general;/usr/lib/x86_64-linux-gnu/libboost_signals.so;general;/opt/ros/kinetic/lib/librosconsole.so;general;/opt/ros/kinetic/lib/librosconsole_log4cxx.so;general;/opt/ros/kinetic/lib/librosconsole_backend_interface.so;general;/usr/lib/x86_64-linux-gnu/liblog4cxx.so;general;/usr/lib/x86_64-linux-gnu/libboost_regex.so;general;/opt/ros/kinetic/lib/libxmlrpcpp.so;general;/opt/ros/kinetic/lib/libroscpp_serialization.so;general;/opt/ros/kinetic/lib/librostime.so;general;/opt/ros/kinetic/lib/libcpp_common.so;general;/usr/lib/x86_64-linux-gnu/libboost_system.so;general;/usr/lib/x86_64-linux-gnu/libboost_thread.so;general;/usr/lib/x86_64-linux-gnu/libboost_chrono.so;general;/usr/lib/x86_64-linux-gnu/libboost_date_time.so;general;/usr/lib/x86_64-linux-gnu/libboost_atomic.so;general;/usr/lib/x86_64-linux-gnu/libpthread.so;general;/usr/lib/x86_64-linux-gnu/libconsole_bridge.so;
+
//Value Computed by CMake
car_BINARY_DIR:STATIC=/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/Makefile.cmake b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/Makefile.cmake
index a7cadc54beaeb5970e7873a954cc24f56f809967..8011e6b007137df22a4b5e7429a9d2c0dbf6d061 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/Makefile.cmake
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/Makefile.cmake
@@ -250,6 +250,7 @@ set(CMAKE_DEPEND_INFO_FILES
"CMakeFiles/roscpp_generate_messages_cpp.dir/DependInfo.cmake"
"CMakeFiles/car_geneus.dir/DependInfo.cmake"
"CMakeFiles/clean_test_results.dir/DependInfo.cmake"
+ "CMakeFiles/camera.dir/DependInfo.cmake"
"CMakeFiles/car_gencpp.dir/DependInfo.cmake"
"CMakeFiles/rosgraph_msgs_generate_messages_eus.dir/DependInfo.cmake"
"CMakeFiles/_car_generate_messages_check_deps_environmentDataMsg.dir/DependInfo.cmake"
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/Makefile2 b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/Makefile2
index 7b3f06a2902c8e1d89202b49b2593d31df107332..1d3054611ae55fb955695a25ab8ea441ca2c775b 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/Makefile2
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/Makefile2
@@ -1130,6 +1130,68 @@ clean: CMakeFiles/clean_test_results.dir/clean
.PHONY : clean
+#=============================================================================
+# Target rules for target CMakeFiles/camera.dir
+
+# All Build rule for target.
+CMakeFiles/camera.dir/all: CMakeFiles/nodelet_generate_messages_cpp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/std_msgs_generate_messages_nodejs.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/std_msgs_generate_messages_eus.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/roscpp_generate_messages_lisp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/std_msgs_generate_messages_py.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/rosgraph_msgs_generate_messages_py.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/rosgraph_msgs_generate_messages_lisp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/roscpp_generate_messages_nodejs.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/rosgraph_msgs_generate_messages_nodejs.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/std_msgs_generate_messages_lisp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/nodelet_generate_messages_lisp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/rosgraph_msgs_generate_messages_cpp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/std_msgs_generate_messages_cpp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/bond_generate_messages_py.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/nodelet_generate_messages_py.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/roscpp_generate_messages_cpp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/rosgraph_msgs_generate_messages_eus.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/roscpp_generate_messages_py.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/nodelet_generate_messages_nodejs.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/roscpp_generate_messages_eus.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/bond_generate_messages_eus.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/bond_generate_messages_lisp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/nodelet_generate_messages_eus.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/bond_generate_messages_nodejs.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/bond_generate_messages_cpp.dir/all
+CMakeFiles/camera.dir/all: CMakeFiles/car_generate_messages_cpp.dir/all
+ $(MAKE) -f CMakeFiles/camera.dir/build.make CMakeFiles/camera.dir/depend
+ $(MAKE) -f CMakeFiles/camera.dir/build.make CMakeFiles/camera.dir/build
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles" --progress-num= "Built target camera"
+.PHONY : CMakeFiles/camera.dir/all
+
+# Include target in all.
+all: CMakeFiles/camera.dir/all
+
+.PHONY : all
+
+# Build rule for subdir invocation for target.
+CMakeFiles/camera.dir/rule: cmake_check_build_system
+ $(CMAKE_COMMAND) -E cmake_progress_start "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles" 8
+ $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/camera.dir/all
+ $(CMAKE_COMMAND) -E cmake_progress_start "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles" 0
+.PHONY : CMakeFiles/camera.dir/rule
+
+# Convenience name for target.
+camera: CMakeFiles/camera.dir/rule
+
+.PHONY : camera
+
+# clean rule for target.
+CMakeFiles/camera.dir/clean:
+ $(MAKE) -f CMakeFiles/camera.dir/build.make CMakeFiles/camera.dir/clean
+.PHONY : CMakeFiles/camera.dir/clean
+
+# clean rule for target.
+clean: CMakeFiles/camera.dir/clean
+
+.PHONY : clean
+
#=============================================================================
# Target rules for target CMakeFiles/car_gencpp.dir
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/TargetDirectories.txt b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/TargetDirectories.txt
index 6f47f9225896018826dbc89471d93972f6040401..ee813a725f16f9b726ea79698cd5e11ad214d65a 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/TargetDirectories.txt
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/TargetDirectories.txt
@@ -34,6 +34,7 @@
/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/roscpp_generate_messages_cpp.dir
/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/car_geneus.dir
/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/clean_test_results.dir
+/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir
/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/car_gencpp.dir
/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/rosgraph_msgs_generate_messages_eus.dir
/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/_car_generate_messages_check_deps_environmentDataMsg.dir
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/DependInfo.cmake b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/DependInfo.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..19fab2149bf120962a1699d74b7373348dc4c117
--- /dev/null
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/DependInfo.cmake
@@ -0,0 +1,11 @@
+# The set of languages for which implicit dependencies are needed:
+set(CMAKE_DEPENDS_LANGUAGES
+ )
+# The set of files for implicit dependencies of each language:
+
+# Targets to which this target links.
+set(CMAKE_TARGET_LINKED_INFO_FILES
+ )
+
+# Fortran module output directory.
+set(CMAKE_Fortran_TARGET_MODULE_DIR "")
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/build.make b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/build.make
new file mode 100644
index 0000000000000000000000000000000000000000..dbeb2910aa4a531203ece28b2336024730da8dd1
--- /dev/null
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/build.make
@@ -0,0 +1,71 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.9
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /home/philipp/jetbrains/clion-2017.3.1/bin/cmake/bin/cmake
+
+# The command to remove a file.
+RM = /home/philipp/jetbrains/clion-2017.3.1/bin/cmake/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car"
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug"
+
+# Include any dependencies generated for this target.
+include CMakeFiles/camera.dir/depend.make
+
+# Include the progress variables for this target.
+include CMakeFiles/camera.dir/progress.make
+
+# Include the compile flags for this target's objects.
+include CMakeFiles/camera.dir/flags.make
+
+CMakeFiles/camera.dir/requires:
+
+.PHONY : CMakeFiles/camera.dir/requires
+
+CMakeFiles/camera.dir/clean:
+ $(CMAKE_COMMAND) -P CMakeFiles/camera.dir/cmake_clean.cmake
+.PHONY : CMakeFiles/camera.dir/clean
+
+CMakeFiles/camera.dir/depend:
+ cd "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug" && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car" "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car" "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug" "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug" "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/DependInfo.cmake" --color=$(COLOR)
+.PHONY : CMakeFiles/camera.dir/depend
+
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/cmake_clean.cmake b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/cmake_clean.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..842dd3dae2ff2677f0f37e23fb46932df983827a
--- /dev/null
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/cmake_clean.cmake
@@ -0,0 +1,5 @@
+
+# Per-language clean rules from dependency scanning.
+foreach(lang )
+ include(CMakeFiles/camera.dir/cmake_clean_${lang}.cmake OPTIONAL)
+endforeach()
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/depend.make b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/depend.make
new file mode 100644
index 0000000000000000000000000000000000000000..f9473d234d4941ff42a2a3b563855a25ed06ca13
--- /dev/null
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/depend.make
@@ -0,0 +1,2 @@
+# Empty dependencies file for camera.
+# This may be replaced when dependencies are built.
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/flags.make b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/flags.make
new file mode 100644
index 0000000000000000000000000000000000000000..bd7aaa21c4c7f5646c9a34e6a149a665082ed4ec
--- /dev/null
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/flags.make
@@ -0,0 +1,3 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.9
+
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/progress.make b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/progress.make
new file mode 100644
index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc
--- /dev/null
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/camera.dir/progress.make
@@ -0,0 +1 @@
+
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/clion-log.txt b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/clion-log.txt
index e6484adc84a814128a1047c1a5c4e9072508d759..44f9aed1ccb8734cf090d9a6b60dc26eed9b80dc 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/clion-log.txt
+++ b/modules/catkin_ws/src/car/cmake-build-debug/CMakeFiles/clion-log.txt
@@ -21,5 +21,16 @@
-- system
-- car: 8 messages, 0 services
-- Configuring done
+CMake Error at CMakeLists.txt:140 (add_library):
+ Cannot find source file:
+
+ src/camera/camera.cpp
+
+ Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
+ .hxx .in .txx
+
+
+CMake Error: CMake can not determine linker language for target: camera
+CMake Error: Cannot determine link language for target "camera".
-- Generating done
-- Build files have been written to: /home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/Makefile b/modules/catkin_ws/src/car/cmake-build-debug/Makefile
index 2ae1ccd84d3c86912fb165db26051e52f80bac4d..a134d41766872c75d655a820468d04cc74ffcc92 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/Makefile
+++ b/modules/catkin_ws/src/car/cmake-build-debug/Makefile
@@ -557,6 +557,19 @@ clean_test_results/fast:
$(MAKE) -f CMakeFiles/clean_test_results.dir/build.make CMakeFiles/clean_test_results.dir/build
.PHONY : clean_test_results/fast
+#=============================================================================
+# Target rules for targets named camera
+
+# Build rule for target.
+camera: cmake_check_build_system
+ $(MAKE) -f CMakeFiles/Makefile2 camera
+.PHONY : camera
+
+# fast build rule for target.
+camera/fast:
+ $(MAKE) -f CMakeFiles/camera.dir/build.make CMakeFiles/camera.dir/build
+.PHONY : camera/fast
+
#=============================================================================
# Target rules for targets named car_gencpp
@@ -1383,6 +1396,7 @@ help:
@echo "... roscpp_generate_messages_cpp"
@echo "... car_geneus"
@echo "... clean_test_results"
+ @echo "... camera"
@echo "... car_gencpp"
@echo "... rosgraph_msgs_generate_messages_eus"
@echo "... _car_generate_messages_check_deps_environmentDataMsg"
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/car.cbp b/modules/catkin_ws/src/car/cmake-build-debug/car.cbp
index fbedc613ee7ce011bf302461e542fb3499328023..3fcf6413bb6bad1013906504c5bc6e71fafa41f2 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/car.cbp
+++ b/modules/catkin_ws/src/car/cmake-build-debug/car.cbp
@@ -569,6 +569,64 @@
<DistClean command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 clean"/>
</MakeCommands>
</Target>
+ <Target title="camera">
+ <Option output="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/devel/lib/libcamera.so" prefix_auto="0" extension_auto="0"/>
+ <Option working_dir="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug"/>
+ <Option object_output="./"/>
+ <Option type="3"/>
+ <Option compiler="gcc"/>
+ <Compiler>
+ <Add option="-DROS_PACKAGE_NAME="car""/>
+ <Add option="-DROSCONSOLE_BACKEND_LOG4CXX"/>
+ <Add directory="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/devel/include"/>
+ <Add directory="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/include"/>
+ <Add directory="/opt/ros/kinetic/include"/>
+ <Add directory="/opt/ros/kinetic/share/xmlrpcpp/cmake/../../../include/xmlrpcpp"/>
+ <Add directory="/usr/include/c++/5"/>
+ <Add directory="/usr/include/x86_64-linux-gnu/c++/5"/>
+ <Add directory="/usr/include/c++/5/backward"/>
+ <Add directory="/usr/lib/gcc/x86_64-linux-gnu/5/include"/>
+ <Add directory="/usr/local/include"/>
+ <Add directory="/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed"/>
+ <Add directory="/usr/include/x86_64-linux-gnu"/>
+ <Add directory="/usr/include"/>
+ </Compiler>
+ <MakeCommands>
+ <Build command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 camera"/>
+ <CompileFile command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 "$file""/>
+ <Clean command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 clean"/>
+ <DistClean command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 clean"/>
+ </MakeCommands>
+ </Target>
+ <Target title="camera/fast">
+ <Option output="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/devel/lib/libcamera.so" prefix_auto="0" extension_auto="0"/>
+ <Option working_dir="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug"/>
+ <Option object_output="./"/>
+ <Option type="3"/>
+ <Option compiler="gcc"/>
+ <Compiler>
+ <Add option="-DROS_PACKAGE_NAME="car""/>
+ <Add option="-DROSCONSOLE_BACKEND_LOG4CXX"/>
+ <Add directory="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/devel/include"/>
+ <Add directory="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/include"/>
+ <Add directory="/opt/ros/kinetic/include"/>
+ <Add directory="/opt/ros/kinetic/share/xmlrpcpp/cmake/../../../include/xmlrpcpp"/>
+ <Add directory="/usr/include/c++/5"/>
+ <Add directory="/usr/include/x86_64-linux-gnu/c++/5"/>
+ <Add directory="/usr/include/c++/5/backward"/>
+ <Add directory="/usr/lib/gcc/x86_64-linux-gnu/5/include"/>
+ <Add directory="/usr/local/include"/>
+ <Add directory="/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed"/>
+ <Add directory="/usr/include/x86_64-linux-gnu"/>
+ <Add directory="/usr/include"/>
+ </Compiler>
+ <MakeCommands>
+ <Build command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 camera/fast"/>
+ <CompileFile command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 "$file""/>
+ <Clean command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 clean"/>
+ <DistClean command="/usr/bin/make -j4 -f "/home/philipp/hu/Hochautomatisiertes\ Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/Makefile" VERBOSE=1 clean"/>
+ </MakeCommands>
+ </Target>
<Target title="car_gencpp">
<Option working_dir="/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug"/>
<Option type="4"/>
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/installspace/car.pc b/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/installspace/car.pc
index 6b25cd6c6fd630957aed5975bec0ed1eef761fb5..cb7b6388763e767b552101ba62db63300237c06c 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/installspace/car.pc
+++ b/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/installspace/car.pc
@@ -4,5 +4,5 @@ Name: car
Description: Description of car
Version: 0.0.0
Cflags: -I/usr/local/include
-Libs: -L/usr/local/lib -lmain_node -lenvironment -lultrasonic
+Libs: -L/usr/local/lib -lmain_node -lenvironment -lultrasonic -lcamera
Requires: roscpp std_msgs nodelet rospy
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/installspace/carConfig.cmake b/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/installspace/carConfig.cmake
index 27adafd193d8564ef76f9d8da3b949f6242c4baf..6436537b86020a4a181bfffc0279f0df4b1628f7 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/installspace/carConfig.cmake
+++ b/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/installspace/carConfig.cmake
@@ -116,7 +116,7 @@ if(NOT "include " STREQUAL " ")
endforeach()
endif()
-set(libraries "main_node;environment;ultrasonic")
+set(libraries "main_node;environment;ultrasonic;camera")
foreach(library ${libraries})
# keep build configuration keywords, target names and absolute libraries as-is
if("${library}" MATCHES "^(debug|optimized|general)$")
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/pkg.develspace.context.pc.py b/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/pkg.develspace.context.pc.py
index e0f765ad5009f8c0de5e33e4baf70e942cbf39cd..6bd908d180d60f39eacc036efa3f56c33fdf8096 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/pkg.develspace.context.pc.py
+++ b/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/pkg.develspace.context.pc.py
@@ -2,7 +2,7 @@
CATKIN_PACKAGE_PREFIX = ""
PROJECT_PKG_CONFIG_INCLUDE_DIRS = "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/devel/include;/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/include".split(';') if "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/devel/include;/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/include" != "" else []
PROJECT_CATKIN_DEPENDS = "roscpp;std_msgs;nodelet;rospy".replace(';', ' ')
-PKG_CONFIG_LIBRARIES_WITH_PREFIX = "-lmain_node;-lenvironment;-lultrasonic".split(';') if "-lmain_node;-lenvironment;-lultrasonic" != "" else []
+PKG_CONFIG_LIBRARIES_WITH_PREFIX = "-lmain_node;-lenvironment;-lultrasonic;-lcamera".split(';') if "-lmain_node;-lenvironment;-lultrasonic;-lcamera" != "" else []
PROJECT_NAME = "car"
PROJECT_SPACE_DIR = "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/devel"
PROJECT_VERSION = "0.0.0"
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/pkg.installspace.context.pc.py b/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/pkg.installspace.context.pc.py
index 878c12148cd3d52851cd0cec7a83fecc320a4b09..40af8746f295c2ea60fca11f4f80378bc8630f7e 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/pkg.installspace.context.pc.py
+++ b/modules/catkin_ws/src/car/cmake-build-debug/catkin_generated/pkg.installspace.context.pc.py
@@ -2,7 +2,7 @@
CATKIN_PACKAGE_PREFIX = ""
PROJECT_PKG_CONFIG_INCLUDE_DIRS = "/usr/local/include".split(';') if "/usr/local/include" != "" else []
PROJECT_CATKIN_DEPENDS = "roscpp;std_msgs;nodelet;rospy".replace(';', ' ')
-PKG_CONFIG_LIBRARIES_WITH_PREFIX = "-lmain_node;-lenvironment;-lultrasonic".split(';') if "-lmain_node;-lenvironment;-lultrasonic" != "" else []
+PKG_CONFIG_LIBRARIES_WITH_PREFIX = "-lmain_node;-lenvironment;-lultrasonic;-lcamera".split(';') if "-lmain_node;-lenvironment;-lultrasonic;-lcamera" != "" else []
PROJECT_NAME = "car"
PROJECT_SPACE_DIR = "/usr/local"
PROJECT_VERSION = "0.0.0"
diff --git a/modules/catkin_ws/src/car/cmake-build-debug/cmake_install.cmake b/modules/catkin_ws/src/car/cmake-build-debug/cmake_install.cmake
index 6c9eb996edcbfb895eac41e87563366a897cf53e..01d9310cdd3859f29d5b9a91aa6e17471a2e05c2 100644
--- a/modules/catkin_ws/src/car/cmake-build-debug/cmake_install.cmake
+++ b/modules/catkin_ws/src/car/cmake-build-debug/cmake_install.cmake
@@ -234,6 +234,16 @@ if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMP
endif()
endif()
+if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
+ file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE SHARED_LIBRARY FILES "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/cmake-build-debug/devel/lib/libcamera.so")
+ if(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/libcamera.so" AND
+ NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/libcamera.so")
+ if(CMAKE_INSTALL_DO_STRIP)
+ execute_process(COMMAND "/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/libcamera.so")
+ endif()
+ endif()
+endif()
+
if("${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/car" TYPE DIRECTORY FILES "/home/philipp/hu/Hochautomatisiertes Fahren/Repo/modules/catkin_ws/src/car/include/")
endif()
diff --git a/modules/catkin_ws/src/car/include/environment/environment.h b/modules/catkin_ws/src/car/include/environment/environment.h
index 29d948e0b796c5ea8a6ace0da63bec3f973acafc..58e7ab6871bb5e039e28367aaf389a2e8a222296 100644
--- a/modules/catkin_ws/src/car/include/environment/environment.h
+++ b/modules/catkin_ws/src/car/include/environment/environment.h
@@ -3,7 +3,9 @@
#include <nodelet/nodelet.h>
#include <ros/ros.h>
+
#include "car/ussDataMsg.h"
+#include "car/camDataMsg.h"
namespace car
{
@@ -27,6 +29,7 @@ namespace car
void ussDataCallback(const ussDataMsg::ConstPtr& inMsg);
+ void camDataCallback(const camDataMsg::ConstPtr& inMsg);
};
}
#endif
diff --git a/modules/catkin_ws/src/car/launch/fullstart.launch b/modules/catkin_ws/src/car/launch/fullstart.launch
index ec74c6bcb9f233d3b5caa6f47e51a77e8f086fef..a0971bf81285e51db6cbd9a1edede9b64120ef84 100644
--- a/modules/catkin_ws/src/car/launch/fullstart.launch
+++ b/modules/catkin_ws/src/car/launch/fullstart.launch
@@ -6,6 +6,7 @@
<node pkg="nodelet" type="nodelet" name="nodelet_main_node" args="load car/main_node Master"/>
<node pkg="nodelet" type="nodelet" name="nodelet_environment" args="load car/environment Master"/>
<node pkg="nodelet" type="nodelet" name="nodelet_ultrasonic" args="load car/ultrasonic Master"/>
+ <node pkg="nodelet" type="nodelet" name="nodelet_camera" args="load car/camera Master"/>
</launch>
<!--
diff --git a/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml b/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml
index 0767fe032dc22b7bcfd711bd95ceb9a0112f7344..38af8257faf35a8b914d1930f4b3b1eac87cf404 100644
--- a/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml
+++ b/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml
@@ -33,3 +33,13 @@
</description>
</class>
</library>
+
+<library path="lib/libcamera">
+ <class name="car/camera"
+ type="car::Camera"
+ base_class_type="nodelet::Nodelet">
+ <description>
+ Missing
+ </description>
+ </class>
+</library>
diff --git a/modules/catkin_ws/src/car/src/environment/environment.cpp b/modules/catkin_ws/src/car/src/environment/environment.cpp
index 63934b43a8f670783aa37f3e9512c2270da48625..b1b7e684748bb4fd951ed8c4f79c5ac419c6f03a 100644
--- a/modules/catkin_ws/src/car/src/environment/environment.cpp
+++ b/modules/catkin_ws/src/car/src/environment/environment.cpp
@@ -26,9 +26,7 @@ namespace car
NODELET_INFO("Environment::onInit -- START");
environmentData = nh_.advertise<environmentDataMsg>("environmentData", 1);
ussData = nh_.subscribe("ussData", 1, &Environment::ussDataCallback, this);
-
-
- // CODE GOES HERE
+ camData = nh_.subscribe("camData", 1, &Environment::camDataCallback, this);
NODELET_INFO("Environment::onInit -- END");
}
@@ -44,4 +42,11 @@ namespace car
environmentData.publish(outMsg);
}
+
+ void Environment::camDataCallback(const camDataMsg::ConstPtr& inMsg)
+ {
+ std::cout << "Environment recived new cam data ( ).\n";
+ }
+
+
}