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

formatting

Browse Source
This commit is contained in:
maliakal_d 2023-03-17 14:42:11 +01:00
parent d23722a4b7
commit fc24558314
5 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -133,8 +133,8 @@ void basictests() {
"Software Version : %s\n" "Software Version : %s\n"
"********************************************************\n", "********************************************************\n",
(unsigned int)ipadd, (long long unsigned int)macadd, (unsigned int)ipadd, (long long unsigned int)macadd,
(long long int)fwversion, (long long int)fwversion, (long long int)sw_fw_apiversion,
(long long int)sw_fw_apiversion, REQUIRED_FIRMWARE_VERSION, swversion)); REQUIRED_FIRMWARE_VERSION, swversion));
// update default udpdstip and udpdstmac (1g is hardware ip and hardware // update default udpdstip and udpdstmac (1g is hardware ip and hardware
// mac) // mac)
@ -425,7 +425,8 @@ void initControlServer() {
// ensure febl, febr and beb fw versions are the same // ensure febl, febr and beb fw versions are the same
if (fwversion != feblfwversion || fwversion != febrfwversion) { if (fwversion != feblfwversion || fwversion != febrfwversion) {
sprintf(initErrorMessage, sprintf(
initErrorMessage,
"Inconsistent firmware versions in feb and beb. [Beb: %lld, " "Inconsistent firmware versions in feb and beb. [Beb: %lld, "
"Febl: %lld Febr: %lld]\n", "Febl: %lld Febr: %lld]\n",
(long long int)fwversion, (long long int)feblfwversion, (long long int)fwversion, (long long int)feblfwversion,

9
slsReceiverSoftware/src/Arping.cpp
View File

@ -5,9 +5,9 @@
#include <chrono> #include <chrono>
#include <signal.h> #include <signal.h>
#include <sys/wait.h>
#include <thread> #include <thread>
#include <unistd.h> #include <unistd.h>
#include<sys/wait.h>
namespace sls { namespace sls {
@ -17,9 +17,7 @@ namespace sls {
#define gettid() syscall(SYS_gettid) #define gettid() syscall(SYS_gettid)
#endif #endif
void func(int signum) { void func(int signum) { wait(NULL); }
wait(NULL);
}
Arping::Arping() {} Arping::Arping() {}
@ -122,7 +120,8 @@ std::string Arping::ExecuteCommands() {
FILE *sysFile = popen(cmd.c_str(), "r"); FILE *sysFile = popen(cmd.c_str(), "r");
if (sysFile == NULL) { if (sysFile == NULL) {
std::ostringstream os; std::ostringstream os;
os << "Could not Arping (" << cmd << " ) : Popen fail (" << strerror(errno) << ')'; os << "Could not Arping (" << cmd << " ) : Popen fail ("
<< strerror(errno) << ')';
return os.str(); return os.str();
} }