diff --git a/serverBin/ctbDetectorServerv7.0.0.rc1 b/serverBin/ctbDetectorServerv7.0.0.rc1 deleted file mode 120000 index 27cc0386e..000000000 --- a/serverBin/ctbDetectorServerv7.0.0.rc1 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc1 \ No newline at end of file diff --git a/serverBin/ctbDetectorServerv7.0.0.rc3 b/serverBin/ctbDetectorServerv7.0.0.rc3 new file mode 120000 index 000000000..186469963 --- /dev/null +++ b/serverBin/ctbDetectorServerv7.0.0.rc3 @@ -0,0 +1 @@ +../slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/eigerDetectorServerv7.0.0.rc1 b/serverBin/eigerDetectorServerv7.0.0.rc1 deleted file mode 120000 index ebf68e1a6..000000000 --- a/serverBin/eigerDetectorServerv7.0.0.rc1 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc1 \ No newline at end of file diff --git a/serverBin/eigerDetectorServerv7.0.0.rc3 b/serverBin/eigerDetectorServerv7.0.0.rc3 new file mode 120000 index 000000000..10bc1edb5 --- /dev/null +++ b/serverBin/eigerDetectorServerv7.0.0.rc3 @@ -0,0 +1 @@ +../slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/gotthard2DetectorServerv7.0.0.rc1 b/serverBin/gotthard2DetectorServerv7.0.0.rc1 deleted file mode 120000 index 70586c622..000000000 --- a/serverBin/gotthard2DetectorServerv7.0.0.rc1 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc1 \ No newline at end of file diff --git a/serverBin/gotthard2DetectorServerv7.0.0.rc3 b/serverBin/gotthard2DetectorServerv7.0.0.rc3 new file mode 120000 index 000000000..854499aee --- /dev/null +++ b/serverBin/gotthard2DetectorServerv7.0.0.rc3 @@ -0,0 +1 @@ +../slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv7.0.0.rc2 b/serverBin/gotthardDetectorServerv7.0.0.rc2 deleted file mode 120000 index 7a76806a7..000000000 --- a/serverBin/gotthardDetectorServerv7.0.0.rc2 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv7.0.0.rc3 b/serverBin/gotthardDetectorServerv7.0.0.rc3 new file mode 120000 index 000000000..fbcd346c1 --- /dev/null +++ b/serverBin/gotthardDetectorServerv7.0.0.rc3 @@ -0,0 +1 @@ +../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv7.0.0.rc1 b/serverBin/jungfrauDetectorServerv7.0.0.rc1 deleted file mode 120000 index f175efca2..000000000 --- a/serverBin/jungfrauDetectorServerv7.0.0.rc1 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc1 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv7.0.0.rc3 b/serverBin/jungfrauDetectorServerv7.0.0.rc3 new file mode 120000 index 000000000..8b498d2ca --- /dev/null +++ b/serverBin/jungfrauDetectorServerv7.0.0.rc3 @@ -0,0 +1 @@ +../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/serverBin/moenchDetectorServerv7.0.0.rc1 b/serverBin/moenchDetectorServerv7.0.0.rc1 deleted file mode 120000 index 3f0d37ec4..000000000 --- a/serverBin/moenchDetectorServerv7.0.0.rc1 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc1 \ No newline at end of file diff --git a/serverBin/moenchDetectorServerv7.0.0.rc3 b/serverBin/moenchDetectorServerv7.0.0.rc3 new file mode 120000 index 000000000..c12af9534 --- /dev/null +++ b/serverBin/moenchDetectorServerv7.0.0.rc3 @@ -0,0 +1 @@ +../slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3 \ No newline at end of file diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc1 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc1 deleted file mode 100755 index d45f830b1..000000000 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc1 and /dev/null differ diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3 b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3 new file mode 100755 index 000000000..87704a945 Binary files /dev/null and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServerv7.0.0.rc3 differ diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc1 b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc3 similarity index 50% rename from slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc1 rename to slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc3 index 148a5c0b6..ffc126668 100755 Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc1 and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServerv7.0.0.rc3 differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc1 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc1 deleted file mode 100755 index d1ce93fe2..000000000 Binary files a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc1 and /dev/null differ diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 new file mode 100755 index 000000000..683cbd643 Binary files /dev/null and b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServerv7.0.0.rc3 differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2 deleted file mode 100755 index 673699daa..000000000 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2 and /dev/null differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 new file mode 100755 index 000000000..99396d4ec Binary files /dev/null and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc3 differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc1 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc1 deleted file mode 100755 index c00185e30..000000000 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc1 and /dev/null differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc3 b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc3 new file mode 100755 index 000000000..ee8303d35 Binary files /dev/null and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv7.0.0.rc3 differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc1 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc1 deleted file mode 100755 index b44ac029b..000000000 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc1 and /dev/null differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3 b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3 new file mode 100755 index 000000000..f33535177 Binary files /dev/null and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServerv7.0.0.rc3 differ diff --git a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 index 7e5ee8463..c7a5ee2f0 100755 Binary files a/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 and b/slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServerv7.0.0.rc3 differ diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 7f5c0b2e5..948a2e950 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -1916,55 +1916,57 @@ int acquire(int blocking, int file_des) { #ifdef EIGERD // check for hardware mac and hardware ip if (udpDetails[0].srcmac != getDetectorMAC()) { - ret = FAIL; - uint64_t sourcemac = getDetectorMAC(); - char src_mac[MAC_ADDRESS_SIZE]; - getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac); - sprintf(mess, + ret = FAIL; + uint64_t sourcemac = getDetectorMAC(); + char src_mac[MAC_ADDRESS_SIZE]; + getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac); + sprintf( + mess, "Invalid udp source mac address for this detector. Must be " "same as hardware detector mac address %s\n", src_mac); - LOG(logERROR, (mess)); - } else if (!enableTenGigabitEthernet(GET_FLAG) && - (udpDetails[0].srcip != getDetectorIP())) { - ret = FAIL; - uint32_t sourceip = getDetectorIP(); - char src_ip[INET_ADDRSTRLEN]; - getIpAddressinString(src_ip, sourceip); - sprintf(mess, + LOG(logERROR, (mess)); + } else if (!enableTenGigabitEthernet(GET_FLAG) && + (udpDetails[0].srcip != getDetectorIP())) { + ret = FAIL; + uint32_t sourceip = getDetectorIP(); + char src_ip[INET_ADDRSTRLEN]; + getIpAddressinString(src_ip, sourceip); + sprintf( + mess, "Invalid udp source ip address for this detector. Must be " "same as hardware detector ip address %s in 1G readout " "mode \n", src_ip); - LOG(logERROR, (mess)); - } else + LOG(logERROR, (mess)); + } else #endif - if (configured == FAIL) { - ret = FAIL; - strcpy(mess, "Could not start acquisition because "); - strcat(mess, configureMessage); - LOG(logERROR, (mess)); - } else if (sharedMemory_getScanStatus() == RUNNING) { - ret = FAIL; - strcpy(mess, "Could not start acquisition because a scan is " - "already running!\n"); - LOG(logERROR, (mess)); - } else { - memset(scanErrMessage, 0, MAX_STR_LENGTH); - sharedMemory_setScanStop(0); - sharedMemory_setScanStatus(IDLE); // if it was error - if (pthread_create(&pthread_tid, NULL, &start_state_machine, - &blocking)) { + if (configured == FAIL) { ret = FAIL; - strcpy(mess, "Could not start acquisition thread!\n"); + strcpy(mess, "Could not start acquisition because "); + strcat(mess, configureMessage); + LOG(logERROR, (mess)); + } else if (sharedMemory_getScanStatus() == RUNNING) { + ret = FAIL; + strcpy(mess, "Could not start acquisition because a scan is " + "already running!\n"); LOG(logERROR, (mess)); } else { - // only does not wait for non blocking and scan - if (blocking || !scan) { - pthread_join(pthread_tid, NULL); + memset(scanErrMessage, 0, MAX_STR_LENGTH); + sharedMemory_setScanStop(0); + sharedMemory_setScanStatus(IDLE); // if it was error + if (pthread_create(&pthread_tid, NULL, &start_state_machine, + &blocking)) { + ret = FAIL; + strcpy(mess, "Could not start acquisition thread!\n"); + LOG(logERROR, (mess)); + } else { + // only does not wait for non blocking and scan + if (blocking || !scan) { + pthread_join(pthread_tid, NULL); + } } } - } } return Server_SendResult(file_des, INT32, NULL, 0); } @@ -5139,11 +5141,20 @@ int set_source_udp_mac(int file_des) { if (Server_VerifyLock() == OK) { if (check_detector_idle("configure mac") == OK) { if (udpDetails[0].srcmac != arg) { - for (int iRxEntry = 0; iRxEntry != MAX_UDP_DESTINATION; - ++iRxEntry) { - udpDetails[iRxEntry].srcmac = arg; + // multicast (LSB of first octet = 1) + if ((arg >> 40) & 0x1) { + ret = FAIL; + sprintf(mess, + "Cannot set source mac address. Must be a unicast " + "address (LSB of first octet should be 0)."); + LOG(logERROR, (mess)); + } else { + for (int iRxEntry = 0; iRxEntry != MAX_UDP_DESTINATION; + ++iRxEntry) { + udpDetails[iRxEntry].srcmac = arg; + } + configure_mac(); } - configure_mac(); } } } diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index dd1e2046c..d69dd1bea 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,11 +4,10 @@ #define RELEASE "7.0.0.rc1" #define APILIB "7.0.0.rc1 0x221208" #define APIRECEIVER "7.0.0.rc1 0x221208" -#define APICTB "7.0.0.rc1 0x221212" -#define APIGOTTHARD2 "7.0.0.rc1 0x221212" -#define APIJUNGFRAU "7.0.0.rc1 0x221212" -#define APIMOENCH "7.0.0.rc1 0x221212" -#define APIEIGER "7.0.0.rc1 0x221212" -#define APIGOTTHARD "7.0.0.rc2 0x221220" - -#define APIMYTHEN3 "7.0.0.rc3 0x230130" +#define APICTB "7.0.0.rc3 0x230130" +#define APIGOTTHARD "7.0.0.rc3 0x230130" +#define APIGOTTHARD2 "7.0.0.rc3 0x230130" +#define APIJUNGFRAU "7.0.0.rc3 0x230130" +#define APIMYTHEN3 "7.0.0.rc3 0x230130" +#define APIMOENCH "7.0.0.rc3 0x230130" +#define APIEIGER "7.0.0.rc3 0x230130"