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

Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer

Browse Source
This commit is contained in:
bergamaschi 2017-12-14 16:59:04 +01:00
commit 9f3468bd15
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manual/manual-api/mainReceiver.cpp
View File

@ -53,7 +53,7 @@ void sigInterruptHandler(int p){
* prints usage of this example program * prints usage of this example program
*/ */
void printHelp() { void printHelp() {
cprintf(DARKGRAY, "Usage:\n" cprintf(RESET, "Usage:\n"
"./detReceiver [start_tcp_port] [num_receivers] [1 for call back, 0 for none]\n\n"); "./detReceiver [start_tcp_port] [num_receivers] [1 for call back, 0 for none]\n\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -141,9 +141,9 @@ int main(int argc, char *argv[]) {
if ( (argc != 4) || (!sscanf(argv[1],"%d", &startTCPPort)) || (!sscanf(argv[2],"%d", &numReceivers)) || (!sscanf(argv[3],"%d", &withCallback)) ) if ( (argc != 4) || (!sscanf(argv[1],"%d", &startTCPPort)) || (!sscanf(argv[2],"%d", &numReceivers)) || (!sscanf(argv[3],"%d", &withCallback)) )
printHelp(); printHelp();
cprintf(BLUE,"Parent Process Created [ Tid: %ld ]\n", (long)syscall(SYS_gettid)); cprintf(BLUE,"Parent Process Created [ Tid: %ld ]\n", (long)syscall(SYS_gettid));
cprintf(DARKGRAY, "Number of Receivers: %d\n", numReceivers); cprintf(RESET, "Number of Receivers: %d\n", numReceivers);
cprintf(DARKGRAY, "Start TCP Port: %d\n", startTCPPort); cprintf(RESET, "Start TCP Port: %d\n", startTCPPort);
cprintf(DARKGRAY, "Callback Enable: %d\n", withCallback); cprintf(RESET, "Callback Enable: %d\n", withCallback);
@ -243,7 +243,7 @@ int main(int argc, char *argv[]) {
/** - Print Ready and Instructions how to exit */ /** - Print Ready and Instructions how to exit */
cout << "Ready ... " << endl; cout << "Ready ... " << endl;
cprintf(DARKGRAY, "\n[ Press \'Ctrl+c\' to exit ]\n"); cprintf(RESET, "\n[ Press \'Ctrl+c\' to exit ]\n");
/** - Parent process waits for all child processes to exit */ /** - Parent process waits for all child processes to exit */
for(;;) { for(;;) {

2
slsReceiverSoftware/include/logger.h
View File

@ -210,7 +210,7 @@ inline void Output2FILE::Output(const std::string& msg, TLogLevel level)
switch(level){ switch(level){
case logERROR: cprintf(RED BOLD,"%s",msg.c_str()); break; case logERROR: cprintf(RED BOLD,"%s",msg.c_str()); break;
case logWARNING: cprintf(YELLOW BOLD,"%s",msg.c_str()); break; case logWARNING: cprintf(YELLOW BOLD,"%s",msg.c_str()); break;
case logINFO: cprintf(DARKGRAY,"%s",msg.c_str()); break; case logINFO: cprintf(RESET,"%s",msg.c_str()); break;
default: fprintf(pStream,"%s",msg.c_str()); out = false; break; default: fprintf(pStream,"%s",msg.c_str()); out = false; break;
} }
fflush(out ? stdout : pStream); fflush(out ? stdout : pStream);

2
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

@ -422,7 +422,7 @@ void UDPStandardImplementation::resetAcquisitionCount() {
int UDPStandardImplementation::startReceiver(char *c) { int UDPStandardImplementation::startReceiver(char *c) {
cprintf(DARKGRAY,"\n"); cprintf(RESET,"\n");
FILE_LOG(logINFO) << "Starting Receiver"; FILE_LOG(logINFO) << "Starting Receiver";
ResetParametersforNewMeasurement(); ResetParametersforNewMeasurement();

2
slsReceiverSoftware/src/main.cpp
View File

@ -141,7 +141,7 @@ int main(int argc, char *argv[]) {
} }
FILE_LOG(logINFO) << "Ready ... "; FILE_LOG(logINFO) << "Ready ... ";
cprintf(DARKGRAY, "\n[ Press \'Ctrl+c\' to exit ]\n"); cprintf(RESET, "\n[ Press \'Ctrl+c\' to exit ]\n");
while(keeprunning) while(keeprunning)
pause(); pause();

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -348,7 +348,7 @@ int slsReceiverTCPIPInterface::function_table(){
int slsReceiverTCPIPInterface::decode_function(){ int slsReceiverTCPIPInterface::decode_function(){
ret = FAIL; ret = FAIL;
#ifdef VERYVERBOSE #ifdef VERYVERBOSE
cprintf(DARKGRAY,"\n"); cprintf(RESET,"\n");
FILE_LOG(logDEBUG1) << "waiting to receive data"; FILE_LOG(logDEBUG1) << "waiting to receive data";
#endif #endif
int n = mySock->ReceiveDataOnly(&fnum,sizeof(fnum)); int n = mySock->ReceiveDataOnly(&fnum,sizeof(fnum));

2
slsReceiverSoftware/src/utilities.cpp
View File

@ -54,7 +54,7 @@ int read_config_file(string fname, int *tcpip_port_no, map<string, string> * con
if(sstr.good()) { if(sstr.good()) {
sstr >> sargname; sstr >> sargname;
if(sscanf(sargname.c_str(),"%d",tcpip_port_no)) if(sscanf(sargname.c_str(),"%d",tcpip_port_no))
cprintf(DARKGRAY, "dataport: %d\n" , *tcpip_port_no); cprintf(RESET, "dataport: %d\n" , *tcpip_port_no);
else{ else{
cprintf(RED, "could not decode port in config file. Exiting.\n"); cprintf(RED, "could not decode port in config file. Exiting.\n");
success = slsReceiverDefs::FAIL; success = slsReceiverDefs::FAIL;