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/bin/jungfrauDetectorServerv3.0.0.6 b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6 deleted file mode 100755 index 34021f5b7..000000000 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6 and /dev/null differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.1 b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.1 new file mode 100755 index 000000000..7e20b991a Binary files /dev/null and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.1 differ 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 cd96a92b7..653c1d785 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -1721,7 +1721,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); @@ -1729,7 +1729,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); @@ -1742,7 +1742,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); @@ -1750,7 +1750,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); @@ -1943,7 +1943,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); @@ -1951,7 +1951,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); @@ -1964,7 +1964,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); @@ -1972,7 +1972,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);