File tree Expand file tree Collapse file tree 7 files changed +16
-3
lines changed
Expand file tree Collapse file tree 7 files changed +16
-3
lines changed Original file line number Diff line number Diff line change @@ -139,7 +139,7 @@ void CaptureFb::startStatusLoop()
139139void CaptureFb::stopStatusLoop ()
140140{
141141 {
142- std::scoped_lock<std::mutex> lock (sync );
142+ auto lock2 = getRecursiveConfigLock ( );
143143 stopStatusSending = true ;
144144 }
145145 cv.notify_one ();
Original file line number Diff line number Diff line change 1414#include < opendaq/signal_factory.h>
1515#include " include/ref_can_channel_impl.h"
1616
17+ #include < chrono>
18+
1719#define PI 3.141592653589793
1820
1921namespace daq {
Original file line number Diff line number Diff line change 1616#include < asam_cmp_capture_module/dispatch.h>
1717#include < opendaq/sample_type_traits.h>
1818
19+ #include < chrono>
20+
1921namespace daq
2022{
2123
Original file line number Diff line number Diff line change @@ -35,6 +35,10 @@ if(UNIX)
3535 target_compile_options (${PROJECT_NAME} PRIVATE -fPIC)
3636endif ()
3737
38+ if (MSVC )
39+ target_compile_options (${PROJECT_NAME} PRIVATE /bigobj)
40+ endif ()
41+
3842target_link_libraries (${PROJECT_NAME} PUBLIC daq::opendaq
3943 Pcap++
4044 asam_cmp
Original file line number Diff line number Diff line change 33#include < asam_cmp_common_lib/unit_converter.h>
44#include < asam_cmp_data_sink/stream_fb.h>
55
6+
7+ #include < chrono>
8+
9+
610BEGIN_NAMESPACE_ASAM_CMP_DATA_SINK_MODULE
711
812StreamFb::StreamFb (const ContextPtr& ctx,
Original file line number Diff line number Diff line change 1515#include < opendaq/scheduler_factory.h>
1616#include < opendaq/search_filter_factory.h>
1717#include < thread>
18+ #include < chrono>
1819
19- using namespace std ::chrono_literals ;
20+ using namespace std ::literals ;
2021
2122using namespace daq ;
2223using ASAM::CMP::AnalogPayload;
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ set(OPENDAQ_ENABLE_TESTS false)
33FetchContent_Declare(
44 openDAQ
55 GIT_REPOSITORY https://github.com/openDAQ/openDAQ.git
6- GIT_TAG 4ad72a2c8e0cece80a9898dd844dff3f53f43f2f
6+ GIT_TAG 14b647f955078e7d146513cfb2edc24a675fe679
77 GIT_PROGRESS ON
88 SYSTEM
99 FIND_PACKAGE_ARGS 3.0.0 GLOBAL
You can’t perform that action at this time.
0 commit comments