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

a few more changes for phaseshiftonce

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@80 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-01-10 09:29:50 +00:00
parent d5271ecb46
commit 0fd14ad113
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -176,7 +176,7 @@ int setDAQRegister()
int setPhaseShiftOnce(){ int setPhaseShiftOnce(){
u_int32_t addr, reg; u_int32_t addr, reg;
int result=OK, i,val,powerOn=0; int result=OK, i,val;
addr=MULTI_PURPOSE_REG; addr=MULTI_PURPOSE_REG;
reg=bus_r(addr); reg=bus_r(addr);
#ifdef VERBOSE #ifdef VERBOSE
@ -200,7 +200,26 @@ int setPhaseShiftOnce(){
} }
reg=bus_r(addr); reg=bus_r(addr);
printf("\nREG:%d\n",reg); printf("Multipupose reg now:%d\n",reg);
//for init_enet.. to convert ipaddress
/*
string sval;
sval.assign("129.129.202.176");
stringstream sstr(sval);
string word;
char chex[50],cword[50];
int i,inum;
while(getline(sstr,word,'.')){
i=atoi(word.c_str());
sprintf(chex,"%02x",i);
strcat(cword,chex);
}
printf("%s\n\n",cword);
*/
return result; return result;
} }

2
slsDetectorSoftware/gotthardDetectorServer/registers_g.h
View File

@ -202,6 +202,8 @@
#define SW1_BIT 0x00000020 #define SW1_BIT 0x00000020
#define SW1_OFFSET 5 #define SW1_OFFSET 5
#define RESET_BIT 0x00000080
#define RESET_OFFSET 7
#define ENET_RESETN_BIT 0x00000800 #define ENET_RESETN_BIT 0x00000800
#define ENET_RESETN_OFFSET 11 #define ENET_RESETN_OFFSET 11