detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-06-20 14:21:43 +02:00
Code Issues Actions Packages Releases Activity

added Matterhorn data class

Browse Source
This commit is contained in:
mazzol_a
2026-05-01 16:47:25 +02:00
parent ff9f7c2795
commit 008c09cf04
8 changed files with 99 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/slsDetectorServer_cpp/include/ArmBusCommunication.hpp
+12 -10
View File
@@ -17,6 +17,10 @@ namespace sls {
template <typename IPCoreEnumType, typename MemoryModel>
struct IpCoreRegisterBlock {
const std::map<IPCoreEnumType, MemoryModel> &operator()() const {
return memoryblocks_;
}
std::map<IPCoreEnumType, MemoryModel> &operator()() {
return memoryblocks_;
}
@@ -40,10 +44,10 @@ class BusCommunication {
/// @brief stores register blocks for each IP core
IpCoreRegisterBlock<IPCoreEnumType, MemoryModel> ipcoreregisterblocks;
void bus_w(const uint32_t offset, const uint32_t baseadress,
void bus_w(const uint32_t offset, IPCoreEnumType baseadress,
const uint32_t data) const;
uint32_t bus_r(const uint32_t offset, const uint32_t baseadress) const;
uint32_t bus_r(const uint32_t offset, IPCoreEnumType baseadress) const;
};
template <typename IPCoreEnumType, typename MemoryModel>
@@ -57,30 +61,28 @@ void BusCommunication<IPCoreEnumType, MemoryModel>::mapToMemory() {
template <typename IPCoreEnumType, typename MemoryModel>
uint32_t BusCommunication<IPCoreEnumType, MemoryModel>::readRegister(
const Register &register_) const {
return bus_r(register_.offset_in_bytes,
static_cast<uint32_t>(register_.ip_core));
return bus_r(register_.offset_in_bytes, register_.ip_core);
}
template <typename IPCoreEnumType, typename MemoryModel>
void BusCommunication<IPCoreEnumType, MemoryModel>::writeRegister(
const Register &register_, const uint32_t data) const {
bus_w(register_.offset_in_bytes, static_cast<uint32_t>(register_.ip_core),
data);
bus_w(register_.offset_in_bytes, register_.ip_core, data);
}
template <typename IPCoreEnumType, typename MemoryModel>
uint32_t BusCommunication<IPCoreEnumType, MemoryModel>::bus_r(
const uint32_t offset, const uint32_t baseadress) const {
auto ptr1 = ipcoreregisterblocks()[baseadress].getMappedMemoryPtr() +
const uint32_t offset, const IPCoreEnumType baseadress) const {
auto ptr1 = ipcoreregisterblocks().at(baseadress).getMappedMemoryPtr() +
offset / (sizeof(uint32_t));
return *ptr1;
}
template <typename IPCoreEnumType, typename MemoryModel>
void BusCommunication<IPCoreEnumType, MemoryModel>::bus_w(
const uint32_t offset, const uint32_t baseadress,
const uint32_t offset, const IPCoreEnumType baseadress,
const uint32_t data) const {
auto ptr1 = ipcoreregisterblocks()[baseadress].getMappedMemoryPtr() +
auto ptr1 = ipcoreregisterblocks().at(baseadress).getMappedMemoryPtr() +
offset / (sizeof(uint32_t));
*ptr1 = data;
}