mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-07-16 23:26:03 +02:00
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
62 lines
1.8 KiB
C++
62 lines
1.8 KiB
C++
#pragma once
|
|
#include <cstdint>
|
|
#include <exception>
|
|
#include <fmt/format.h>
|
|
#include <string_view>
|
|
|
|
namespace sls {
|
|
|
|
enum class IPCore : uint32_t; // forward declaration of IPCore enum class
|
|
|
|
/// @brief struct representing 32 bit register
|
|
struct Register {
|
|
/// @brief IP core address space
|
|
const IPCore ip_core{}; // TODO replace by enum type
|
|
|
|
/// @brief Offset of the register in bytes from the base address of the IP
|
|
/// core
|
|
const uint32_t offset_in_bytes{};
|
|
};
|
|
|
|
struct RegisterField {
|
|
/// @brief Register to which the field belongs
|
|
const Register register_{};
|
|
|
|
/// @brief Bit position of the least significant bit of the field in the
|
|
/// register
|
|
const uint32_t bit_position{};
|
|
|
|
/// @brief Bitmask for the field
|
|
const uint32_t bitmask{};
|
|
};
|
|
|
|
// TODO: maybe static member function of RegisterField?
|
|
template <typename T>
|
|
void setRegisterField(uint32_t ®istervalue, const RegisterField ®_field,
|
|
T field_value) {
|
|
|
|
if (field_value > static_cast<T>(reg_field.bitmask)) {
|
|
throw std::invalid_argument(
|
|
fmt::format("Value {} cannot fit in field with bitmask {}",
|
|
field_value, reg_field.bitmask));
|
|
}
|
|
// Clear the bits corresponding to the field
|
|
registervalue &= ~(reg_field.bitmask << reg_field.bit_position);
|
|
// Set the new value for the field
|
|
registervalue |= (static_cast<uint32_t>(field_value) & reg_field.bitmask)
|
|
<< reg_field.bit_position;
|
|
}
|
|
|
|
template <typename T>
|
|
T getRegisterField(const uint32_t ®istervalue,
|
|
const RegisterField ®_field) {
|
|
// Extract the bits corresponding to the field and shift them to get the
|
|
// value
|
|
|
|
auto field_value =
|
|
(registervalue >> reg_field.bit_position) & reg_field.bitmask;
|
|
|
|
return static_cast<T>(field_value);
|
|
}
|
|
|
|
} // namespace sls
|