From fcad4ecf11ed716a473dbe546c6442fe7219a51b Mon Sep 17 00:00:00 2001 From: linarn Date: Wed, 28 Mar 2018 18:23:58 +0200 Subject: [PATCH] Modify base image dependecy (now only on core), remove old message set odvdcfsd18 --- CMakeLists.txt | 1 - code/logic-cfsd18/CMakeLists.txt | 8 ++------ code/logic-cfsd18/action/lateral/include/lateral.hpp | 4 ++-- .../action/longitudinal/include/longitudinal.hpp | 4 ++-- .../cognition/acceleration/include/acceleration.hpp | 4 ++-- .../cognition/acceleration/src/acceleration.cpp | 4 ++-- code/logic-cfsd18/cognition/brake/include/brake.hpp | 4 ++-- code/logic-cfsd18/cognition/brake/src/brake.cpp | 4 ++-- .../cognition/limitlateral/include/limitlateral.hpp | 3 +-- .../cognition/skidpad/include/skidpad.hpp | 4 ++-- code/logic-cfsd18/cognition/skidpad/src/skidpad.cpp | 4 ++-- code/logic-cfsd18/cognition/track/include/track.hpp | 3 +-- code/logic-cfsd18/cognition/track/src/track.cpp | 4 ++-- .../perception/detectcone/include/detectcone.hpp | 4 ++-- .../perception/detectcone/src/detectcone.cpp | 12 +++--------- .../detectconelane/include/detectconelane.hpp | 3 +-- .../perception/detectconelane/src/detectconelane.cpp | 4 ++-- .../sensation/attention/include/attention.hpp | 4 ++-- .../sensation/attention/src/attention.cpp | 5 +---- code/logic-cfsd18/sensation/slam/include/slam.hpp | 3 +-- docker/Makefile | 7 +++---- 21 files changed, 37 insertions(+), 56 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe660c3..d63a33c 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/code/logic-cfsd18/CMakeLists.txt b/code/logic-cfsd18/CMakeLists.txt index 7b3bca2..c2a0f57 100644 --- a/code/logic-cfsd18/CMakeLists.txt +++ b/code/logic-cfsd18/CMakeLists.txt @@ -28,11 +28,9 @@ 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}) @@ -40,11 +38,9 @@ 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) diff --git a/code/logic-cfsd18/action/lateral/include/lateral.hpp b/code/logic-cfsd18/action/lateral/include/lateral.hpp index d309875..cfb36cb 100644 --- a/code/logic-cfsd18/action/lateral/include/lateral.hpp +++ b/code/logic-cfsd18/action/lateral/include/lateral.hpp @@ -23,8 +23,8 @@ #include #include -//#include -#include +#include + namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/action/longitudinal/include/longitudinal.hpp b/code/logic-cfsd18/action/longitudinal/include/longitudinal.hpp index 6d8c689..a0243fe 100644 --- a/code/logic-cfsd18/action/longitudinal/include/longitudinal.hpp +++ b/code/logic-cfsd18/action/longitudinal/include/longitudinal.hpp @@ -23,8 +23,8 @@ #include #include -//#include -#include +#include + namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/cognition/acceleration/include/acceleration.hpp b/code/logic-cfsd18/cognition/acceleration/include/acceleration.hpp index 20c735f..3a2eb96 100644 --- a/code/logic-cfsd18/cognition/acceleration/include/acceleration.hpp +++ b/code/logic-cfsd18/cognition/acceleration/include/acceleration.hpp @@ -23,8 +23,8 @@ #include #include -//#include -#include +#include + namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/cognition/acceleration/src/acceleration.cpp b/code/logic-cfsd18/cognition/acceleration/src/acceleration.cpp index b1adedc..d19365b 100644 --- a/code/logic-cfsd18/cognition/acceleration/src/acceleration.cpp +++ b/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::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( // "logic-cfsd18-cognition-acceleration.example-config"); diff --git a/code/logic-cfsd18/cognition/brake/include/brake.hpp b/code/logic-cfsd18/cognition/brake/include/brake.hpp index 08e51b8..b6f2413 100644 --- a/code/logic-cfsd18/cognition/brake/include/brake.hpp +++ b/code/logic-cfsd18/cognition/brake/include/brake.hpp @@ -23,8 +23,8 @@ #include #include -//#include -#include +#include + namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/cognition/brake/src/brake.cpp b/code/logic-cfsd18/cognition/brake/src/brake.cpp index daa906e..6b0004f 100644 --- a/code/logic-cfsd18/cognition/brake/src/brake.cpp +++ b/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::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( // "logic-cfsd18-cognition-brake.example-config"); diff --git a/code/logic-cfsd18/cognition/limitlateral/include/limitlateral.hpp b/code/logic-cfsd18/cognition/limitlateral/include/limitlateral.hpp index cd5ff69..e563eee 100644 --- a/code/logic-cfsd18/cognition/limitlateral/include/limitlateral.hpp +++ b/code/logic-cfsd18/cognition/limitlateral/include/limitlateral.hpp @@ -23,8 +23,7 @@ #include #include -//#include -#include +#include namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/cognition/skidpad/include/skidpad.hpp b/code/logic-cfsd18/cognition/skidpad/include/skidpad.hpp index f6bd4c6..8081c87 100644 --- a/code/logic-cfsd18/cognition/skidpad/include/skidpad.hpp +++ b/code/logic-cfsd18/cognition/skidpad/include/skidpad.hpp @@ -23,8 +23,8 @@ #include #include -//#include -#include +#include + namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/cognition/skidpad/src/skidpad.cpp b/code/logic-cfsd18/cognition/skidpad/src/skidpad.cpp index faf586b..a1be5b5 100644 --- a/code/logic-cfsd18/cognition/skidpad/src/skidpad.cpp +++ b/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::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( // "logic-cfsd18-cognition-skidpad.example-config"); diff --git a/code/logic-cfsd18/cognition/track/include/track.hpp b/code/logic-cfsd18/cognition/track/include/track.hpp index f9ddfc0..4f4fbe5 100644 --- a/code/logic-cfsd18/cognition/track/include/track.hpp +++ b/code/logic-cfsd18/cognition/track/include/track.hpp @@ -23,8 +23,7 @@ #include #include -//#include -#include +#include namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/cognition/track/src/track.cpp b/code/logic-cfsd18/cognition/track/src/track.cpp index 97b7509..a921067 100644 --- a/code/logic-cfsd18/cognition/track/src/track.cpp +++ b/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::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( // "logic-cfsd18-cognition-track.example-config"); diff --git a/code/logic-cfsd18/perception/detectcone/include/detectcone.hpp b/code/logic-cfsd18/perception/detectcone/include/detectcone.hpp index 4bf3cfe..02ab733 100644 --- a/code/logic-cfsd18/perception/detectcone/include/detectcone.hpp +++ b/code/logic-cfsd18/perception/detectcone/include/detectcone.hpp @@ -23,8 +23,8 @@ #include #include -//#include -#include +#include + namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/perception/detectcone/src/detectcone.cpp b/code/logic-cfsd18/perception/detectcone/src/detectcone.cpp index a934f40..d320a06 100644 --- a/code/logic-cfsd18/perception/detectcone/src/detectcone.cpp +++ b/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::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( // "logic-cfsd18-perception-detectcone.example-config"); diff --git a/code/logic-cfsd18/perception/detectconelane/include/detectconelane.hpp b/code/logic-cfsd18/perception/detectconelane/include/detectconelane.hpp index a4c9bb9..1a55d2e 100644 --- a/code/logic-cfsd18/perception/detectconelane/include/detectconelane.hpp +++ b/code/logic-cfsd18/perception/detectconelane/include/detectconelane.hpp @@ -23,8 +23,7 @@ #include #include -//#include -#include +#include namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/perception/detectconelane/src/detectconelane.cpp b/code/logic-cfsd18/perception/detectconelane/src/detectconelane.cpp index 4677aa3..92490fb 100644 --- a/code/logic-cfsd18/perception/detectconelane/src/detectconelane.cpp +++ b/code/logic-cfsd18/perception/detectconelane/src/detectconelane.cpp @@ -46,7 +46,7 @@ void DetectConeLane::nextContainer(odcore::data::Container &a_container) if (a_container.getDataType() == opendlv::logic::perception::Object::ID()) { // auto kinematicState = a_container.getData(); - opendlv::logic::perception::Surface o1; + opendlv::logic::perception::GroundSurfaceArea o1; odcore::data::Container c1(o1); getConference().send(c1); } @@ -54,7 +54,7 @@ void DetectConeLane::nextContainer(odcore::data::Container &a_container) void DetectConeLane::setUp() { - // std::string const exampleConfig = + // std::string const exampleConfig = // getKeyValueConfiguration().getValue( // "logic-cfsd18-perception-detectconelane.example-config"); diff --git a/code/logic-cfsd18/sensation/attention/include/attention.hpp b/code/logic-cfsd18/sensation/attention/include/attention.hpp index 8051249..b71d3f2 100644 --- a/code/logic-cfsd18/sensation/attention/include/attention.hpp +++ b/code/logic-cfsd18/sensation/attention/include/attention.hpp @@ -23,8 +23,8 @@ #include #include -//#include -#include +#include + namespace opendlv { namespace logic { diff --git a/code/logic-cfsd18/sensation/attention/src/attention.cpp b/code/logic-cfsd18/sensation/attention/src/attention.cpp index 9da23f0..58055b6 100644 --- a/code/logic-cfsd18/sensation/attention/src/attention.cpp +++ b/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::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( // "logic-cfsd18-sensation-attention.example-config"); diff --git a/code/logic-cfsd18/sensation/slam/include/slam.hpp b/code/logic-cfsd18/sensation/slam/include/slam.hpp index 844cae0..ea0e464 100644 --- a/code/logic-cfsd18/sensation/slam/include/slam.hpp +++ b/code/logic-cfsd18/sensation/slam/include/slam.hpp @@ -23,8 +23,7 @@ #include #include -//#include -#include +#include namespace opendlv { namespace logic { diff --git a/docker/Makefile b/docker/Makefile index 132d4ca..120a26d 100644 --- a/docker/Makefile +++ b/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) -