From 4967c212acfeb4a3dfe5a0230a9bdfb55bda9ef9 Mon Sep 17 00:00:00 2001 From: Aliaksandr Adziareika Date: Tue, 24 Feb 2026 12:58:54 +0100 Subject: [PATCH] Reorganize repository layout to match openDAQ module template Move: - asam_cmp_capture_module and asam_cmp_data_sink into modules/ - asam_cmp_common_lib into shared/libraries/, - asam_cmp_example into examples/ - assets/* into docs/images/. Add intermediate CMakeLists.txt files for new subdirectories. Update paths in root CMakeLists.txt and README.md. --- CMakeLists.txt | 13 ++------ README.md | 30 +++++++++--------- .../add_capture_module_from_status.png | Bin .../images}/add_empty_capture_module.png | Bin .../images}/add_interface_function.png | Bin .../images}/add_stream_function.png | Bin .../images}/asam_cmp_capture_module_fb.png | Bin .../images}/asam_cmp_data_sink_module.png | Bin .../images}/capture_module_list.png | Bin .../images}/connect_signal_to_stream.png | Bin .../images}/open_daq_signal_asam_cmp.png | Bin {assets => docs/images}/remove_by_index.png | Bin .../images}/remove_module_example.png | Bin .../images}/select_network_adapter.png | Bin .../select_network_adapter_for_data_sink.png | Bin .../images}/select_payload_type.png | Bin examples/CMakeLists.txt | 1 + .../asam_cmp_example}/CMakeLists.txt | 0 .../asam_cmp_example}/can.xml | 0 .../asam_cmp_example}/main.cpp | 0 modules/CMakeLists.txt | 7 ++++ .../asam_cmp_capture_module}/CMakeLists.txt | 0 .../asam_cmp_capture_module/capture_fb.h | 0 .../asam_cmp_capture_module/capture_module.h | 0 .../capture_module_fb.h | 0 .../include/asam_cmp_capture_module/common.h | 0 .../asam_cmp_capture_module/dispatch.h | 0 .../asam_cmp_capture_module/encoder_bank.h | 0 .../input_descriptors_validator.h | 0 .../asam_cmp_capture_module/interface_fb.h | 0 .../asam_cmp_capture_module/module_dll.h | 0 .../asam_cmp_capture_module/stream_fb.h | 0 .../src/CMakeLists.txt | 0 .../src/capture_fb.cpp | 0 .../src/capture_module.cpp | 0 .../src/capture_module_fb.cpp | 0 .../src/encoder_bank.cpp | 0 .../src/input_descriptors_validator.cpp | 0 .../src/interface_fb.cpp | 0 .../src/module_dll.cpp | 0 .../src/stream_fb.cpp | 0 .../tests/CMakeLists.txt | 0 .../tests/include/ref_can_channel_impl.h | 0 .../tests/include/ref_channel_impl.h | 0 .../tests/include/time_stub.h | 0 .../tests/ref_can_channel_impl.cpp | 0 .../tests/ref_channel_impl.cpp | 0 .../tests/test_analog_messages.cpp | 0 .../tests/test_app.cpp | 0 .../tests/test_capture_fb.cpp | 0 .../tests/test_capture_module.cpp | 0 .../tests/test_capture_module_fb.cpp | 0 .../tests/test_interface.cpp | 0 .../tests/test_stream.cpp | 0 .../tests/time_stub.cpp | 0 .../asam_cmp_data_sink}/CMakeLists.txt | 0 .../asam_cmp_packets_subscriber.h | 0 .../include/asam_cmp_data_sink/capture_fb.h | 0 .../capture_packets_publisher.h | 0 .../include/asam_cmp_data_sink/common.h | 0 .../data_packets_publisher.h | 0 .../include/asam_cmp_data_sink/data_sink_fb.h | 0 .../asam_cmp_data_sink/data_sink_module.h | 0 .../asam_cmp_data_sink/data_sink_module_fb.h | 0 .../include/asam_cmp_data_sink/interface_fb.h | 0 .../include/asam_cmp_data_sink/module_dll.h | 0 .../include/asam_cmp_data_sink/publisher.h | 0 .../asam_cmp_data_sink/status_fb_impl.h | 0 .../asam_cmp_data_sink/status_handler.h | 0 .../include/asam_cmp_data_sink/stream_fb.h | 0 .../asam_cmp_data_sink}/src/CMakeLists.txt | 0 .../asam_cmp_data_sink}/src/capture_fb.cpp | 0 .../asam_cmp_data_sink}/src/data_sink_fb.cpp | 0 .../src/data_sink_module.cpp | 0 .../src/data_sink_module_fb.cpp | 0 .../asam_cmp_data_sink}/src/interface_fb.cpp | 0 .../asam_cmp_data_sink}/src/module_dll.cpp | 0 .../src/status_fb_impl.cpp | 0 .../asam_cmp_data_sink}/src/stream_fb.cpp | 0 .../asam_cmp_data_sink}/tests/CMakeLists.txt | 0 .../asam_cmp_data_sink}/tests/test_app.cpp | 0 .../tests/test_capture_fb.cpp | 0 .../tests/test_data_packets_publisher.cpp | 0 .../tests/test_data_sink_fb.cpp | 0 .../tests/test_data_sink_module_fb.cpp | 0 .../tests/test_interface_fb.cpp | 0 .../tests/test_status_fb.cpp | 0 .../tests/test_stream_fb.cpp | 0 shared/CMakeLists.txt | 1 + shared/libraries/CMakeLists.txt | 1 + .../asam_cmp_common_lib}/CMakeLists.txt | 0 .../asam_cmp_common_lib/capture_common_fb.h | 0 .../include/asam_cmp_common_lib/common.h | 0 .../asam_cmp_common_lib/ethernet_itf.h | 0 .../asam_cmp_common_lib/ethernet_pcpp_impl.h | 0 .../asam_cmp_common_lib/ethernet_pcpp_itf.h | 0 .../asam_cmp_common_lib/ethernet_pcpp_mock.h | 0 .../include/asam_cmp_common_lib/id_manager.h | 0 .../asam_cmp_common_lib/interface_common_fb.h | 0 .../asam_cmp_common_lib/network_manager_fb.h | 0 .../stream_common_fb_impl.h | 0 .../asam_cmp_common_lib/unit_converter.h | 0 .../asam_cmp_common_lib}/src/CMakeLists.txt | 0 .../src/ethernet_pcpp_impl.cpp | 0 .../src/interface_common_fb.cpp | 0 .../src/network_manager_fb.cpp | 0 .../src/unit_converter.cpp | 0 .../asam_cmp_common_lib}/tests/CMakeLists.txt | 0 .../asam_cmp_common_lib}/tests/test_app.cpp | 0 .../tests/test_unit_converter.cpp | 0 110 files changed, 28 insertions(+), 25 deletions(-) rename {assets => docs/images}/add_capture_module_from_status.png (100%) rename {assets => docs/images}/add_empty_capture_module.png (100%) rename {assets => docs/images}/add_interface_function.png (100%) rename {assets => docs/images}/add_stream_function.png (100%) rename {assets => docs/images}/asam_cmp_capture_module_fb.png (100%) rename {assets => docs/images}/asam_cmp_data_sink_module.png (100%) rename {assets => docs/images}/capture_module_list.png (100%) rename {assets => docs/images}/connect_signal_to_stream.png (100%) rename {assets => docs/images}/open_daq_signal_asam_cmp.png (100%) rename {assets => docs/images}/remove_by_index.png (100%) rename {assets => docs/images}/remove_module_example.png (100%) rename {assets => docs/images}/select_network_adapter.png (100%) rename {assets => docs/images}/select_network_adapter_for_data_sink.png (100%) rename {assets => docs/images}/select_payload_type.png (100%) create mode 100644 examples/CMakeLists.txt rename {asam_cmp_example => examples/asam_cmp_example}/CMakeLists.txt (100%) rename {asam_cmp_example => examples/asam_cmp_example}/can.xml (100%) rename {asam_cmp_example => examples/asam_cmp_example}/main.cpp (100%) create mode 100644 modules/CMakeLists.txt rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/CMakeLists.txt (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/capture_fb.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/capture_module.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/capture_module_fb.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/common.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/dispatch.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/encoder_bank.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/input_descriptors_validator.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/interface_fb.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/module_dll.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/include/asam_cmp_capture_module/stream_fb.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/CMakeLists.txt (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/capture_fb.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/capture_module.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/capture_module_fb.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/encoder_bank.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/input_descriptors_validator.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/interface_fb.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/module_dll.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/src/stream_fb.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/CMakeLists.txt (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/include/ref_can_channel_impl.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/include/ref_channel_impl.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/include/time_stub.h (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/ref_can_channel_impl.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/ref_channel_impl.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/test_analog_messages.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/test_app.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/test_capture_fb.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/test_capture_module.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/test_capture_module_fb.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/test_interface.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/test_stream.cpp (100%) rename {asam_cmp_capture_module => modules/asam_cmp_capture_module}/tests/time_stub.cpp (100%) rename {asam_cmp_common_lib => modules/asam_cmp_data_sink}/CMakeLists.txt (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/asam_cmp_packets_subscriber.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/capture_fb.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/capture_packets_publisher.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/common.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/data_packets_publisher.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/data_sink_fb.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/data_sink_module.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/data_sink_module_fb.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/interface_fb.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/module_dll.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/publisher.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/status_fb_impl.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/status_handler.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/include/asam_cmp_data_sink/stream_fb.h (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/CMakeLists.txt (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/capture_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/data_sink_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/data_sink_module.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/data_sink_module_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/interface_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/module_dll.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/status_fb_impl.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/src/stream_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/CMakeLists.txt (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/test_app.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/test_capture_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/test_data_packets_publisher.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/test_data_sink_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/test_data_sink_module_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/test_interface_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/test_status_fb.cpp (100%) rename {asam_cmp_data_sink => modules/asam_cmp_data_sink}/tests/test_stream_fb.cpp (100%) create mode 100644 shared/CMakeLists.txt create mode 100644 shared/libraries/CMakeLists.txt rename {asam_cmp_data_sink => shared/libraries/asam_cmp_common_lib}/CMakeLists.txt (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/capture_common_fb.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/common.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/ethernet_itf.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/ethernet_pcpp_impl.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/ethernet_pcpp_itf.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/ethernet_pcpp_mock.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/id_manager.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/interface_common_fb.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/network_manager_fb.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/stream_common_fb_impl.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/include/asam_cmp_common_lib/unit_converter.h (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/src/CMakeLists.txt (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/src/ethernet_pcpp_impl.cpp (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/src/interface_common_fb.cpp (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/src/network_manager_fb.cpp (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/src/unit_converter.cpp (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/tests/CMakeLists.txt (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/tests/test_app.cpp (100%) rename {asam_cmp_common_lib => shared/libraries/asam_cmp_common_lib}/tests/test_unit_converter.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f4725e..987eb98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,19 +39,12 @@ if (${REPO_OPTION_PREFIX}_ENABLE_EXAMPLE) set(DAQMODULES_REF_DEVICE_MODULE ON) set(DAQMODULES_REF_FB_MODULE ON) - add_subdirectory(asam_cmp_example) + add_subdirectory(examples) endif() add_subdirectory(external) -add_subdirectory(asam_cmp_common_lib) - -if (${REPO_OPTION_PREFIX}_BUILD_CAPTURE_MODULE) - add_subdirectory(asam_cmp_capture_module) -endif() - -if (${REPO_OPTION_PREFIX}_BUILD_DATA_SINK) - add_subdirectory(asam_cmp_data_sink) -endif() +add_subdirectory(shared) +add_subdirectory(modules) # Set CPack variables set(CPACK_COMPONENTS_ALL RUNTIME) diff --git a/README.md b/README.md index 8c0a8a1..643c402 100644 --- a/README.md +++ b/README.md @@ -44,52 +44,52 @@ To allow a process to send/receive packets with libpcap in Linux, you must set t To connect your OpendaqSignal to the Capture module follow the steps below: 1. Add `asam_cmp_capture_module_fb` function block: - ![image](./assets/asam_cmp_capture_module_fb.png) + ![image](./docs/images/asam_cmp_capture_module_fb.png) 2. On the `asam_cmp_capture_module_fb` choose the network adapter among the suggested to send ASAM CMP messages through it: - ![image](./assets/select_network_adapter.png) + ![image](./docs/images/select_network_adapter.png) 3. On the `asam_cmp_capture_fb` run *AddInterface* function to add the interface: - ![image](./assets/add_interface_function.png) + ![image](./docs/images/add_interface_function.png) 4. On created `asam_cmp_interface` function block choose PayloadType among suggested: - ![image](./assets/select_payload_type.png) + ![image](./docs/images/select_payload_type.png) 5. Run *AddStream* function to add stream: - ![image](./assets/add_stream_function.png) + ![image](./docs/images/add_stream_function.png) 6. `asam_cmp_stream_fb` has the input port you can connect your signal, capturing data starts immediately: - ![image](./assets/connect_signal_to_stream.png) + ![image](./docs/images/connect_signal_to_stream.png) To get ASAM CMP packets from the Ethernet follow the steps below: 1. Add `asam_cmp_data_sink_module` function block: - ![image](./assets/asam_cmp_data_sink_module.png) + ![image](./docs/images/asam_cmp_data_sink_module.png) 2. On the `asam_cmp_data_sink_module` choose the network adapter you expect to receive ASAM CMP messages: - ![image](./assets/select_network_adapter_for_data_sink.png) + ![image](./docs/images/select_network_adapter_for_data_sink.png) 3. There are two ways to configure `asam_cmp_data_sink`: - Go to the `asam_cmp_status` FB. In the capture module list you can check the *CaptureModuleList* property which contains list of capture modules whose status messages were captured. Go to the `asam_cmp_data_sink` FB and run *AddCaptureModuleFromStatus*. This function requires index as the parameter, available capture modules are 0-indexed in the *CaptureModuleList* property of `asam_cmp_status`: - ![image](./assets/capture_module_list.png) - ![image](./assets/add_capture_module_from_status.png) + ![image](./docs/images/capture_module_list.png) + ![image](./docs/images/add_capture_module_from_status.png) Selected capture module will be configured into a similar structure (capture module → interface → stream). Stream will contain OpenDaq signal with decoded ASAM CMP message from the Ethernet: - ![image](./assets/open_daq_signal_asam_cmp.png) + ![image](./docs/images/open_daq_signal_asam_cmp.png) - Run *AddCaptureModuleEmpty* function that creates an empty `capture_module_fb` FB. Then repeat steps 3-5 as you do it on the CaptureModule side. In case data messages with the correct `deviceId`, `interfaceId`, and `streamId` exist and the payloadType is correct, processing of incoming data messages starts immediately: - ![image](./assets/add_empty_capture_module.png) + ![image](./docs/images/add_empty_capture_module.png) If you want to remove Interface/Stream on CaptureModule or CaptureModule/Interface/Stream on DataSink, you can use the corresponding *Remove* methods. **⚠️IMPORTANT**: Please remember that you should put an *index* of the object that should be removed, not its id. The picture below demonstrates this: - ![image](./assets/remove_by_index.png) - ![image](./assets/remove_module_example.png) + ![image](./docs/images/remove_by_index.png) + ![image](./docs/images/remove_module_example.png) - You can find a usage example in the `asam_cmp_example` directory. + You can find a usage example in the `examples/asam_cmp_example` directory. ## Modules Structure diff --git a/assets/add_capture_module_from_status.png b/docs/images/add_capture_module_from_status.png similarity index 100% rename from assets/add_capture_module_from_status.png rename to docs/images/add_capture_module_from_status.png diff --git a/assets/add_empty_capture_module.png b/docs/images/add_empty_capture_module.png similarity index 100% rename from assets/add_empty_capture_module.png rename to docs/images/add_empty_capture_module.png diff --git a/assets/add_interface_function.png b/docs/images/add_interface_function.png similarity index 100% rename from assets/add_interface_function.png rename to docs/images/add_interface_function.png diff --git a/assets/add_stream_function.png b/docs/images/add_stream_function.png similarity index 100% rename from assets/add_stream_function.png rename to docs/images/add_stream_function.png diff --git a/assets/asam_cmp_capture_module_fb.png b/docs/images/asam_cmp_capture_module_fb.png similarity index 100% rename from assets/asam_cmp_capture_module_fb.png rename to docs/images/asam_cmp_capture_module_fb.png diff --git a/assets/asam_cmp_data_sink_module.png b/docs/images/asam_cmp_data_sink_module.png similarity index 100% rename from assets/asam_cmp_data_sink_module.png rename to docs/images/asam_cmp_data_sink_module.png diff --git a/assets/capture_module_list.png b/docs/images/capture_module_list.png similarity index 100% rename from assets/capture_module_list.png rename to docs/images/capture_module_list.png diff --git a/assets/connect_signal_to_stream.png b/docs/images/connect_signal_to_stream.png similarity index 100% rename from assets/connect_signal_to_stream.png rename to docs/images/connect_signal_to_stream.png diff --git a/assets/open_daq_signal_asam_cmp.png b/docs/images/open_daq_signal_asam_cmp.png similarity index 100% rename from assets/open_daq_signal_asam_cmp.png rename to docs/images/open_daq_signal_asam_cmp.png diff --git a/assets/remove_by_index.png b/docs/images/remove_by_index.png similarity index 100% rename from assets/remove_by_index.png rename to docs/images/remove_by_index.png diff --git a/assets/remove_module_example.png b/docs/images/remove_module_example.png similarity index 100% rename from assets/remove_module_example.png rename to docs/images/remove_module_example.png diff --git a/assets/select_network_adapter.png b/docs/images/select_network_adapter.png similarity index 100% rename from assets/select_network_adapter.png rename to docs/images/select_network_adapter.png diff --git a/assets/select_network_adapter_for_data_sink.png b/docs/images/select_network_adapter_for_data_sink.png similarity index 100% rename from assets/select_network_adapter_for_data_sink.png rename to docs/images/select_network_adapter_for_data_sink.png diff --git a/assets/select_payload_type.png b/docs/images/select_payload_type.png similarity index 100% rename from assets/select_payload_type.png rename to docs/images/select_payload_type.png diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 0000000..5f72148 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(asam_cmp_example) diff --git a/asam_cmp_example/CMakeLists.txt b/examples/asam_cmp_example/CMakeLists.txt similarity index 100% rename from asam_cmp_example/CMakeLists.txt rename to examples/asam_cmp_example/CMakeLists.txt diff --git a/asam_cmp_example/can.xml b/examples/asam_cmp_example/can.xml similarity index 100% rename from asam_cmp_example/can.xml rename to examples/asam_cmp_example/can.xml diff --git a/asam_cmp_example/main.cpp b/examples/asam_cmp_example/main.cpp similarity index 100% rename from asam_cmp_example/main.cpp rename to examples/asam_cmp_example/main.cpp diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt new file mode 100644 index 0000000..b3d1689 --- /dev/null +++ b/modules/CMakeLists.txt @@ -0,0 +1,7 @@ +if (${REPO_OPTION_PREFIX}_BUILD_CAPTURE_MODULE) + add_subdirectory(asam_cmp_capture_module) +endif() + +if (${REPO_OPTION_PREFIX}_BUILD_DATA_SINK) + add_subdirectory(asam_cmp_data_sink) +endif() diff --git a/asam_cmp_capture_module/CMakeLists.txt b/modules/asam_cmp_capture_module/CMakeLists.txt similarity index 100% rename from asam_cmp_capture_module/CMakeLists.txt rename to modules/asam_cmp_capture_module/CMakeLists.txt diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_fb.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_fb.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/capture_fb.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_fb.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_module.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_module.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/capture_module.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_module.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_module_fb.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_module_fb.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/capture_module_fb.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/capture_module_fb.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/common.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/common.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/common.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/common.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/dispatch.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/dispatch.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/dispatch.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/dispatch.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/encoder_bank.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/encoder_bank.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/encoder_bank.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/encoder_bank.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/input_descriptors_validator.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/input_descriptors_validator.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/input_descriptors_validator.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/input_descriptors_validator.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/interface_fb.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/interface_fb.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/interface_fb.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/interface_fb.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/module_dll.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/module_dll.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/module_dll.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/module_dll.h diff --git a/asam_cmp_capture_module/include/asam_cmp_capture_module/stream_fb.h b/modules/asam_cmp_capture_module/include/asam_cmp_capture_module/stream_fb.h similarity index 100% rename from asam_cmp_capture_module/include/asam_cmp_capture_module/stream_fb.h rename to modules/asam_cmp_capture_module/include/asam_cmp_capture_module/stream_fb.h diff --git a/asam_cmp_capture_module/src/CMakeLists.txt b/modules/asam_cmp_capture_module/src/CMakeLists.txt similarity index 100% rename from asam_cmp_capture_module/src/CMakeLists.txt rename to modules/asam_cmp_capture_module/src/CMakeLists.txt diff --git a/asam_cmp_capture_module/src/capture_fb.cpp b/modules/asam_cmp_capture_module/src/capture_fb.cpp similarity index 100% rename from asam_cmp_capture_module/src/capture_fb.cpp rename to modules/asam_cmp_capture_module/src/capture_fb.cpp diff --git a/asam_cmp_capture_module/src/capture_module.cpp b/modules/asam_cmp_capture_module/src/capture_module.cpp similarity index 100% rename from asam_cmp_capture_module/src/capture_module.cpp rename to modules/asam_cmp_capture_module/src/capture_module.cpp diff --git a/asam_cmp_capture_module/src/capture_module_fb.cpp b/modules/asam_cmp_capture_module/src/capture_module_fb.cpp similarity index 100% rename from asam_cmp_capture_module/src/capture_module_fb.cpp rename to modules/asam_cmp_capture_module/src/capture_module_fb.cpp diff --git a/asam_cmp_capture_module/src/encoder_bank.cpp b/modules/asam_cmp_capture_module/src/encoder_bank.cpp similarity index 100% rename from asam_cmp_capture_module/src/encoder_bank.cpp rename to modules/asam_cmp_capture_module/src/encoder_bank.cpp diff --git a/asam_cmp_capture_module/src/input_descriptors_validator.cpp b/modules/asam_cmp_capture_module/src/input_descriptors_validator.cpp similarity index 100% rename from asam_cmp_capture_module/src/input_descriptors_validator.cpp rename to modules/asam_cmp_capture_module/src/input_descriptors_validator.cpp diff --git a/asam_cmp_capture_module/src/interface_fb.cpp b/modules/asam_cmp_capture_module/src/interface_fb.cpp similarity index 100% rename from asam_cmp_capture_module/src/interface_fb.cpp rename to modules/asam_cmp_capture_module/src/interface_fb.cpp diff --git a/asam_cmp_capture_module/src/module_dll.cpp b/modules/asam_cmp_capture_module/src/module_dll.cpp similarity index 100% rename from asam_cmp_capture_module/src/module_dll.cpp rename to modules/asam_cmp_capture_module/src/module_dll.cpp diff --git a/asam_cmp_capture_module/src/stream_fb.cpp b/modules/asam_cmp_capture_module/src/stream_fb.cpp similarity index 100% rename from asam_cmp_capture_module/src/stream_fb.cpp rename to modules/asam_cmp_capture_module/src/stream_fb.cpp diff --git a/asam_cmp_capture_module/tests/CMakeLists.txt b/modules/asam_cmp_capture_module/tests/CMakeLists.txt similarity index 100% rename from asam_cmp_capture_module/tests/CMakeLists.txt rename to modules/asam_cmp_capture_module/tests/CMakeLists.txt diff --git a/asam_cmp_capture_module/tests/include/ref_can_channel_impl.h b/modules/asam_cmp_capture_module/tests/include/ref_can_channel_impl.h similarity index 100% rename from asam_cmp_capture_module/tests/include/ref_can_channel_impl.h rename to modules/asam_cmp_capture_module/tests/include/ref_can_channel_impl.h diff --git a/asam_cmp_capture_module/tests/include/ref_channel_impl.h b/modules/asam_cmp_capture_module/tests/include/ref_channel_impl.h similarity index 100% rename from asam_cmp_capture_module/tests/include/ref_channel_impl.h rename to modules/asam_cmp_capture_module/tests/include/ref_channel_impl.h diff --git a/asam_cmp_capture_module/tests/include/time_stub.h b/modules/asam_cmp_capture_module/tests/include/time_stub.h similarity index 100% rename from asam_cmp_capture_module/tests/include/time_stub.h rename to modules/asam_cmp_capture_module/tests/include/time_stub.h diff --git a/asam_cmp_capture_module/tests/ref_can_channel_impl.cpp b/modules/asam_cmp_capture_module/tests/ref_can_channel_impl.cpp similarity index 100% rename from asam_cmp_capture_module/tests/ref_can_channel_impl.cpp rename to modules/asam_cmp_capture_module/tests/ref_can_channel_impl.cpp diff --git a/asam_cmp_capture_module/tests/ref_channel_impl.cpp b/modules/asam_cmp_capture_module/tests/ref_channel_impl.cpp similarity index 100% rename from asam_cmp_capture_module/tests/ref_channel_impl.cpp rename to modules/asam_cmp_capture_module/tests/ref_channel_impl.cpp diff --git a/asam_cmp_capture_module/tests/test_analog_messages.cpp b/modules/asam_cmp_capture_module/tests/test_analog_messages.cpp similarity index 100% rename from asam_cmp_capture_module/tests/test_analog_messages.cpp rename to modules/asam_cmp_capture_module/tests/test_analog_messages.cpp diff --git a/asam_cmp_capture_module/tests/test_app.cpp b/modules/asam_cmp_capture_module/tests/test_app.cpp similarity index 100% rename from asam_cmp_capture_module/tests/test_app.cpp rename to modules/asam_cmp_capture_module/tests/test_app.cpp diff --git a/asam_cmp_capture_module/tests/test_capture_fb.cpp b/modules/asam_cmp_capture_module/tests/test_capture_fb.cpp similarity index 100% rename from asam_cmp_capture_module/tests/test_capture_fb.cpp rename to modules/asam_cmp_capture_module/tests/test_capture_fb.cpp diff --git a/asam_cmp_capture_module/tests/test_capture_module.cpp b/modules/asam_cmp_capture_module/tests/test_capture_module.cpp similarity index 100% rename from asam_cmp_capture_module/tests/test_capture_module.cpp rename to modules/asam_cmp_capture_module/tests/test_capture_module.cpp diff --git a/asam_cmp_capture_module/tests/test_capture_module_fb.cpp b/modules/asam_cmp_capture_module/tests/test_capture_module_fb.cpp similarity index 100% rename from asam_cmp_capture_module/tests/test_capture_module_fb.cpp rename to modules/asam_cmp_capture_module/tests/test_capture_module_fb.cpp diff --git a/asam_cmp_capture_module/tests/test_interface.cpp b/modules/asam_cmp_capture_module/tests/test_interface.cpp similarity index 100% rename from asam_cmp_capture_module/tests/test_interface.cpp rename to modules/asam_cmp_capture_module/tests/test_interface.cpp diff --git a/asam_cmp_capture_module/tests/test_stream.cpp b/modules/asam_cmp_capture_module/tests/test_stream.cpp similarity index 100% rename from asam_cmp_capture_module/tests/test_stream.cpp rename to modules/asam_cmp_capture_module/tests/test_stream.cpp diff --git a/asam_cmp_capture_module/tests/time_stub.cpp b/modules/asam_cmp_capture_module/tests/time_stub.cpp similarity index 100% rename from asam_cmp_capture_module/tests/time_stub.cpp rename to modules/asam_cmp_capture_module/tests/time_stub.cpp diff --git a/asam_cmp_common_lib/CMakeLists.txt b/modules/asam_cmp_data_sink/CMakeLists.txt similarity index 100% rename from asam_cmp_common_lib/CMakeLists.txt rename to modules/asam_cmp_data_sink/CMakeLists.txt diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/asam_cmp_packets_subscriber.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/asam_cmp_packets_subscriber.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/asam_cmp_packets_subscriber.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/asam_cmp_packets_subscriber.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/capture_fb.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/capture_fb.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/capture_fb.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/capture_fb.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/capture_packets_publisher.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/capture_packets_publisher.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/capture_packets_publisher.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/capture_packets_publisher.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/common.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/common.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/common.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/common.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/data_packets_publisher.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/data_packets_publisher.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/data_packets_publisher.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/data_packets_publisher.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_fb.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_fb.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_fb.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_fb.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_module.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_module.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_module.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_module.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_module_fb.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_module_fb.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_module_fb.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/data_sink_module_fb.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/interface_fb.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/interface_fb.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/interface_fb.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/interface_fb.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/module_dll.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/module_dll.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/module_dll.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/module_dll.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/publisher.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/publisher.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/publisher.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/publisher.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/status_fb_impl.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/status_fb_impl.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/status_fb_impl.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/status_fb_impl.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/status_handler.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/status_handler.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/status_handler.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/status_handler.h diff --git a/asam_cmp_data_sink/include/asam_cmp_data_sink/stream_fb.h b/modules/asam_cmp_data_sink/include/asam_cmp_data_sink/stream_fb.h similarity index 100% rename from asam_cmp_data_sink/include/asam_cmp_data_sink/stream_fb.h rename to modules/asam_cmp_data_sink/include/asam_cmp_data_sink/stream_fb.h diff --git a/asam_cmp_data_sink/src/CMakeLists.txt b/modules/asam_cmp_data_sink/src/CMakeLists.txt similarity index 100% rename from asam_cmp_data_sink/src/CMakeLists.txt rename to modules/asam_cmp_data_sink/src/CMakeLists.txt diff --git a/asam_cmp_data_sink/src/capture_fb.cpp b/modules/asam_cmp_data_sink/src/capture_fb.cpp similarity index 100% rename from asam_cmp_data_sink/src/capture_fb.cpp rename to modules/asam_cmp_data_sink/src/capture_fb.cpp diff --git a/asam_cmp_data_sink/src/data_sink_fb.cpp b/modules/asam_cmp_data_sink/src/data_sink_fb.cpp similarity index 100% rename from asam_cmp_data_sink/src/data_sink_fb.cpp rename to modules/asam_cmp_data_sink/src/data_sink_fb.cpp diff --git a/asam_cmp_data_sink/src/data_sink_module.cpp b/modules/asam_cmp_data_sink/src/data_sink_module.cpp similarity index 100% rename from asam_cmp_data_sink/src/data_sink_module.cpp rename to modules/asam_cmp_data_sink/src/data_sink_module.cpp diff --git a/asam_cmp_data_sink/src/data_sink_module_fb.cpp b/modules/asam_cmp_data_sink/src/data_sink_module_fb.cpp similarity index 100% rename from asam_cmp_data_sink/src/data_sink_module_fb.cpp rename to modules/asam_cmp_data_sink/src/data_sink_module_fb.cpp diff --git a/asam_cmp_data_sink/src/interface_fb.cpp b/modules/asam_cmp_data_sink/src/interface_fb.cpp similarity index 100% rename from asam_cmp_data_sink/src/interface_fb.cpp rename to modules/asam_cmp_data_sink/src/interface_fb.cpp diff --git a/asam_cmp_data_sink/src/module_dll.cpp b/modules/asam_cmp_data_sink/src/module_dll.cpp similarity index 100% rename from asam_cmp_data_sink/src/module_dll.cpp rename to modules/asam_cmp_data_sink/src/module_dll.cpp diff --git a/asam_cmp_data_sink/src/status_fb_impl.cpp b/modules/asam_cmp_data_sink/src/status_fb_impl.cpp similarity index 100% rename from asam_cmp_data_sink/src/status_fb_impl.cpp rename to modules/asam_cmp_data_sink/src/status_fb_impl.cpp diff --git a/asam_cmp_data_sink/src/stream_fb.cpp b/modules/asam_cmp_data_sink/src/stream_fb.cpp similarity index 100% rename from asam_cmp_data_sink/src/stream_fb.cpp rename to modules/asam_cmp_data_sink/src/stream_fb.cpp diff --git a/asam_cmp_data_sink/tests/CMakeLists.txt b/modules/asam_cmp_data_sink/tests/CMakeLists.txt similarity index 100% rename from asam_cmp_data_sink/tests/CMakeLists.txt rename to modules/asam_cmp_data_sink/tests/CMakeLists.txt diff --git a/asam_cmp_data_sink/tests/test_app.cpp b/modules/asam_cmp_data_sink/tests/test_app.cpp similarity index 100% rename from asam_cmp_data_sink/tests/test_app.cpp rename to modules/asam_cmp_data_sink/tests/test_app.cpp diff --git a/asam_cmp_data_sink/tests/test_capture_fb.cpp b/modules/asam_cmp_data_sink/tests/test_capture_fb.cpp similarity index 100% rename from asam_cmp_data_sink/tests/test_capture_fb.cpp rename to modules/asam_cmp_data_sink/tests/test_capture_fb.cpp diff --git a/asam_cmp_data_sink/tests/test_data_packets_publisher.cpp b/modules/asam_cmp_data_sink/tests/test_data_packets_publisher.cpp similarity index 100% rename from asam_cmp_data_sink/tests/test_data_packets_publisher.cpp rename to modules/asam_cmp_data_sink/tests/test_data_packets_publisher.cpp diff --git a/asam_cmp_data_sink/tests/test_data_sink_fb.cpp b/modules/asam_cmp_data_sink/tests/test_data_sink_fb.cpp similarity index 100% rename from asam_cmp_data_sink/tests/test_data_sink_fb.cpp rename to modules/asam_cmp_data_sink/tests/test_data_sink_fb.cpp diff --git a/asam_cmp_data_sink/tests/test_data_sink_module_fb.cpp b/modules/asam_cmp_data_sink/tests/test_data_sink_module_fb.cpp similarity index 100% rename from asam_cmp_data_sink/tests/test_data_sink_module_fb.cpp rename to modules/asam_cmp_data_sink/tests/test_data_sink_module_fb.cpp diff --git a/asam_cmp_data_sink/tests/test_interface_fb.cpp b/modules/asam_cmp_data_sink/tests/test_interface_fb.cpp similarity index 100% rename from asam_cmp_data_sink/tests/test_interface_fb.cpp rename to modules/asam_cmp_data_sink/tests/test_interface_fb.cpp diff --git a/asam_cmp_data_sink/tests/test_status_fb.cpp b/modules/asam_cmp_data_sink/tests/test_status_fb.cpp similarity index 100% rename from asam_cmp_data_sink/tests/test_status_fb.cpp rename to modules/asam_cmp_data_sink/tests/test_status_fb.cpp diff --git a/asam_cmp_data_sink/tests/test_stream_fb.cpp b/modules/asam_cmp_data_sink/tests/test_stream_fb.cpp similarity index 100% rename from asam_cmp_data_sink/tests/test_stream_fb.cpp rename to modules/asam_cmp_data_sink/tests/test_stream_fb.cpp diff --git a/shared/CMakeLists.txt b/shared/CMakeLists.txt new file mode 100644 index 0000000..6abc850 --- /dev/null +++ b/shared/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(libraries) \ No newline at end of file diff --git a/shared/libraries/CMakeLists.txt b/shared/libraries/CMakeLists.txt new file mode 100644 index 0000000..553e253 --- /dev/null +++ b/shared/libraries/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(asam_cmp_common_lib) diff --git a/asam_cmp_data_sink/CMakeLists.txt b/shared/libraries/asam_cmp_common_lib/CMakeLists.txt similarity index 100% rename from asam_cmp_data_sink/CMakeLists.txt rename to shared/libraries/asam_cmp_common_lib/CMakeLists.txt diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/capture_common_fb.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/capture_common_fb.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/capture_common_fb.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/capture_common_fb.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/common.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/common.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/common.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/common.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_itf.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_itf.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_itf.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_itf.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_impl.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_impl.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_impl.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_impl.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_itf.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_itf.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_itf.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_itf.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_mock.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_mock.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_mock.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/ethernet_pcpp_mock.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/id_manager.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/id_manager.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/id_manager.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/id_manager.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/interface_common_fb.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/interface_common_fb.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/interface_common_fb.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/interface_common_fb.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/network_manager_fb.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/network_manager_fb.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/network_manager_fb.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/network_manager_fb.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/stream_common_fb_impl.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/stream_common_fb_impl.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/stream_common_fb_impl.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/stream_common_fb_impl.h diff --git a/asam_cmp_common_lib/include/asam_cmp_common_lib/unit_converter.h b/shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/unit_converter.h similarity index 100% rename from asam_cmp_common_lib/include/asam_cmp_common_lib/unit_converter.h rename to shared/libraries/asam_cmp_common_lib/include/asam_cmp_common_lib/unit_converter.h diff --git a/asam_cmp_common_lib/src/CMakeLists.txt b/shared/libraries/asam_cmp_common_lib/src/CMakeLists.txt similarity index 100% rename from asam_cmp_common_lib/src/CMakeLists.txt rename to shared/libraries/asam_cmp_common_lib/src/CMakeLists.txt diff --git a/asam_cmp_common_lib/src/ethernet_pcpp_impl.cpp b/shared/libraries/asam_cmp_common_lib/src/ethernet_pcpp_impl.cpp similarity index 100% rename from asam_cmp_common_lib/src/ethernet_pcpp_impl.cpp rename to shared/libraries/asam_cmp_common_lib/src/ethernet_pcpp_impl.cpp diff --git a/asam_cmp_common_lib/src/interface_common_fb.cpp b/shared/libraries/asam_cmp_common_lib/src/interface_common_fb.cpp similarity index 100% rename from asam_cmp_common_lib/src/interface_common_fb.cpp rename to shared/libraries/asam_cmp_common_lib/src/interface_common_fb.cpp diff --git a/asam_cmp_common_lib/src/network_manager_fb.cpp b/shared/libraries/asam_cmp_common_lib/src/network_manager_fb.cpp similarity index 100% rename from asam_cmp_common_lib/src/network_manager_fb.cpp rename to shared/libraries/asam_cmp_common_lib/src/network_manager_fb.cpp diff --git a/asam_cmp_common_lib/src/unit_converter.cpp b/shared/libraries/asam_cmp_common_lib/src/unit_converter.cpp similarity index 100% rename from asam_cmp_common_lib/src/unit_converter.cpp rename to shared/libraries/asam_cmp_common_lib/src/unit_converter.cpp diff --git a/asam_cmp_common_lib/tests/CMakeLists.txt b/shared/libraries/asam_cmp_common_lib/tests/CMakeLists.txt similarity index 100% rename from asam_cmp_common_lib/tests/CMakeLists.txt rename to shared/libraries/asam_cmp_common_lib/tests/CMakeLists.txt diff --git a/asam_cmp_common_lib/tests/test_app.cpp b/shared/libraries/asam_cmp_common_lib/tests/test_app.cpp similarity index 100% rename from asam_cmp_common_lib/tests/test_app.cpp rename to shared/libraries/asam_cmp_common_lib/tests/test_app.cpp diff --git a/asam_cmp_common_lib/tests/test_unit_converter.cpp b/shared/libraries/asam_cmp_common_lib/tests/test_unit_converter.cpp similarity index 100% rename from asam_cmp_common_lib/tests/test_unit_converter.cpp rename to shared/libraries/asam_cmp_common_lib/tests/test_unit_converter.cpp