Skip to content

Commit

Permalink
[core] redesign publisher api (#1858)
Browse files Browse the repository at this point in the history
* legacy CPublisher moved to eCAL::v5::CPublisher
* new eCAL::CPublisher with reduced API
  • Loading branch information
rex-schilasky authored Dec 16, 2024
1 parent 68e13ff commit a6d6f1f
Show file tree
Hide file tree
Showing 39 changed files with 1,031 additions and 805 deletions.
3 changes: 2 additions & 1 deletion app/play/play_core/src/measurement_container.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <memory>

#include <ecal/ecal.h>
#include <ecal/ecal_publisher_v5.h>
#include <ecalhdf5/eh5_meas.h>

#include "continuity_report.h"
Expand Down Expand Up @@ -90,7 +91,7 @@ class MeasurementContainer
private:
struct PublisherInfo
{
eCAL::CPublisher publisher_;
eCAL::v5::CPublisher publisher_;
long long message_counter_;

PublisherInfo(const std::string& topic_name, const eCAL::SDataTypeInformation& info_)
Expand Down
6 changes: 4 additions & 2 deletions ecal/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ endif()
if(ECAL_CORE_PUBLISHER)
set(ecal_pub_src
src/pubsub/ecal_publisher.cpp
src/pubsub/ecal_publisher_impl.cpp
src/pubsub/ecal_publisher_impl.h
src/pubsub/ecal_publisher_v5.cpp
src/pubsub/ecal_pubgate.cpp
src/pubsub/ecal_pubgate.h
)
Expand All @@ -226,8 +229,6 @@ set(ecal_readwrite_src

if(ECAL_CORE_PUBLISHER)
set(ecal_writer_src
src/readwrite/ecal_writer.cpp
src/readwrite/ecal_writer.h
src/readwrite/ecal_writer_base.h
src/readwrite/ecal_writer_buffer_payload.h
src/readwrite/ecal_writer_data.h
Expand Down Expand Up @@ -538,6 +539,7 @@ set(ecal_header_cmn
include/ecal/ecal_process_severity.h
include/ecal/ecal_registration.h
include/ecal/ecal_publisher.h
include/ecal/ecal_publisher_v5.h
include/ecal/ecal_server.h
include/ecal/ecal_server_v5.h
include/ecal/ecal_service_info.h
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/cimpl/ecal_log_cimpl.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ========================= eCAL LICENSE =================================
*
* Copyright (C) 2016 - 2019 Continental Corporation
* Copyright (C) 2016 - 2024 Continental Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ecal/core/include/ecal/ecal_log.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ========================= eCAL LICENSE =================================
*
* Copyright (C) 2016 - 2019 Continental Corporation
* Copyright (C) 2016 - 2024 Continental Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit a6d6f1f

Please sign in to comment.