detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02:00
Code Issues Actions Packages Releases Activity

Dev/reg bit change no validate (#970)

Browse Source 
- do not validate write reg, setbit and clearbit by default anymore
- --validate will force validation on the bitmask or entire reg
- remove return value for write reg (across server to client, but thankfully not in the Detector class)
- extend validation into writereg, setbit and clearbit for Eiger (always special)
-  need to check python (TODO)
- missed the rx_zmqip implementations in detector.h and python bindings
This commit is contained in:
maliakal_d
2024-09-30 16:54:12 +02:00
committed by GitHub
parent a44ba4dc35
commit 2dc0963c56
33 changed files with 499 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/tests/Caller/test-Caller.cpp
View File

@ -3245,6 +3245,13 @@ TEST_CASE("CALLER::reg", "[.cmdcall]") {
uint32_t addr = 0x64;
std::string saddr = ToStringHex(addr);
auto prev_val = det.readRegister(addr);
{
std::ostringstream oss1, oss2;
caller.call("reg", {saddr, "0x6", "--validate"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "reg [" + saddr + ", 0x6]\n");
caller.call("reg", {saddr}, -1, GET, oss2);
REQUIRE(oss2.str() == "reg 0x6\n");
}
{
std::ostringstream oss1, oss2;
caller.call("reg", {saddr, "0x5"}, -1, PUT, oss1);
@ -3253,7 +3260,7 @@ TEST_CASE("CALLER::reg", "[.cmdcall]") {
REQUIRE(oss2.str() == "reg 0x5\n");
}
for (int i = 0; i != det.size(); ++i) {
det.writeRegister(addr, prev_val[i], {i});
det.writeRegister(addr, prev_val[i], false, {i});
}
}
// cannot check for eiger virtual server
@ -3289,15 +3296,17 @@ TEST_CASE("CALLER::setbit", "[.cmdcall]") {
std::string saddr = ToStringHex(addr);
auto prev_val = det.readRegister(addr);
{
std::ostringstream oss1, oss2;
std::ostringstream oss1, oss2, oss3;
caller.call("reg", {saddr, "0x0"}, -1, PUT);
caller.call("setbit", {saddr, "1"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "setbit [" + saddr + ", 1]\n");
caller.call("reg", {saddr}, -1, GET, oss2);
REQUIRE(oss2.str() == "reg 0x2\n");
caller.call("setbit", {saddr, "2", "--validate"}, -1, PUT, oss2);
REQUIRE(oss2.str() == "setbit [" + saddr + ", 2]\n");
caller.call("reg", {saddr}, -1, GET, oss3);
REQUIRE(oss3.str() == "reg 0x6\n");
}
for (int i = 0; i != det.size(); ++i) {
det.writeRegister(addr, prev_val[i], {i});
det.writeRegister(addr, prev_val[i], false, {i});
}
}
}
@ -3311,15 +3320,17 @@ TEST_CASE("CALLER::clearbit", "[.cmdcall]") {
std::string saddr = ToStringHex(addr);
auto prev_val = det.readRegister(addr);
{
std::ostringstream oss1, oss2;
caller.call("reg", {saddr, "0x3"}, -1, PUT);
std::ostringstream oss1, oss2, oss3;
caller.call("reg", {saddr, "0x7"}, -1, PUT);
caller.call("clearbit", {saddr, "1"}, -1, PUT, oss1);
REQUIRE(oss1.str() == "clearbit [" + saddr + ", 1]\n");
caller.call("reg", {saddr}, -1, GET, oss2);
REQUIRE(oss2.str() == "reg 0x1\n");
caller.call("clearbit", {saddr, "2", "--validate"}, -1, PUT, oss2);
REQUIRE(oss2.str() == "clearbit [" + saddr + ", 2]\n");
caller.call("reg", {saddr}, -1, GET, oss3);
REQUIRE(oss3.str() == "reg 0x1\n");
}
for (int i = 0; i != det.size(); ++i) {
det.writeRegister(addr, prev_val[i], {i});
det.writeRegister(addr, prev_val[i], false, {i});
}
}
}
@ -3339,7 +3350,7 @@ TEST_CASE("CALLER::getbit", "[.cmdcall]") {
REQUIRE(oss1.str() == "getbit 1\n");
}
for (int i = 0; i != det.size(); ++i) {
det.writeRegister(addr, prev_val[i], {i});
det.writeRegister(addr, prev_val[i], false, {i});
}
}
// cannot check for eiger virtual server