Modify base image dependecy (now only on core), remove old message se…

CMakeLists.txt

@@ -49,7 +49,6 @@ ExternalProject_Add (logic-cfsd18
   CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}"
   CMAKE_ARGS "-DOPENDAVINCI_DIR=${OPENDAVINCI_DIR}"
   CMAKE_ARGS "-DODVDOPENDLVSTANDARDMESSAGESET_DIR=${ODVDOPENDLVSTANDARDMESSAGESET_DIR}"
-  CMAKE_ARGS "-DODVDCFSD18_DIR=${ODVDCFSD18_DIR}"
   CMAKE_ARGS "-DCXXTEST_INCLUDE_DIR=${CXXTEST_INCLUDE_DIR}"
   CMAKE_ARGS "-DEIGEN3_INCLUDE_DIR=${OPENDAVINCI_DIR}/include/opendavinci"
   TEST_BEFORE_INSTALL 1

code/logic-cfsd18/CMakeLists.txt

@@ -28,23 +28,19 @@ include(CompileFlags)
 include(CheckCxxTestEnvironment)
 
 find_package(OpenCV REQUIRED)
-find_package(Wt REQUIRED)
 
 find_package(OpenDaVINCI REQUIRED)
 find_package(ODVDOpenDLVStandardMessageSet REQUIRED)
-find_package(ODVDcfsd18 REQUIRED)
 
 include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})
 include_directories(SYSTEM ${OpenCV_INCLUDE_DIRS})
 include_directories(SYSTEM ${OPENDAVINCI_INCLUDE_DIRS})
 include_directories(SYSTEM ${ODVDOPENDLVSTANDARDMESSAGESET_INCLUDE_DIRS})
 include_directories(SYSTEM ${ODVDCFSD18_INCLUDE_DIRS})
 
-set(LIBRARIES 
+set(LIBRARIES
   ${OPENDAVINCI_LIBRARIES}
-  ${Wt_LIBRARY} ${Wt_HTTP_LIBRARY} ${Wt_EXT_LIBRARY}  
-  ${ODVDOPENDLVSTANDARDMESSAGESET_LIBRARIES}
-  ${ODVDCFSD18_LIBRARIES})
+  ${ODVDOPENDLVSTANDARDMESSAGESET_LIBRARIES})
 
 ### MICROSERVICE BEGIN ###
 add_subdirectory(action/lateral)

code/logic-cfsd18/action/lateral/include/lateral.hpp

@@ -23,8 +23,8 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
+
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/action/longitudinal/include/longitudinal.hpp

@@ -23,8 +23,8 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
+
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/cognition/acceleration/include/acceleration.hpp

@@ -23,8 +23,8 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
+
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/cognition/acceleration/src/acceleration.cpp

