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

setmoduleid removed, moduleId changed to moduleIndex in client to minimize confusion

Browse Source
This commit is contained in:
maliakal_d
2021-09-09 11:17:24 +02:00
parent 49e40ae8f2
commit c8ea0c8ede
23 changed files with 69 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -500,7 +500,7 @@ typedef struct {
struct rxParameters {
detectorType detType{GENERIC};
xy numberOfDetector;
int moduleId{0};
int moduleIndex{0};
char hostname[MAX_STR_LENGTH];
int udpInterfaces{1};
int udp_dstport{0};

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

@ -244,7 +244,6 @@ enum detFuncs {
F_SET_DBIT_PIPELINE,
F_GET_DBIT_PIPELINE,
F_GET_MODULE_ID,
F_SET_MODULE_ID,
F_GET_DEST_UDP_LIST,
F_SET_DEST_UDP_LIST,
F_GET_NUM_DEST_UDP,
@ -602,7 +601,6 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
case F_SET_DBIT_PIPELINE: return "F_SET_DBIT_PIPELINE";
case F_GET_DBIT_PIPELINE: return "F_GET_DBIT_PIPELINE";
case F_GET_MODULE_ID: return "F_GET_MODULE_ID";
case F_SET_MODULE_ID: return "F_SET_MODULE_ID";
case F_GET_DEST_UDP_LIST: return "F_GET_DEST_UDP_LIST";
case F_SET_DEST_UDP_LIST: return "F_SET_DEST_UDP_LIST";
case F_GET_NUM_DEST_UDP: return "F_GET_NUM_DEST_UDP";

2
slsSupportLib/src/ToString.cpp
View File

@ -28,7 +28,7 @@ std::string ToString(const slsDetectorDefs::rxParameters &r) {
oss << '[' << "detType:" << r.detType << std::endl
<< "numberOfDetector.x:" << r.numberOfDetector.x << std::endl
<< "numberOfDetector.y:" << r.numberOfDetector.y << std::endl
<< "moduleId:" << r.moduleId << std::endl
<< "moduleIndex:" << r.moduleIndex << std::endl
<< "hostname:" << r.hostname << std::endl
<< "udpInterfaces:" << r.udpInterfaces << std::endl
<< "udp_dstport:" << r.udp_dstport << std::endl