detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 19:46:30 +01:00
Code Issues Actions Packages Releases Activity

Xilinx ctb (#884)

Browse Source 
* updated registers, arm64

* compiler set to aarch64 for xilinx server

* updated RegisterDefs.h

* merge into generate branch and resolving conflicts and adding the xilinx changes to callerspecial and commands.yaml

* compiles and can print firmware version (using a different csp0 address)

* fixing other servers (gotthard, jungfrau, moench, mythen3) that it returns in case of mapping failure, xilinxctb: added that it checks type, prints proper fw version, checks kernel date, added armprocessor define to use in common places, added specifiers to supress overflow and truncation warnings

* added detector ip and mac adddress to the printout

* fixed tests and recompiled servers
This commit is contained in:
maliakal_d
2024-01-04 17:10:16 +01:00
committed by GitHub
parent 4f4125a3b2
commit 9738cb7d74
35 changed files with 1602 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsSupportLib/include/sls/sls_detector_defs.h
View File

@@ -96,6 +96,7 @@ class slsDetectorDefs {
MOENCH,
MYTHEN3,
GOTTHARD2,
XILINX_CHIPTESTBOARD
};
/** return values */
@@ -683,6 +684,7 @@ struct detParameters {
nChipY = 2;
nDacs = 8;
break;
case slsDetectorDefs::detectorType::XILINX_CHIPTESTBOARD:
case slsDetectorDefs::detectorType::CHIPTESTBOARD:
nChanX = 36;
nChanY = 1;

15
slsSupportLib/include/sls/versionAPI.h
View File

@@ -4,10 +4,11 @@
#define RELEASE "developer"
#define APILIB "developer 0x230224"
#define APIRECEIVER "developer 0x230224"
#define APICTB "developer 0x231109"
#define APIGOTTHARD "developer 0x231109"
#define APIGOTTHARD2 "developer 0x231109"
#define APIJUNGFRAU "developer 0x231109"
#define APIMYTHEN3 "developer 0x231109"
#define APIEIGER "developer 0x231109"
#define APIMOENCH "developer 0x231127"
#define APIXILINXCTB "developer 0x240104"
#define APICTB "developer 0x240104"
#define APIGOTTHARD "developer 0x240104"
#define APIGOTTHARD2 "developer 0x240104"
#define APIJUNGFRAU "developer 0x240104"
#define APIMYTHEN3 "developer 0x240104"
#define APIMOENCH "developer 0x240104"
#define APIEIGER "developer 0x240104"

4
slsSupportLib/src/ToString.cpp
View File

@@ -207,6 +207,8 @@ std::string ToString(const defs::detectorType s) {
return std::string("Mythen3");
case defs::GOTTHARD2:
return std::string("Gotthard2");
case defs::XILINX_CHIPTESTBOARD:
return std::string("Xilinx_ChipTestBoard");
default:
return std::string("Unknown");
}
@@ -694,6 +696,8 @@ template <> defs::detectorType StringTo(const std::string &s) {
return defs::MYTHEN3;
if (s == "Gotthard2")
return defs::GOTTHARD2;
if (s == "Xilinx_ChipTestBoard")
return defs::XILINX_CHIPTESTBOARD;
throw RuntimeError("Unknown detector type " + s);
}

1
slsSupportLib/tests/test-ToString.cpp
View File

@@ -136,6 +136,7 @@ TEST_CASE("string to detectorType") {
REQUIRE(StringTo<dt>("Moench") == dt::MOENCH);
REQUIRE(StringTo<dt>("Mythen3") == dt::MYTHEN3);
REQUIRE(StringTo<dt>("Gotthard2") == dt::GOTTHARD2);
REQUIRE(StringTo<dt>("Xilinx_ChipTestBoard") == dt::XILINX_CHIPTESTBOARD);
}
TEST_CASE("vec") {