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

Merge branch '3.0' into 3.0.1

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-10-27 15:47:15 +02:00
commit 1420921291
7 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/commonFiles/communication_funcs.c
View File

@ -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);

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv3.0.0.6.1 Executable file
View File

Binary file not shown.

10
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -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

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -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
//

4
slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -645,7 +645,7 @@ int getModule(sls_detector_module *myMod){
for(i=0;i<NDAC;i++)
setDAC((enum DACINDEX)i,-1,-1,0,retval);
//copy to local copy as well
//copy from local copy
if (detectorModules)
copyModule(myMod,detectorModules);
else
@ -870,7 +870,7 @@ int setHighVoltage(int val){
// limit values
if (val < 60) {
dacvalue = 0;
val = 60;
val = 0;
} else if (val >= 200) {
dacvalue = 0x1;
val = 200;

16
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -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);