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

Merge branch 'developer' into static

Browse Source
This commit is contained in:
maliakal_d 2020-04-29 14:20:12 +02:00
commit 395d7ba98a
6 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer
View File

Binary file not shown.

24
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -514,6 +514,30 @@ int readConfigFile() {
continue; continue;
} }
// removing leading spaces
if (line[0] == ' ' || line[0] == '\t') {
int len = strlen(line);
// find first valid character
int i = 0;
for (i = 0; i < len; ++i) {
if (line[i] != ' ' && line[i] != '\t') {
break;
}
}
// ignore the line full of spaces (last char \n)
if (i >= len - 1) {
LOG(logDEBUG1, ("Ignoring line full of spaces\n"));
continue;
}
// copying only valid char
char temp[LZ];
memset(temp, 0, LZ);
memcpy(temp, line + i, strlen(line) - i);
memset(line, 0, LZ);
memcpy(line, temp, strlen(temp));
LOG(logDEBUG1, ("Removing leading spaces.\n"));
}
LOG(logDEBUG1, ("Command to process: (size:%d) %.*s\n", strlen(line), strlen(line) -1, line)); LOG(logDEBUG1, ("Command to process: (size:%d) %.*s\n", strlen(line), strlen(line) -1, line));
memset(command, 0, LZ); memset(command, 0, LZ);

6
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -44,11 +44,11 @@
#define DEFAULT_CURRENT_SOURCE (0) #define DEFAULT_CURRENT_SOURCE (0)
#define DEFAULT_TIMING_SOURCE (TIMING_INTERNAL) #define DEFAULT_TIMING_SOURCE (TIMING_INTERNAL)
#define DEFAULT_READOUT_C0 (6)//(144444448) // rdo_clk, 144 MHz #define DEFAULT_READOUT_C0 (8)//(108333336) // rdo_clk, 108 MHz
#define DEFAULT_READOUT_C1 (6)//(144444448) // rdo_x2_clk, 144 MHz #define DEFAULT_READOUT_C1 (8)//(108333336) // rdo_x2_clk, 108 MHz
#define DEFAULT_SYSTEM_C0 (5)//(144444448) // run_clk, 144 MHz #define DEFAULT_SYSTEM_C0 (5)//(144444448) // run_clk, 144 MHz
#define DEFAULT_SYSTEM_C1 (10)//(72222224) // chip_clk, 72 MHz #define DEFAULT_SYSTEM_C1 (10)//(72222224) // chip_clk, 72 MHz
#define DEFAULT_SYSTEM_C2 (40)//(18055556) // sync_clk, 18 MHz #define DEFAULT_SYSTEM_C2 (5)//(144444448) // sync_clk, 144 MHz
#define DEFAULT_SYSTEM_C3 (5)//(144444448) // str_clk, 144 MHz #define DEFAULT_SYSTEM_C3 (5)//(144444448) // str_clk, 144 MHz
/* Firmware Definitions */ /* Firmware Definitions */

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

24
slsDetectorServers/slsDetectorServer/src/readDefaultPattern.c
View File

@ -53,6 +53,30 @@ int loadDefaultPattern(char* fname) {
continue; continue;
} }
// removing leading spaces
if (line[0] == ' ' || line[0] == '\t') {
int len = strlen(line);
// find first valid character
int i = 0;
for (i = 0; i < len; ++i) {
if (line[i] != ' ' && line[i] != '\t') {
break;
}
}
// ignore the line full of spaces (last char \n)
if (i >= len - 1) {
LOG(logDEBUG1, ("Ignoring line full of spaces\n"));
continue;
}
// copying only valid char
char temp[LZ];
memset(temp, 0, LZ);
memcpy(temp, line + i, strlen(line) - i);
memset(line, 0, LZ);
memcpy(line, temp, strlen(temp));
LOG(logDEBUG1, ("Removing leading spaces.\n"));
}
LOG(logDEBUG1, ("Command to process: (size:%d) %.*s\n", LOG(logDEBUG1, ("Command to process: (size:%d) %.*s\n",
strlen(line), strlen(line) -1, line)); strlen(line), strlen(line) -1, line));
memset(command, 0, LZ); memset(command, 0, LZ);

5
slsSupportLib/include/versionAPI.h
View File

@ -7,6 +7,7 @@
#define APICTB 0x200409 #define APICTB 0x200409
#define APIGOTTHARD 0x200409 #define APIGOTTHARD 0x200409
#define APIJUNGFRAU 0x200409 #define APIJUNGFRAU 0x200409
#define APIMOENCH 0x200409
#define APIMYTHEN3 0x200428 #define APIMYTHEN3 0x200428
#define APIGOTTHARD2 0x200428 #define APIGOTTHARD2 0x200429
#define APIMOENCH 0x200429