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

Merge branch 'developer' into fix/pattern

Browse Source
This commit is contained in:
Erik Fröjdh
2026-01-21 16:37:57 +01:00
committed by GitHub
parent 89927d6b46 8769f1e70a
commit 3d49e91aed
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/xilinx_ctbDetectorServer/RegisterDefs.h
View File

@@ -131,7 +131,7 @@
/* REG no_Samples_X_Reg */ /* REG no_Samples_X_Reg */
#define NO_SAMPLES_X_REG 0xa00cUL #define NO_SAMPLES_X_REG 0xa00cUL
#define NO_SAMPLES_X_MSK 0x1fffUL #define NO_SAMPLES_X_MSK 0x7FFFFFFFUL
#define NO_SAMPLES_X_OFST 0 #define NO_SAMPLES_X_OFST 0
/* REG count_Frames_From_Reg_1 */ /* REG count_Frames_From_Reg_1 */

BIN
slsDetectorServers/xilinx_ctbDetectorServer/bin/xilinx_ctbDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorServer_defs.h
View File

@@ -60,7 +60,7 @@
#define DEFAULT_DELAY (0) #define DEFAULT_DELAY (0)
#define MAX_TRANSCEIVER_MASK (0xF) #define MAX_TRANSCEIVER_MASK (0xF)
#define MAX_TRANSCEIVER_SAMPLES (0x1FFF) #define MAX_TRANSCEIVER_SAMPLES (0x7FFFFFFF)
#define MAX_ANALOG_SAMPLES (0x3FFF) #define MAX_ANALOG_SAMPLES (0x3FFF)
#define MAX_DIGITAL_SAMPLES (0x3FFF) #define MAX_DIGITAL_SAMPLES (0x3FFF)

5
slsDetectorSoftware/tests/Caller/test-Caller-chiptestboard.cpp
View File

@@ -932,6 +932,11 @@ TEST_CASE("tsamples", "[.cmdcall]") {
caller.call("tsamples", {}, -1, GET, oss); caller.call("tsamples", {}, -1, GET, oss);
REQUIRE(oss.str() == "tsamples 450\n"); REQUIRE(oss.str() == "tsamples 450\n");
} }
if (det_type == defs::XILINX_CHIPTESTBOARD) {
std::ostringstream oss;
caller.call("tsamples", {"2147483647"}, -1, PUT, oss);
REQUIRE(oss.str() == "tsamples 2147483647\n");
}
for (int i = 0; i != det.size(); ++i) { for (int i = 0; i != det.size(); ++i) {
det.setNumberOfTransceiverSamples(prev_val[i], {i}); det.setNumberOfTransceiverSamples(prev_val[i], {i});
} }

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

@@ -7,6 +7,6 @@
#define APIGOTTHARD2 "0.0.0 0x250909" #define APIGOTTHARD2 "0.0.0 0x250909"
#define APIMOENCH "0.0.0 0x250909" #define APIMOENCH "0.0.0 0x250909"
#define APIEIGER "0.0.0 0x250909" #define APIEIGER "0.0.0 0x250909"
#define APIXILINXCTB "0.0.0 0x260106" #define APIXILINXCTB "0.0.0 0x260121"
#define APIJUNGFRAU "0.0.0 0x250909" #define APIJUNGFRAU "0.0.0 0x250909"
#define APIMYTHEN3 "0.0.0 0x250922" #define APIMYTHEN3 "0.0.0 0x250922"