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

implemented server to have a phase shift input

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@341 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-11-13 12:31:41 +00:00
parent d944ee5372
commit f6ff1359aa
4 changed files with 78 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -38,6 +38,7 @@ int ram_size=0;
int64_t totalTime=1; int64_t totalTime=1;
u_int32_t progressMask=0; u_int32_t progressMask=0;
int phase_shift=120;
int ififostart, ififostop, ififostep, ififo; int ififostart, ififostop, ififostep, ififo;
@ -218,7 +219,7 @@ u_int32_t bus_r(u_int32_t offset) {
int setPhaseShiftOnce(){ int setPhaseShiftOnce(){
u_int32_t addr, reg; u_int32_t addr, reg;
int result=OK, i; int i;
addr=MULTI_PURPOSE_REG; addr=MULTI_PURPOSE_REG;
reg=bus_r(addr); reg=bus_r(addr);
#ifdef VERBOSE #ifdef VERBOSE
@ -226,22 +227,21 @@ int setPhaseShiftOnce(){
#endif #endif
//Checking if it is power on(negative number) //Checking if it is power on(negative number)
if(((reg&0xFFFF0000)>>16)>0){ // if(((reg&0xFFFF0000)>>16)>0){
bus_w(addr,0x0); //clear the reg //bus_w(addr,0x0); //clear the reg
//#ifdef VERBOSE
printf("Implementing Phase Shift-Reg:%x\n",bus_r(addr)); if(reg==0){
//#endif printf("\nImplementing phase shift of %d\n",phase_shift);
//phase shift for (i=1;i<phase_shift;i++) {
for (i=1;i<PHASE_SHIFT;i++) {
bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT|PHASE_STEP_BIT));//0x2821 bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|SW1_BIT|PHASE_STEP_BIT));//0x2821
bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|(SW1_BIT&~PHASE_STEP_BIT)));//0x2820 bus_w(addr,(INT_RSTN_BIT|ENET_RESETN_BIT|(SW1_BIT&~PHASE_STEP_BIT)));//0x2820
} }
}
reg=bus_r(addr);
#ifdef VERBOSE #ifdef VERBOSE
printf("Multipupose reg now:%x\n",reg); printf("Multipupose reg now:%x\n",bus_r(addr));
#endif #endif
return result; }
return OK;
} }

13
slsDetectorSoftware/gotthardDetectorServer/server.c
View File

@ -6,6 +6,8 @@
extern int sockfd; extern int sockfd;
extern int phase_shift;
void error(char *msg) void error(char *msg)
@ -19,7 +21,16 @@ int main(int argc, char *argv[])
char cmd[100]; char cmd[100];
int retval=OK; int retval=OK;
int sd, fd; int sd, fd;
int iarg;
for(iarg=1; iarg<argc; iarg++){
if(!strcasecmp(argv[iarg],"-phaseshift")){
if ( sscanf(argv[iarg+1],"%d",&phase_shift)==0) {
printf("could not decode phase shift\n");
return 1;
}
argc=1;
}
}
if (argc==1) { if (argc==1) {
portno = DEFAULT_PORTNO; portno = DEFAULT_PORTNO;

2
slsDetectorSoftware/gotthardDetectorServer/server_defs.h
View File

@ -27,8 +27,6 @@
#define TRIM_DR (((int)pow(2,NTRIMBITS))-1) #define TRIM_DR (((int)pow(2,NTRIMBITS))-1)
#define COUNT_DR (((int)pow(2,NCOUNTBITS))-1) #define COUNT_DR (((int)pow(2,NCOUNTBITS))-1)
#define PHASE_SHIFT 120
#define ALLMOD 0xffff #define ALLMOD 0xffff
#define ALLFIFO 0xffff #define ALLFIFO 0xffff

2
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -72,7 +72,7 @@ int init_detector( int b) {
testFpga(); testFpga();
testRAM(); testRAM();
//gotthard specific //gotthard specific
//setPhaseShiftOnce(); setPhaseShiftOnce();
setDAQRegister(-1); setDAQRegister(-1);
setSettings(GET_SETTINGS,-1); setSettings(GET_SETTINGS,-1);
//Initialization //Initialization