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

now need to move it to a new server

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-05-24 17:42:33 +02:00
parent b8f0dd5f38
commit 046ac97a9b
5 changed files with 6 additions and 1537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.h
View File

@ -109,8 +109,6 @@ void resetPeripheral();
int adcPhase(int st); int adcPhase(int st);
int getPhase(); int getPhase();
u_int32_t putout(char *s, int modnum);
u_int32_t readin(int modnum);
u_int32_t setClockDivider(int d); u_int32_t setClockDivider(int d);
u_int32_t getClockDivider(); u_int32_t getClockDivider();

1486
slsDetectorSoftware/jungfrauDetectorServer/mcb_funcs.c
View File

File diff suppressed because it is too large Load Diff

1
slsDetectorSoftware/jungfrauDetectorServer/server_defs.h
View File

@ -39,6 +39,7 @@
/* Other Default Values */ /* Other Default Values */
//enum DACNAMES { VB_COMP, VDD_PROT, VIN_COM, VREF_PRECH, VB_PIXBUF, VB_DS, VREF_DS, VREF_COMP }; //enum DACNAMES { VB_COMP, VDD_PROT, VIN_COM, VREF_PRECH, VB_PIXBUF, VB_DS, VREF_DS, VREF_COMP };
#define DEFAULT_DAC_VALS { 1220, 3000, 1053, 1450, 750, 1000, 480, 420 }; #define DEFAULT_DAC_VALS { 1220, 3000, 1053, 1450, 750, 1000, 480, 420 };
enum adcVals {TEMP_FPGA, TEMP_ADC};
#define DEFAULT_SETTINGS (DYNAMICGAIN) #define DEFAULT_SETTINGS (DYNAMICGAIN)
#define DEFAULT_TX_UDP_PORT (0x7e9a) #define DEFAULT_TX_UDP_PORT (0x7e9a)

49
slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c
View File

@ -569,8 +569,6 @@ int digital_test(int file_des) {
int ret=OK; int ret=OK;
int imod=-1; int imod=-1;
int n=0; int n=0;
int ibit=0;
int ow;
int ival; int ival;
enum digitalTestMode arg; enum digitalTestMode arg;
@ -593,53 +591,8 @@ int digital_test(int file_des) {
sprintf(mess,"Error reading from socket\n"); sprintf(mess,"Error reading from socket\n");
retval=FAIL; retval=FAIL;
} }
#ifdef VERBOSE
printf("of module %d\n", imod);
#endif
retval=0;
#ifdef MCB_FUNCS
if (differentClients==1 && lockStatus==1) {
ret = FAIL; ret = FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP); strcpy(mess, "Not implemented for this detector\n");
break;
}
if (imod >= NMODX) {
ret=FAIL;
sprintf(mess,"Module %d disabled\n",imod);
break;
}
if (testShiftIn(imod)) retval|=(1<<(ibit));
ibit++;
if (testShiftOut(imod)) retval|=(1<<(ibit));
ibit++;
if (testShiftStSel(imod)) retval|=(1<<(ibit));
ibit++;
//if ( testDataInOut(0x123456, imod)) retval|=(1<<(ibit++));
//if ( testExtPulse(imod)) retval|=(1<<(ibit++));
// for (ow=0; ow<6; ow++)
// ow=1;
//#ifndef PICASSOD
for (ow=0; ow<5; ow++) {
//#endif
if (testDataInOutMux(imod, ow, 0x789abc)) retval|=(1<<ibit);
ibit++;
}
//for (ow=0; ow<6; ow++)
// ow=1;
//#ifndef PICASSOD
for (ow=0; ow<5; ow++) {
//#endif
if (testExtPulseMux(imod, ow)) retval|=(1<<ibit);
ibit++;
}
//#ifndef PICASSOD
if ( testOutMux(imod)) retval|=(1<<(ibit));
ibit++;
if (testFpgaMux(imod)) retval|=(1<<(ibit));
ibit++;
//#endif
#endif
break; break;
case MODULE_FIRMWARE_TEST: case MODULE_FIRMWARE_TEST:
retval=0x2; retval=0x2;

3
slsDetectorSoftware/jungfrauDetectorServer/server_funcs.h
View File

@ -7,6 +7,9 @@
#include <stdio.h> #include <stdio.h>
#define GOODBYE (-200)
int sockfd; int sockfd;