detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity

rxr bug fix: update shm when updating rxr

Browse Source
This commit is contained in:
maliakal_d 2019-11-27 11:12:31 +01:00
parent 4fe1a2c6df
commit 9e8a874e39
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -2112,6 +2112,7 @@ void slsDetector::setReceiverStreamingIP(const sls::IpAddr ip) {
FILE_LOG(logDEBUG1) FILE_LOG(logDEBUG1)
<< "Sending receiver streaming IP to receiver: " << ip; << "Sending receiver streaming IP to receiver: " << ip;
sendToReceiver(F_RECEIVER_STREAMING_SRC_IP, ip, nullptr); sendToReceiver(F_RECEIVER_STREAMING_SRC_IP, ip, nullptr);
shm()->rxZmqip = ip;
} else { } else {
shm()->rxZmqip = ip; shm()->rxZmqip = ip;
} }
@ -2671,6 +2672,7 @@ void slsDetector::setReceiverDbitList(std::vector<int> list) {
sls::FixedCapacityContainer<int, MAX_RX_DBIT> arg = list; sls::FixedCapacityContainer<int, MAX_RX_DBIT> arg = list;
if (shm()->useReceiverFlag) { if (shm()->useReceiverFlag) {
sendToReceiver(F_SET_RECEIVER_DBIT_LIST, arg, nullptr); sendToReceiver(F_SET_RECEIVER_DBIT_LIST, arg, nullptr);
shm()->rxDbitList = list;
} else { } else {
shm()->rxDbitList = list; shm()->rxDbitList = list;
} }
@ -2693,6 +2695,7 @@ int slsDetector::setReceiverDbitOffset(int value) {
if (shm()->useReceiverFlag) { if (shm()->useReceiverFlag) {
sendToReceiver(F_RECEIVER_DBIT_OFFSET, value, retval); sendToReceiver(F_RECEIVER_DBIT_OFFSET, value, retval);
FILE_LOG(logDEBUG1) << "Receiver digital bit offset: " << retval; FILE_LOG(logDEBUG1) << "Receiver digital bit offset: " << retval;
shm()->rxDbitOffset = value;
} else { } else {
shm()->rxDbitOffset = value; shm()->rxDbitOffset = value;
} }

2
slsSupportLib/include/versionAPI.h
View File

@ -7,6 +7,6 @@
#define APIGOTTHARD 0x191111 #define APIGOTTHARD 0x191111
#define APIJUNGFRAU 0x191111 #define APIJUNGFRAU 0x191111
#define APIEIGER 0x191111 #define APIEIGER 0x191111
#define APICTB 0x191121 #define APICTB 0x191126
#define APIMYTHEN3 0x191125 #define APIMYTHEN3 0x191125
#define APIGOTTHARD2 0x191125 #define APIGOTTHARD2 0x191125