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

moving digital test bit in configuremac function to the digital test function

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@125 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-02-20 13:46:41 +00:00
parent 92a61d1441
commit 7ed37b2e3f
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
View File

@ -61,6 +61,8 @@ u_int32_t testFifos(void);
u_int32_t testFpga(void); u_int32_t testFpga(void);
u_int32_t testRAM(void); u_int32_t testRAM(void);
int testBus(void); int testBus(void);
int setDigitalTestBit(int ival);
int64_t set64BitReg(int64_t value, int aLSB, int aMSB); int64_t set64BitReg(int64_t value, int aLSB, int aMSB);
int64_t get64BitReg(int aLSB, int aMSB); int64_t get64BitReg(int aLSB, int aMSB);

2
slsDetectorSoftware/gotthardDetectorServer/mcb_funcs.h
View File

@ -16,8 +16,6 @@
#define DEFAULTGAIN {11.66,9.32,14.99} #define DEFAULTGAIN {11.66,9.32,14.99}
#define DEFAULTOFFSET {817.5,828.6,804.2} #define DEFAULTOFFSET {817.5,828.6,804.2}
// DAC definitions // DAC definitions
enum dacsVal{VREF_DS, VCASCN_PB, VCASCP_PB, VOUT_CM, VCASC_OUT, VIN_CM, VREF_COMP, IB_TESTC,HIGH_VOLTAGE, CONFGAIN}; enum dacsVal{VREF_DS, VCASCN_PB, VCASCP_PB, VOUT_CM, VCASC_OUT, VIN_CM, VREF_COMP, IB_TESTC,HIGH_VOLTAGE, CONFGAIN};

32
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -39,7 +39,7 @@ char *dataretval=NULL;
int nframes, iframes, dataret; int nframes, iframes, dataret;
char mess[1000]; char mess[1000];
int digitalTestBit = 0;
@ -625,6 +625,7 @@ int digital_test(int file_des) {
int n=0; int n=0;
int ibit=0; int ibit=0;
int ow; int ow;
int ival;
enum digitalTestMode arg; enum digitalTestMode arg;
sprintf(mess,"Can't send digital test\n"); sprintf(mess,"Can't send digital test\n");
@ -709,6 +710,23 @@ int digital_test(int file_des) {
case DETECTOR_SOFTWARE_TEST: case DETECTOR_SOFTWARE_TEST:
retval=testFpga(); retval=testFpga();
break; break;
case DIGITAL_BIT_TEST:
n = receiveDataOnly(file_des,&ival,sizeof(ival));
if (n < 0) {
sprintf(mess,"Error reading from socket\n");
retval=FAIL;
}
#ifdef VERBOSE
printf("with value %d\n", ival);
#endif
if (differentClients==1 && lockStatus==1) {
ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP);
break;
}
digitalTestBit = ival;
retval=digitalTestBit;
break;
default: default:
printf("Unknown digital test required %d\n",arg); printf("Unknown digital test required %d\n",arg);
ret=FAIL; ret=FAIL;
@ -2705,7 +2723,7 @@ int configure_mac(int file_des) {
int retval; int retval;
int ret=OK; int ret=OK;
char arg[3][50]; char arg[3][50];
int n,i,ival; int n,i;
int imod=0;//should be in future sent from client as -1, arg[2] int imod=0;//should be in future sent from client as -1, arg[2]
int ipad; int ipad;
@ -2720,18 +2738,12 @@ int configure_mac(int file_des) {
sprintf(mess,"Error reading from socket\n"); sprintf(mess,"Error reading from socket\n");
ret=FAIL; ret=FAIL;
} }
n = receiveDataOnly(file_des,&ival,sizeof(ival));
if (n < 0) {
sprintf(mess,"Error reading from socket\n");
ret=FAIL;
}
sscanf(arg[0], "%x", &ipad); sscanf(arg[0], "%x", &ipad);
sscanf(arg[1], "%llx", &imacadd); sscanf(arg[1], "%llx", &imacadd);
sscanf(arg[2], "%llx", &iservermacadd); sscanf(arg[2], "%llx", &iservermacadd);
#ifdef VERBOSE #ifdef VERBOSE
printf("\nival %d\t",ival); printf("\ndigital_test_bit in server %d\t",digitalTestBit);
printf("\nipadd %x\t",ipad); printf("\nipadd %x\t",ipad);
printf("destination ip is %d.%d.%d.%d = 0x%x \n",(ipad>>24)&0xff,(ipad>>16)&0xff,(ipad>>8)&0xff,(ipad)&0xff,ipad); printf("destination ip is %d.%d.%d.%d = 0x%x \n",(ipad>>24)&0xff,(ipad>>16)&0xff,(ipad>>8)&0xff,(ipad)&0xff,ipad);
printf("macad:%llx\n",imacadd); printf("macad:%llx\n",imacadd);
@ -2753,7 +2765,7 @@ int configure_mac(int file_des) {
#endif #endif
#ifdef MCB_FUNCS #ifdef MCB_FUNCS
if (ret==OK) { if (ret==OK) {
retval=configureMAC(ipad,imacadd,iservermacadd,ival); retval=configureMAC(ipad,imacadd,iservermacadd,digitalTestBit);
if(retval==-1) ret=FAIL; if(retval==-1) ret=FAIL;
} }
#endif #endif