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

renamed is_configurable to is_udp_configured

Browse Source
This commit is contained in:
maliakal_d
2020-08-05 09:37:58 +02:00
parent 6e67ff9f90
commit 79f010a438
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h
View File

@ -151,7 +151,7 @@ int get_read_n_lines(int);
void calculate_and_set_position(); void calculate_and_set_position();
int set_detector_position(int); int set_detector_position(int);
int check_detector_idle(); int check_detector_idle();
int is_configurable(); int is_udp_configured();
void configure_mac(); void configure_mac();
int set_source_udp_ip(int); int set_source_udp_ip(int);
int get_source_udp_ip(int); int get_source_udp_ip(int);

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

@ -4866,7 +4866,7 @@ int check_detector_idle() {
return ret; return ret;
} }
int is_configurable() { int is_udp_configured() {
if (udpDetails.dstip == 0) { if (udpDetails.dstip == 0) {
strcpy(configureMessage, "udp destination ip not configured\n"); strcpy(configureMessage, "udp destination ip not configured\n");
LOG(logWARNING, ("%s", configureMessage)); LOG(logWARNING, ("%s", configureMessage));
@ -4915,7 +4915,7 @@ int is_configurable() {
} }
void configure_mac() { void configure_mac() {
if (is_configurable() == OK) { if (is_udp_configured() == OK) {
ret = configureMAC(); ret = configureMAC();
if (ret != OK) { if (ret != OK) {
#if defined(CHIPTESTBOARDD) || defined(MOENCHD) #if defined(CHIPTESTBOARDD) || defined(MOENCHD)
@ -7393,7 +7393,7 @@ int set_veto(int file_des) {
setVeto(arg); setVeto(arg);
// if numinterfaces is 2 and veto is 1 now, then configuremac // if numinterfaces is 2 and veto is 1 now, then configuremac
if (arg > 0 && getNumberofUDPInterfaces() == 2 && if (arg > 0 && getNumberofUDPInterfaces() == 2 &&
is_configurable() == OK) { is_udp_configured() == OK) {
ret = configureMAC(); ret = configureMAC();
if (ret != OK) { if (ret != OK) {
sprintf(mess, "Configure Mac failed after enabling veto\n"); sprintf(mess, "Configure Mac failed after enabling veto\n");