fixing dependencies

emros_basecontroller/CMakeLists.txt

@@ -124,7 +124,8 @@ CATKIN_DEPENDS message_runtime
 ## Your package locations should be listed before other locations
  include_directories(
  include
-  ../emros_common_code/inc
+  ../emros_common/inc
+  ../utility_ofc/inc
  ${catkin_INCLUDE_DIRS}
  )
 

emros_common @ 309c068f

-Subproject commit 4abe5d5b1d6ef8552ef6f4c5bfdd9e0ec04b5b93
+Subproject commit 309c068ff4c0fefd794489caf57cbb7664f9ae9a

emros_dispatcher/CMakeLists.txt

@@ -118,11 +118,12 @@ CATKIN_DEPENDS message_runtime std_msgs
 ## Your package locations should be listed before other locations
  include_directories(
  include
- ../emros_common_code/inc
+ ../utility_ofc/inc
+ ../emros_common/inc
  ${catkin_INCLUDE_DIRS}
  )
 
-add_executable(dispatcher src/dispatcher.cpp src/udpsocket.cpp ../emros_common_code/src/ethprotocol.cpp ../emros_common_code/src/crc16.cpp)
+add_executable(dispatcher src/dispatcher.cpp src/udpsocket.cpp ../utility_ofc/src/ethprotocol.cpp ../utility_ofc/src/crc16.cpp)
 add_dependencies(dispatcher ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
 target_link_libraries(dispatcher ${catkin_LIBRARIES} )
 

emros_dispatcher/package.xml

@@ -42,7 +42,7 @@
   <buildtool_depend>catkin</buildtool_depend>
   <run_depend>roscpp</run_depend>
   <build_depend>message_generation</build_depend>
-  <build_depend>emros_common_code</build_depend>
+  <build_depend>utility_ofc</build_depend>
   <run_depend>message_runtime</run_depend>
   <build_depend>std_msgs</build_depend>
   <run_depend>std_msgs</run_depend>