From 92f988ddc1257086c3fae3ee58e1dc666a414dae Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 27 Oct 2017 14:00:57 +0200 Subject: [PATCH] somewhere --- .../commonFiles/communication_funcs.c | 4 +++- .../jungfrauDetectorServer/gitInfo.txt | 10 +++++----- .../jungfrauDetectorServer/gitInfoJungfrau.h | 8 ++++---- .../slsDetectorFunctionList.c | 4 ++-- .../slsDetectorServer/slsDetectorServer_funcs.c | 16 ++++++++-------- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/slsDetectorSoftware/commonFiles/communication_funcs.c b/slsDetectorSoftware/commonFiles/communication_funcs.c index e8238731a..31b9bbaf8 100755 --- a/slsDetectorSoftware/commonFiles/communication_funcs.c +++ b/slsDetectorSoftware/commonFiles/communication_funcs.c @@ -536,7 +536,9 @@ int receiveModuleGeneral(int file_des, sls_detector_module* myMod, int receiveA ts+=receiveData(file_des,&(myMod->nadc),sizeof(myMod->nadc),INT32); ts+=receiveData(file_des,&(myMod->reg),sizeof(myMod->reg),INT32); ts+=receiveData(file_des,myMod->dacs,sizeof(myMod->ndac),INT32); - ts+=receiveData(file_des,myMod->adcs,sizeof(myMod->nadc),INT32); + if(receiveAll){ // temporary fix + ts+=receiveData(file_des,myMod->adcs,sizeof(myMod->nadc),INT32); + } /*some detectors dont require sending all trimbits etc.*/ if(receiveAll){ ts+=receiveData(file_des,myMod->chipregs,sizeof(myMod->nchip),INT32); diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index ad8848f56..d904ed28b 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git -Repsitory UUID: c58dfe801770ceb63a9baab0be5b4cd16794b57e -Revision: 89 -Branch: 3.0-rc +Repsitory UUID: 3c1eb747d1930d6d38030a5a607f72d3b58a7a21 +Revision: 90 +Branch: 3.0 Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 1495 -Last Changed Date: 2017-08-15 14:14:32.000000002 +0200 ./RegisterDefs.h +Last Changed Rev: 1549 +Last Changed Date: 2017-10-25 16:48:35.000000002 +0200 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index f3a3310d0..c6c6cf06a 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "c58dfe801770ceb63a9baab0be5b4cd16794b57e" -//#define SVNREV 0x1495 +#define SVNREPUUID "3c1eb747d1930d6d38030a5a607f72d3b58a7a21" +//#define SVNREV 0x1549 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x1495 -#define SVNDATE 0x20170815 +#define SVNREV 0x1549 +#define SVNDATE 0x20171025 // diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c index 872b2e823..f90238996 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -645,7 +645,7 @@ int getModule(sls_detector_module *myMod){ for(i=0;i= 200) { dacvalue = 0x1; val = 200; diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 13ed95699..676ee33a6 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -1720,7 +1720,7 @@ int set_module(int file_des) { int *myChan = NULL; myDac=(int*)malloc(getNumberOfDACsPerModule()*sizeof(int)); - if (myDac == NULL) { + if (getNumberOfDACsPerModule() > 0 && myDac == NULL) { ret = FAIL; sprintf(mess,"could not allocate dacs\n"); cprintf(RED, "Warning: %s", mess); @@ -1728,7 +1728,7 @@ int set_module(int file_des) { else { myModule.dacs=myDac; myAdc=(int*)malloc(getNumberOfADCsPerModule()*sizeof(int)); - if (myAdc == NULL) { + if (getNumberOfADCsPerModule() > 0 && myAdc == NULL) { ret = FAIL; sprintf(mess,"could not allocate adcs\n"); cprintf(RED, "Warning: %s", mess); @@ -1741,7 +1741,7 @@ int set_module(int file_des) { myModule.chanregs=NULL; #else myChip=(int*)malloc(getNumberOfChipsPerModule()*sizeof(int)); - if (myChip == NULL) { + if (getNumberOfChipsPerModule() > 0 && myChip == NULL) { ret = FAIL; sprintf(mess,"could not allocate chips\n"); cprintf(RED, "Warning: %s", mess); @@ -1749,7 +1749,7 @@ int set_module(int file_des) { else { myModule.chipregs=myChip; myChan=(int*)malloc(getNumberOfChannelsPerModule()*sizeof(int)); - if (myChan == NULL) { + if (getNumberOfChannelsPerModule() > 0 && myChan == NULL) { ret = FAIL; sprintf(mess,"could not allocate chans\n"); cprintf(RED, "Warning: %s", mess); @@ -1942,7 +1942,7 @@ int get_module(int file_des) { } else { myDac=(int*)malloc(getNumberOfDACsPerModule()*sizeof(int)); - if (myDac == NULL) { + if (getNumberOfDACsPerModule() > 0 && myDac == NULL) { ret = FAIL; sprintf(mess,"could not allocate dacs\n"); cprintf(RED, "Warning: %s", mess); @@ -1950,7 +1950,7 @@ int get_module(int file_des) { else { myModule.dacs=myDac; myAdc=(int*)malloc(getNumberOfADCsPerModule()*sizeof(int)); - if (myAdc == NULL) { + if (getNumberOfADCsPerModule() > 0 && myAdc == NULL) { ret = FAIL; sprintf(mess,"could not allocate adcs\n"); cprintf(RED, "Warning: %s", mess); @@ -1963,7 +1963,7 @@ int get_module(int file_des) { myModule.chanregs=NULL; #else myChip=(int*)malloc(getNumberOfChipsPerModule()*sizeof(int)); - if (myChip == NULL) { + if (getNumberOfChipsPerModule() > 0 && myChip == NULL) { ret = FAIL; sprintf(mess,"could not allocate chips\n"); cprintf(RED, "Warning: %s", mess); @@ -1971,7 +1971,7 @@ int get_module(int file_des) { else { myModule.chipregs=myChip; myChan=(int*)malloc(getNumberOfChannelsPerModule()*sizeof(int)); - if (myChan == NULL) { + if (getNumberOfChannelsPerModule() > 0 && myChan == NULL) { ret = FAIL; sprintf(mess,"could not allocate chans\n"); cprintf(RED, "Warning: %s", mess);