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

minor chnages

Browse Source
This commit is contained in:
maliakal_d 2019-09-27 16:39:46 +02:00
parent 8a4a6c7004
commit 3d52a2f169
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -63,8 +63,6 @@ void basictests() {
firmware_check_done = 1; firmware_check_done = 1;
return; return;
#else #else
FILE_LOG(logINFOBLUE, ("******** Gotthard2 Server *****************\n"));
if (mapCSP0() == FAIL) { if (mapCSP0() == FAIL) {
strcpy(firmware_message, strcpy(firmware_message,
"Could not map to memory. Dangerous to continue.\n"); "Could not map to memory. Dangerous to continue.\n");
@ -75,8 +73,8 @@ void basictests() {
} }
// does check only if flag is 0 (by default), set by command line // does check only if flag is 0 (by default), set by command line
if ((!debugflag) && ((testFpga() == FAIL))) { if ((!debugflag) && ((testFpga() == FAIL))) {
strcpy(firmware_message, sprintf(firmware_message,
"Could not pass basic tests of FPGA and bus. Dangerous to continue.\n"); "Could not pass basic tests of FPGA and bus. Dangerous to continue. (Firmware version:0x%llx) \n", getDetectorId(DETECTOR_FIRMWARE_VERSION));
FILE_LOG(logERROR, ("%s\n\n", firmware_message)); FILE_LOG(logERROR, ("%s\n\n", firmware_message));
firmware_compatibility = FAIL; firmware_compatibility = FAIL;
firmware_check_done = 1; firmware_check_done = 1;

2
slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#define REQRD_FRMWRE_VRSN (0x190708)//TODO #define REQRD_FRMWRE_VRSN (0x190000)//TODO
#define CTRL_SRVR_INIT_TIME_US (300 * 1000) #define CTRL_SRVR_INIT_TIME_US (300 * 1000)