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

updated ctb and moench, moench not tested

Browse Source
This commit is contained in:
maliakal_d
2019-03-05 09:38:10 +01:00
parent 08bd2378f4
commit c56561bc9f
17 changed files with 433 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -142,7 +142,7 @@ int checkType() {
return OK;
}
u_int32_t testFpga(void) {
int testFpga() {
#ifdef VIRTUAL
return OK;
#endif
@ -950,6 +950,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
val = (val / (1E-3 * CLK_FREQ)) + 0.5; // convert back to timer
if (val != retval)
return FAIL;
break;
case DELAY_AFTER_TRIGGER:
if (masterflags == IS_MASTER) {
val += masterdefaultdelay;
@ -961,6 +962,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval) {
}
if (val != retval)
return FAIL;
break;
default:
break;
}