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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-14 14:29:16 +01:00
parent 5958cf9278 0649626842
commit 65a91c519e
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsReceiverSoftware/src/UDPStandardImplementation.cpp
View File

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

2
slsReceiverSoftware/src/main.cpp
View File

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

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -348,7 +348,7 @@ int slsReceiverTCPIPInterface::function_table(){
int slsReceiverTCPIPInterface::decode_function(){
ret = FAIL;
#ifdef VERYVERBOSE
cprintf(DARKGRAY,"\n");
cprintf(RESET,"\n");
FILE_LOG(logDEBUG1) << "waiting to receive data";
#endif
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()) {
sstr >> sargname;
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{
cprintf(RED, "could not decode port in config file. Exiting.\n");
success = slsReceiverDefs::FAIL;