Skip to content
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

Jump to bottom

Upgrade to latest graph-prototype and fix test #143

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Upgrade to latest graph-prototype and fix test #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53c2640
Update graph-prototype
frankosterfeld Mar 26, 2024
0853b04
Fix qa_Picoscope4000a
frankosterfeld Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set(ENABLE_TESTING OFF)
FetchContent_Declare(
graph-prototype
GIT_REPOSITORY https://github.com/fair-acc/graph-prototype.git
GIT_TAG 1f3469c73ea182b38ff66f18d46e5251fc1edbf8 # main as of 2024-03-07
GIT_TAG 1402c524e557b6a81403e52dfe6a7c42c278dafd # main as of 2024-03-26
)

FetchContent_Declare(
Expand Down
12 changes: 6 additions & 6 deletions blocklib/picoscope/test/qa_Picoscope4000a.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ testStreamingBasics() {
fmt::println("Total: {}", sink.samples_seen);

expect(ge(sink.samples_seen, 80000UZ));
expect(le(sink.samples_seen, 160000UZ));
expect(le(sink.samples_seen, 170000UZ));
expect(eq(tagMonitor.tags.size(), 1UZ));
const auto &tag = tagMonitor.tags[0];
expect(eq(tag.index, int64_t{ 0 }));
expect(eq(std::get<float>(tag.at(std::string(tag::SAMPLE_RATE.key()))), static_cast<float>(kSampleRate)));
expect(eq(std::get<std::string>(tag.at(std::string(tag::SIGNAL_NAME.key()))), "Test signal"s));
expect(eq(std::get<std::string>(tag.at(std::string(tag::SIGNAL_UNIT.key()))), "Test unit"s));
expect(eq(std::get<float>(tag.at(std::string(tag::SIGNAL_MIN.key()))), 0.f));
expect(eq(std::get<float>(tag.at(std::string(tag::SIGNAL_MAX.key()))), 5.f));
expect(eq(std::get<float>(tag.at(std::string(tag::SAMPLE_RATE.shortKey()))), static_cast<float>(kSampleRate)));
expect(eq(std::get<std::string>(tag.at(std::string(tag::SIGNAL_NAME.shortKey()))), "Test signal"s));
expect(eq(std::get<std::string>(tag.at(std::string(tag::SIGNAL_UNIT.shortKey()))), "Test unit"s));
expect(eq(std::get<float>(tag.at(std::string(tag::SIGNAL_MIN.shortKey()))), 0.f));
expect(eq(std::get<float>(tag.at(std::string(tag::SIGNAL_MAX.shortKey()))), 5.f));
}

const boost::ut::suite Picoscope4000aTests = [] {
Expand Down