detectors/slsDetectorPackage
24
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-12-28 07:01:19 +01:00
Code Issues Actions Packages Releases Activity

Removing implicit conversions:

Browse Source 
RegisterAddresss and RegisterValue: Removed the implicit conversions.
RegisterAddress: Changed member name from address_ to value_ and method as well to value().
RegisterValue: Also added | operator to be able to concatenate with uint32_t. Same in python bindings (but could not find the tests to modify
This commit is contained in:
maliakal_d
2025-12-15 15:19:27 +01:00
parent ea561e2422
commit ea9508da9f
6 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/src/Module.cpp
View File

@@ -2916,32 +2916,29 @@ void Module::setUpdateMode(const bool updatemode) {
}
RegisterValue Module::readRegister(RegisterAddress addr) const {
return sendToDetectorStop<RegisterValue>(F_READ_REGISTER, addr);
return sendToDetectorStop<RegisterValue>(F_READ_REGISTER, addr.value());
}
void Module::writeRegister(RegisterAddress addr, RegisterValue val,
bool validate) {
uint32_t args[]{addr, val, static_cast<uint32_t>(validate)};
uint32_t args[]{addr.value(), val.value(), static_cast<uint32_t>(validate)};
return sendToDetectorStop(F_WRITE_REGISTER, args, nullptr);
}
void Module::setBit(BitAddress bitAddr, bool validate) {
uint32_t args[] = {bitAddr.address(),
static_cast<uint32_t>(bitAddr.bitPosition()),
uint32_t args[] = {bitAddr.address().value(), bitAddr.bitPosition(),
static_cast<uint32_t>(validate)};
sendToDetectorStop(F_SET_BIT, args, nullptr);
}
void Module::clearBit(BitAddress bitAddr, bool validate) {
uint32_t args[] = {bitAddr.address(),
static_cast<uint32_t>(bitAddr.bitPosition()),
uint32_t args[] = {bitAddr.address().value(), bitAddr.bitPosition(),
static_cast<uint32_t>(validate)};
sendToDetectorStop(F_CLEAR_BIT, args, nullptr);
}
int Module::getBit(BitAddress bitAddr) const {
uint32_t args[2] = {bitAddr.address(),
static_cast<uint32_t>(bitAddr.bitPosition())};
uint32_t args[2] = {bitAddr.address().value(), bitAddr.bitPosition()};
return sendToDetectorStop<int>(F_GET_BIT, args);
}