detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 11:31:30 +01:00
Code Issues Actions Packages Releases Activity

set slave for m3 virtual

Browse Source
This commit is contained in:
maliakal_d
2022-03-16 12:07:03 +01:00
parent 45171d82a4
commit de9e83fd61
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@@ -720,8 +720,13 @@ void setADIFDefaults() {
int checkCommandLineConfiguration() { int checkCommandLineConfiguration() {
if (masterCommandLine != -1) { if (masterCommandLine != -1) {
#ifdef VIRTUAL #ifdef VIRTUAL
bus_w(SYSTEM_STATUS_REG, if (masterCommandLine == 1) {
bus_r(SYSTEM_STATUS_REG) & ~SYSTEM_STATUS_SLV_BRD_DTCT_MSK); bus_w(SYSTEM_STATUS_REG,
bus_r(SYSTEM_STATUS_REG) & ~SYSTEM_STATUS_SLV_BRD_DTCT_MSK);
} else {
bus_w(SYSTEM_STATUS_REG,
bus_r(SYSTEM_STATUS_REG) | SYSTEM_STATUS_SLV_BRD_DTCT_MSK);
}
#else #else
initError = FAIL; initError = FAIL;
strcpy(initErrorMessage, strcpy(initErrorMessage,

2
slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c
View File

@@ -190,7 +190,7 @@ int main(int argc, char *argv[]) {
case 'i': case 'i':
#if defined(EIGERD) || defined(GOTTHARDD) || defined(GOTTHARD2D) || \ #if defined(EIGERD) || defined(GOTTHARDD) || defined(GOTTHARD2D) || \
defined(JUNGFRAU) defined(JUNGFRAUD)
LOG(logINFO, ("Ignoring config file\n")); LOG(logINFO, ("Ignoring config file\n"));
ignoreConfigFileFlag = 1; ignoreConfigFileFlag = 1;
#else #else