@@ -43,7 +43,7 @@ Acceleration::~Acceleration()
 
 void Acceleration::nextContainer(odcore::data::Container &a_container)
 {
-  if (a_container.getDataType() == opendlv::logic::perception::Surface::ID()) {
+  if (a_container.getDataType() == opendlv::logic::perception::GroundSurfaceArea::ID()) {
     // auto kinematicState = a_container.getData<opendlv::coord::KinematicState>();
 
     opendlv::logic::action::AimPoint o1;
@@ -71,7 +71,7 @@ void Acceleration::nextContainer(odcore::data::Container &a_container)
 
 void Acceleration::setUp()
 {
-  // std::string const exampleConfig = 
+  // std::string const exampleConfig =
   //   getKeyValueConfiguration().getValue<std::string>(
   //     "logic-cfsd18-cognition-acceleration.example-config");
 

code/logic-cfsd18/cognition/brake/include/brake.hpp

@@ -23,8 +23,8 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
+
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/cognition/brake/src/brake.cpp

@@ -43,7 +43,7 @@ Brake::~Brake()
 
 void Brake::nextContainer(odcore::data::Container &a_container)
 {
-  if (a_container.getDataType() == opendlv::logic::perception::Surface::ID()) {
+  if (a_container.getDataType() == opendlv::logic::perception::GroundSurfaceArea::ID()) {
     // auto kinematicState = a_container.getData<opendlv::coord::KinematicState>();
 
     opendlv::logic::action::AimPoint o1;
@@ -71,7 +71,7 @@ void Brake::nextContainer(odcore::data::Container &a_container)
 
 void Brake::setUp()
 {
-  // std::string const exampleConfig = 
+  // std::string const exampleConfig =
   //   getKeyValueConfiguration().getValue<std::string>(
   //     "logic-cfsd18-cognition-brake.example-config");
 

code/logic-cfsd18/cognition/limitlateral/include/limitlateral.hpp

@@ -23,8 +23,7 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/cognition/skidpad/include/skidpad.hpp

@@ -23,8 +23,8 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
+
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/cognition/skidpad/src/skidpad.cpp

@@ -43,7 +43,7 @@ Skidpad::~Skidpad()
 
 void Skidpad::nextContainer(odcore::data::Container &a_container)
 {
-  if (a_container.getDataType() == opendlv::logic::perception::Surface::ID()) {
+  if (a_container.getDataType() == opendlv::logic::perception::GroundSurfaceArea::ID()) {
     // auto kinematicState = a_container.getData<opendlv::coord::KinematicState>();
 
     opendlv::logic::action::AimPoint o1;
@@ -71,7 +71,7 @@ void Skidpad::nextContainer(odcore::data::Container &a_container)
 
 void Skidpad::setUp()
 {
-  // std::string const exampleConfig = 
+  // std::string const exampleConfig =
   //   getKeyValueConfiguration().getValue<std::string>(
   //     "logic-cfsd18-cognition-skidpad.example-config");
 

code/logic-cfsd18/cognition/track/include/track.hpp

@@ -23,8 +23,7 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/cognition/track/src/track.cpp

@@ -43,7 +43,7 @@ Track::~Track()
 
 void Track::nextContainer(odcore::data::Container &a_container)
 {
-  if (a_container.getDataType() == opendlv::logic::perception::Surface::ID()) {
+  if (a_container.getDataType() == opendlv::logic::perception::GroundSurfaceArea::ID()) {
     // auto kinematicState = a_container.getData<opendlv::coord::KinematicState>();
 
     opendlv::logic::action::AimPoint o1;
@@ -71,7 +71,7 @@ void Track::nextContainer(odcore::data::Container &a_container)
 
 void Track::setUp()
 {
-  // std::string const exampleConfig = 
+  // std::string const exampleConfig =
   //   getKeyValueConfiguration().getValue<std::string>(
   //     "logic-cfsd18-cognition-track.example-config");
 

code/logic-cfsd18/perception/detectcone/include/detectcone.hpp

@@ -23,8 +23,8 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
+
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/perception/detectcone/src/detectcone.cpp

@@ -41,20 +41,14 @@ DetectCone::~DetectCone()
 
 
 
-void DetectCone::nextContainer(odcore::data::Container &a_container)
+void DetectCone::nextContainer(odcore::data::Container &)
 {
-  if (a_container.getDataType() == opendlv::logic::sensation::Attention::ID()) {
-    // auto kinematicState = a_container.getData<opendlv::coord::KinematicState>();
-
-    opendlv::logic::perception::Object o1;
-    odcore::data::Container c1(o1);
-    getConference().send(c1);
-  }
+
 }
 
 void DetectCone::setUp()
 {
-  // std::string const exampleConfig = 
+  // std::string const exampleConfig =
   //   getKeyValueConfiguration().getValue<std::string>(
   //     "logic-cfsd18-perception-detectcone.example-config");
 

code/logic-cfsd18/perception/detectconelane/include/detectconelane.hpp

@@ -23,8 +23,7 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/perception/detectconelane/src/detectconelane.cpp

@@ -46,15 +46,15 @@ void DetectConeLane::nextContainer(odcore::data::Container &a_container)
   if (a_container.getDataType() == opendlv::logic::perception::Object::ID()) {
     // auto kinematicState = a_container.getData<opendlv::coord::KinematicState>();
 
-    opendlv::logic::perception::Surface o1;
+    opendlv::logic::perception::GroundSurfaceArea o1;
     odcore::data::Container c1(o1);
     getConference().send(c1);
   }
 }
 
 void DetectConeLane::setUp()
 {
-  // std::string const exampleConfig = 
+  // std::string const exampleConfig =
   //   getKeyValueConfiguration().getValue<std::string>(
   //     "logic-cfsd18-perception-detectconelane.example-config");
 

code/logic-cfsd18/sensation/attention/include/attention.hpp

@@ -23,8 +23,8 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
+
 
 namespace opendlv {
 namespace logic {

code/logic-cfsd18/sensation/attention/src/attention.cpp

@@ -47,15 +47,12 @@ void Attention::nextContainer(odcore::data::Container &a_container)
   if (a_container.getDataType() == odcore::data::CompactPointCloud::ID()) {
     // auto kinematicState = a_container.getData<opendlv::coord::KinematicState>();
 
-    opendlv::logic::sensation::Attention o1;
-    odcore::data::Container c1(o1);
-    getConference().send(c1);
   }
 }
 
 void Attention::setUp()
 {
-  // std::string const exampleConfig = 
+  // std::string const exampleConfig =
   //   getKeyValueConfiguration().getValue<std::string>(
   //     "logic-cfsd18-sensation-attention.example-config");
 

code/logic-cfsd18/sensation/slam/include/slam.hpp

@@ -23,8 +23,7 @@
 #include <opendavinci/odcore/base/module/DataTriggeredConferenceClientModule.h>
 #include <opendavinci/odcore/data/Container.h>
 
-//#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
-#include <odvdcfsd18/GeneratedHeaders_ODVDcfsd18.h>
+#include <odvdopendlvstandardmessageset/GeneratedHeaders_ODVDOpenDLVStandardMessageSet.h>
 
 namespace opendlv {
 namespace logic {

docker/Makefile

@@ -19,12 +19,12 @@ PROJECT_NAME=opendlv.cfsd18
 
 REPOSITORY=seresearch
 
-IMAGE=opendlv-cfsd18-on-opendlv-lynx-on-opendlv-on-opendlv-core-on-opendavinci-on-base
+IMAGE=opendlv-cfsd18-on-opendlv-core-on-opendavinci-on-base
 IMAGE_PATH=$(REPOSITORY)/$(IMAGE)
 
-BASE_IMAGE=opendlv-lynx-on-opendlv-on-opendlv-core-on-opendavinci-on-base
+BASE_IMAGE=opendlv-core-on-opendavinci-on-base
 BASE_IMAGE_PATH=$(REPOSITORY)/$(BASE_IMAGE)
-BASE_IMAGE_VERSION=v0.0.3
+BASE_IMAGE_VERSION=v0.13.0
 
 DEV_SUFFIX=-dev
 
@@ -166,4 +166,3 @@ pushDockerImage: createDockerImage
 	$(DOCKER) push $(IMAGE_PATH):$(VERSION)
 	$(DOCKER) push $(IMAGE_DEV_PATH):latest
 	$(DOCKER) push $(IMAGE_DEV_PATH):$(VERSION)
-