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

bug fixes for tests

Browse Source
This commit is contained in:
maliakal_d
2019-10-22 15:46:28 +02:00
parent 45012df95b
commit 8006043a97
6 changed files with 111 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -1620,6 +1620,7 @@ int setNetworkParameter(enum NETWORKINDEX mode, int value) {
return ((bus_r(CONFIG_REG) & CONFIG_TDMA_TIMESLOT_MSK) >> CONFIG_TDMA_TIMESLOT_OFST);
case FLOWCTRL_10G:
if (value >= 0) {
if (value == 0) {
FILE_LOG(logINFO, ("Switching off 10G flow control\n"));
bus_w(CONFIG_REG, bus_r(CONFIG_REG) &~ CONFIG_ETHRNT_FLW_CNTRL_MSK);
@ -1627,6 +1628,7 @@ int setNetworkParameter(enum NETWORKINDEX mode, int value) {
FILE_LOG(logINFO, ("Switching on 10G flow control\n"));
bus_w(CONFIG_REG, bus_r(CONFIG_REG) | CONFIG_ETHRNT_FLW_CNTRL_MSK);
}
}
return ((bus_r(CONFIG_REG) & CONFIG_ETHRNT_FLW_CNTRL_MSK) >> CONFIG_ETHRNT_FLW_CNTRL_OFST);
default:

12
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -4729,7 +4729,11 @@ int set_num_interfaces(int file_des) {
#else
// only set
if (Server_VerifyLock() == OK) {
if (check_detector_idle() == OK) {
if (arg < 1 || arg > 2) {
ret = FAIL;
sprintf(mess, "Could not number of interfaces to %d. Options[1, 2]\n", arg);
FILE_LOG(logERROR,(mess));
} else if (check_detector_idle() == OK) {
if (getNumberofUDPInterfaces() != arg) {
setNumberofUDPInterfaces(arg);
calculate_and_set_position(); // aleady configures mac
@ -4774,7 +4778,11 @@ int set_interface_sel(int file_des) {
#else
// only set
if (Server_VerifyLock() == OK) {
if (check_detector_idle() == OK) {
if (arg < 0 || arg > 1) {
ret = FAIL;
sprintf(mess, "Could not set primary interface %d. Options[0, 1]\n", arg);
FILE_LOG(logERROR,(mess));
} else if (check_detector_idle() == OK) {
if (getPrimaryInterface() != arg) {
selectPrimaryInterface(arg);
configure_mac();