Skip to content

Chrono includes, bugfixes of debug building and a bugfix out of scope reference #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alien588 merged 3 commits into from
Apr 18, 2025
Merged

Chrono includes, bugfixes of debug building and a bugfix out of scope reference #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e30105f
Include chrono to .cpp, changed build to new patch
alien588 Apr 7, 2025
77728fd
Fix of dubug compile and a small bug
alien588 Apr 11, 2025
1df4a11
Update CMakeLists.txt
alien588 Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asam_cmp_capture_module/src/capture_fb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ void CaptureFb::startStatusLoop()
void CaptureFb::stopStatusLoop()
{
{
std::scoped_lock<std::mutex> lock(sync);
auto lock2 = getRecursiveConfigLock();
stopStatusSending = true;
}
cv.notify_one();
Expand Down
2 changes: 2 additions & 0 deletions asam_cmp_capture_module/tests/ref_can_channel_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include <opendaq/signal_factory.h>
#include "include/ref_can_channel_impl.h"

#include <chrono>

#define PI 3.141592653589793

namespace daq {
Expand Down
2 changes: 2 additions & 0 deletions asam_cmp_capture_module/tests/ref_channel_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include <asam_cmp_capture_module/dispatch.h>
#include <opendaq/sample_type_traits.h>

#include <chrono>

namespace daq
{

Expand Down
4 changes: 4 additions & 0 deletions asam_cmp_common_lib/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ if(UNIX)
target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
endif()

if (MSVC)
target_compile_options(${PROJECT_NAME} PRIVATE /bigobj)
endif()

target_link_libraries(${PROJECT_NAME} PUBLIC daq::opendaq
Pcap++
asam_cmp
Expand Down
4 changes: 4 additions & 0 deletions asam_cmp_data_sink/src/stream_fb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
#include <asam_cmp_common_lib/unit_converter.h>
#include <asam_cmp_data_sink/stream_fb.h>


#include <chrono>


BEGIN_NAMESPACE_ASAM_CMP_DATA_SINK_MODULE

StreamFb::StreamFb(const ContextPtr& ctx,
Expand Down
3 changes: 2 additions & 1 deletion asam_cmp_data_sink/tests/test_stream_fb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
#include <opendaq/scheduler_factory.h>
#include <opendaq/search_filter_factory.h>
#include <thread>
#include <chrono>

using namespace std::chrono_literals;
using namespace std::literals;

using namespace daq;
using ASAM::CMP::AnalogPayload;
Expand Down
2 changes: 1 addition & 1 deletion external/openDAQ/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set(OPENDAQ_ENABLE_TESTS false)
FetchContent_Declare(
openDAQ
GIT_REPOSITORY https://github.com/openDAQ/openDAQ.git
GIT_TAG 4ad72a2c8e0cece80a9898dd844dff3f53f43f2f
GIT_TAG 14b647f955078e7d146513cfb2edc24a675fe679
GIT_PROGRESS ON
SYSTEM
FIND_PACKAGE_ARGS 3.0.0 GLOBAL
Expand Down