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

format

Browse Source
This commit is contained in:
maliakal_d
2024-09-26 15:39:49 +02:00
parent 492b4815a6
commit 007330caa7
9 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorServers/slsDetectorServer/src/programViaArm.c
View File

@ -206,13 +206,11 @@ int createSymbolicLinksForDevices(int adcDeviceIndex, int dacDeviceIndex,
// delete andcreate iio device links folder (deleting because cannot
// overwrite symbolic links with -sf)
if (deleteAbsoluteDirectory(mess, IIO_DEVICE_FOLDER,
"create sym links for device trees") ==
FAIL) {
"create sym links for device trees") == FAIL) {
return FAIL;
}
if (createAbsoluteDirectory(mess, IIO_DEVICE_FOLDER,
"create sym links for device trees") ==
FAIL) {
"create sym links for device trees") == FAIL) {
return FAIL;
}
@ -243,8 +241,7 @@ int createSymbolicLinksForDevices(int adcDeviceIndex, int dacDeviceIndex,
memset(retvals, 0, MAX_STR_LENGTH);
if (executeCommand(cmd, retvals, logDEBUG1) == FAIL) {
snprintf(mess, MAX_STR_LENGTH,
"Could not create sym link [dac%d] (%s)\n", idac,
retvals);
"Could not create sym link [dac%d] (%s)\n", idac, retvals);
LOG(logERROR, (mess));
return FAIL;
}

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

@ -8470,7 +8470,8 @@ int start_readout(int file_des) {
#else
if (Server_VerifyLock() == OK) {
enum runStatus s = getRunStatus();
if ((s == RUNNING || s == WAITING) && (myDetectorType != XILINX_CHIPTESTBOARD)) {
if ((s == RUNNING || s == WAITING) &&
(myDetectorType != XILINX_CHIPTESTBOARD)) {
ret = FAIL;
strcpy(mess, "Could not start readout because the detector is "
"already running!\n");

5
slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -567,7 +567,8 @@ int powerChip(int on, char *mess) {
LOG(logERROR, (mess));
// to be removed when fixed later
LOG(logWARNING, ("Bypassing this error for now. To be fixed later...\n"));
LOG(logWARNING,
("Bypassing this error for now. To be fixed later...\n"));
return OK;
return FAIL;
@ -1334,7 +1335,7 @@ int startStateMachine() {
#endif
LOG(logINFOBLUE, ("Starting State Machine\n"));
//cleanFifos(); removing this for now as its done before readout pattern
// cleanFifos(); removing this for now as its done before readout pattern
// start state machine
bus_w(FLOW_CONTROL_REG, bus_r(FLOW_CONTROL_REG) | START_F_MSK);