mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-07-17 08:36:04 +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
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
#pragma once
|
|
#include "RegisterHelperStructs.hpp"
|
|
#include "fmt/format.h"
|
|
#include <cstdint>
|
|
#include <fcntl.h>
|
|
#include <map>
|
|
#include <memory>
|
|
#include <stdexcept>
|
|
#include <sys/mman.h>
|
|
#include <vector>
|
|
|
|
// TODO: maybe should be templated on address type (e.g. uint32_t register or
|
|
// uint64_t register) for more flexibility?
|
|
|
|
namespace sls {
|
|
|
|
template <typename IPCores, typename MemoryModel> class BusCommunication {
|
|
|
|
using IPCoreEnumType = typename IPCores::ipcore_enum_type;
|
|
|
|
public:
|
|
BusCommunication();
|
|
|
|
void mapToMemory();
|
|
|
|
uint32_t readRegister(const Register ®ister_) const;
|
|
void writeRegister(const Register ®ister_, const uint32_t data);
|
|
|
|
private:
|
|
void bus_w(const uint32_t offset, IPCoreEnumType baseadress,
|
|
const uint32_t data);
|
|
|
|
uint32_t bus_r(const uint32_t offset, IPCoreEnumType baseadress) const;
|
|
|
|
/// @brief map from id of IP Core to memory model for the register block of
|
|
/// the IP core
|
|
std::map<IPCoreEnumType, MemoryModel> ipcoreregisterblocks{};
|
|
};
|
|
|
|
template <typename IPCores, typename MemoryModel>
|
|
BusCommunication<IPCores, MemoryModel>::BusCommunication() {
|
|
|
|
for (const auto &ip_core : IPCores::ipcores) {
|
|
ipcoreregisterblocks.emplace(ip_core,
|
|
MemoryModel{static_cast<uint32_t>(ip_core),
|
|
IPCores::ip_core_block_size});
|
|
}
|
|
}
|
|
|
|
template <typename IPCores, typename MemoryModel>
|
|
void BusCommunication<IPCores, MemoryModel>::mapToMemory() {
|
|
|
|
for (auto &map_elem : ipcoreregisterblocks) {
|
|
map_elem.second.mapToMemory();
|
|
}
|
|
}
|
|
|
|
template <typename IPCores, typename MemoryModel>
|
|
uint32_t BusCommunication<IPCores, MemoryModel>::readRegister(
|
|
const Register ®ister_) const {
|
|
return bus_r(register_.offset_in_bytes, register_.ip_core);
|
|
}
|
|
|
|
template <typename IPCores, typename MemoryModel>
|
|
void BusCommunication<IPCores, MemoryModel>::writeRegister(
|
|
const Register ®ister_, const uint32_t data) {
|
|
bus_w(register_.offset_in_bytes, register_.ip_core, data);
|
|
}
|
|
|
|
template <typename IPCores, typename MemoryModel>
|
|
uint32_t BusCommunication<IPCores, MemoryModel>::bus_r(
|
|
const uint32_t offset, const IPCoreEnumType baseadress) const {
|
|
auto ptr1 = ipcoreregisterblocks.at(baseadress).getMappedMemoryPtr() +
|
|
offset / (sizeof(uint32_t));
|
|
return *ptr1;
|
|
}
|
|
|
|
template <typename IPCores, typename MemoryModel>
|
|
void BusCommunication<IPCores, MemoryModel>::bus_w(
|
|
const uint32_t offset, const IPCoreEnumType baseadress,
|
|
const uint32_t data) {
|
|
auto ptr1 = ipcoreregisterblocks.at(baseadress).getMappedMemoryPtr() +
|
|
offset / (sizeof(uint32_t));
|
|
*ptr1 = data;
|
|
}
|
|
|
|
} // namespace sls
|