mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-07-16 23:56:02 +02:00
mazzol_aandGitHub
7db947e4d2
Build on RHEL9 docker image / build (push) Successful in 4m15s
Build on RHEL8 docker image / build (push) Successful in 5m21s
Build and Deploy on local RHEL9 / build (push) Successful in 2m12s
Build and Deploy on local RHEL8 / build (push) Successful in 5m12s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m55s
Run Simulator Tests on local RHEL8 / build (push) Successful in 22m19s
* added fetch fmt server library * added first draft of matterhorn * added cpp TCP Interface to slsDetectorServer * bug: added std::signal for proper handling of ctr+c * added compile option to set log level * WIP * dont use c project settings when building matterhornserver * updated logger * WIP * WIP * linked fmt to slsProjectOptions * solved merge conflict * some refactoring * cleaned up logs * WIP * generated register defs from csv file * oops given in hex * properly added fmt as a dependency * some format changes * WIP * used CRTP for virtual detector * WIP * added udp functions to matterhornserver * fixed build * added Server class usable for all detectors * removed stopserver * added some more functions * wrong overload * porper cleanup of matterhorn app * PR Review * refactored directory structure * added shared memory for aqcuisition status * implemented bus read and write * added Matterhorn data class * modified memory model * added SPI communication * moved memory for Bus communication to BucCommunication class * WIP added HelperFunction for mask conversion * completed HelperFunctions * added tests for MatterHorn Helper Functions * removed shared memory in destructor * fixed SPI communication * moved SharedMemory to slsSupportLib * added toolchain file for cross compilation * fix constructor for HarwareSPICommunication is public * update receiver parameters function * updated mac address * uploaded matterhorn server binary tracked as lfs * small fixes from tests on board * automatically update matterhorn api version when cross compiling binaries * fix bug in SPI read * copy to server_directory/bin when cross compiling * fixed cmake list * update generate_registerdefs.py * fixed copy of server binary * always return error message * add error log when opening dev/mem * code review * fixed eiger, mythen tests for dynamic range * second Review * member function getDerived for better readability * split code into implementation class and actual class doing tcp communication * added slsWarnings and c++17 compiler option * added git lfs to workflow * fix gitea workflows * bug: add extra clock register * implement initial checks * bug: client excpetcs 4 bytes * refactoring directory structure and rename to .hpp * check if detector already set up * missed .h to .hpp * Code Review 3 * use temmplate value for stopserver * use internal CMAKE_CROSSCOMPILING variable * moved boolean stop server flag to DetectorImpl - moving template parameter up * missed a file * replace baseclass:: with this * add Matterhorn server in github workflow * whatever workflow bug- lets see * fixed receiving trim bits changed to int64_t
48 lines
1.9 KiB
C++
48 lines
1.9 KiB
C++
#include "HelperFunctions.hpp"
|
|
#include "catch.hpp"
|
|
#include <iostream>
|
|
|
|
namespace sls {
|
|
|
|
auto get_test_parameters_countermaskspiconversion() {
|
|
return GENERATE(std::make_tuple(uint32_t{0x1}, uint32_t{0b0000}),
|
|
std::make_tuple(uint32_t{0x2}, uint32_t{0b0001}),
|
|
std::make_tuple(uint32_t{0x4}, uint32_t{0b0010}),
|
|
std::make_tuple(uint32_t{0x3}, uint32_t{0b0100}),
|
|
std::make_tuple(uint32_t{0x6}, uint32_t{0b0101}),
|
|
std::make_tuple(uint32_t{0x7}, uint32_t{0b1000}),
|
|
std::make_tuple(uint32_t{0x8}, uint32_t{0b0011}),
|
|
std::make_tuple(uint32_t{0x9}, uint32_t{0b0111}),
|
|
std::make_tuple(uint32_t{0xB}, uint32_t{0b1011}),
|
|
std::make_tuple(uint32_t{0xC}, uint32_t{0b0110}),
|
|
std::make_tuple(uint32_t{0xD}, uint32_t{0b1010}),
|
|
std::make_tuple(uint32_t{0xE}, uint32_t{0b1001}),
|
|
std::make_tuple(uint32_t{0xF}, uint32_t{0b1100}),
|
|
std::make_tuple(uint32_t{0xB}, uint32_t{0b1011}));
|
|
}
|
|
|
|
TEST_CASE("Convert Counter Mask to SPI Counter Mask",
|
|
"[MatterHorn][HelperFunctions]") {
|
|
auto [counter_mask, expected_spi_counter_mask] =
|
|
get_test_parameters_countermaskspiconversion();
|
|
|
|
REQUIRE(convertCounterMaskToSPICounterMask(counter_mask) ==
|
|
expected_spi_counter_mask);
|
|
|
|
REQUIRE_THROWS(
|
|
convertCounterMaskToSPICounterMask(0xA)); // invalid counter mask
|
|
|
|
REQUIRE_THROWS(
|
|
convertCounterMaskToSPICounterMask(0x5)); // invalid counter mask
|
|
}
|
|
|
|
TEST_CASE("Convert SPI Counter Mask to Counter Mask",
|
|
"[MatterHorn][HelperFunctions]") {
|
|
auto [counter_mask, spi_counter_mask] =
|
|
get_test_parameters_countermaskspiconversion();
|
|
|
|
REQUIRE(convertSPICounterMaskToCounterMask(spi_counter_mask) ==
|
|
counter_mask);
|
|
}
|
|
|
|
} // namespace sls
|