diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer index 8e24690df..278e55601 100755 Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer index d1f09a86e..f313df931 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 1718d3d67..2837bec0e 100755 Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer index 31e8e080e..c307e9bcf 100755 Binary files a/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer and b/slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer differ diff --git a/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h b/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h index 92e1f0bc5..0c644f27b 100644 --- a/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h +++ b/slsDetectorServers/slsDetectorServer/include/programViaBlackfin.h @@ -8,6 +8,8 @@ #include #include +#define BLACKFIN_DEFINED + int defineGPIOpins(char *mess); int FPGAdontTouchFlash(char *mess); int FPGATouchFlash(char *mess); diff --git a/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c b/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c index 9ff356a1e..5ad37fd43 100644 --- a/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programViaBlackfin.c @@ -10,7 +10,6 @@ #include #include // usleep -#define BLACKFIN_DEFINED /* global variables */ // clang-format off #define MAX_TIME_FPGA_TOUCH_FLASH_US (10 * 1000 * 1000) // 10s @@ -275,7 +274,7 @@ int allowUpdate(char *mess, char *functionType) { getKernelVersion(retvals); snprintf(mess, MAX_STR_LENGTH, "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); LOG(logERROR, (mess)); return FAIL; diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index d5e96ca3a..75d9fefba 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -4143,7 +4143,7 @@ int copy_detector_server(int file_des) { LOG(logINFOBLUE, ("Copying server %s from host %s\n", sname, hostname)); char cmd[MAX_STR_LENGTH] = {0}; -#if BLACKFIN_DEFINED +#ifdef BLACKFIN_DEFINED // check update is allowed (Non Amd OR AMD + current kernel) ret = allowUpdate(mess, "copy detector server"); #endif @@ -9610,9 +9610,9 @@ int set_update_mode(int file_des) { return printSocketReadError(); LOG(logDEBUG1, ("Setting update mode to \n", arg)); -#if BLACKFIN_DEFINED +#ifdef BLACKFIN_DEFINED // check update is allowed (Non Amd OR AMD + current kernel) - ret = allowUpdate(mess, "copy detector server"); + ret = allowUpdate(mess, "set/unset update mode"); #endif if (ret == OK) {