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

minor text fix + macro define in the right place

Browse Source
This commit is contained in:
maliakal_d 2021-11-24 11:32:19 +01:00
parent 81eb0217ad
commit e9caa53af0
7 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h
View File

@ -8,6 +8,8 @@
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#define BLACKFIN_DEFINED
int defineGPIOpins(char *mess); int defineGPIOpins(char *mess);
int FPGAdontTouchFlash(char *mess); int FPGAdontTouchFlash(char *mess);
int FPGATouchFlash(char *mess); int FPGATouchFlash(char *mess);

3
slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c
View File

@ -10,7 +10,6 @@
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#include <unistd.h> // usleep #include <unistd.h> // usleep
#define BLACKFIN_DEFINED
/* global variables */ /* global variables */
// clang-format off // clang-format off
#define MAX_TIME_FPGA_TOUCH_FLASH_US (10 * 1000 * 1000) // 10s #define MAX_TIME_FPGA_TOUCH_FLASH_US (10 * 1000 * 1000) // 10s
@ -275,7 +274,7 @@ int allowUpdate(char *mess, char *functionType) {
getKernelVersion(retvals); getKernelVersion(retvals);
snprintf(mess, MAX_STR_LENGTH, snprintf(mess, MAX_STR_LENGTH,
"Could not update %s. Kernel version %s is too old to " "Could not update %s. Kernel version %s is too old to "
"update the Amd flash. Most likely you will need to resuce this blackfin or get another one. Please contact us.\n", "update the Amd flash/ root directory. Most likely, blackfin needs rescue or replacement. Please contact us.\n",
functionType, retvals); functionType, retvals);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
return FAIL; return FAIL;

6
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -4143,7 +4143,7 @@ int copy_detector_server(int file_des) {
LOG(logINFOBLUE, ("Copying server %s from host %s\n", sname, hostname)); LOG(logINFOBLUE, ("Copying server %s from host %s\n", sname, hostname));
char cmd[MAX_STR_LENGTH] = {0}; char cmd[MAX_STR_LENGTH] = {0};
#if BLACKFIN_DEFINED #ifdef BLACKFIN_DEFINED
// check update is allowed (Non Amd OR AMD + current kernel) // check update is allowed (Non Amd OR AMD + current kernel)
ret = allowUpdate(mess, "copy detector server"); ret = allowUpdate(mess, "copy detector server");
#endif #endif
@ -9610,9 +9610,9 @@ int set_update_mode(int file_des) {
return printSocketReadError(); return printSocketReadError();
LOG(logDEBUG1, ("Setting update mode to \n", arg)); LOG(logDEBUG1, ("Setting update mode to \n", arg));
#if BLACKFIN_DEFINED #ifdef BLACKFIN_DEFINED
// check update is allowed (Non Amd OR AMD + current kernel) // check update is allowed (Non Amd OR AMD + current kernel)
ret = allowUpdate(mess, "copy detector server"); ret = allowUpdate(mess, "set/unset update mode");
#endif #endif
if (ret == OK) { if (ret == OK) {