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

Command adcreg added to write to adc registers

Browse Source
This commit is contained in:
bergamaschi 2015-05-04 13:48:46 +02:00
parent 31f06fb567
commit ba377ec273
10 changed files with 208 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/commonFiles/sls_detector_funcs.h
View File

@ -92,8 +92,8 @@ enum {
F_ENABLE_TEN_GIGA, /**< enable 10Gbe */
F_SET_ALL_TRIMBITS, /** < set all trimbits to this value */
F_SET_CTB_PATTERN /** < loads a pattern in the CTB */
F_SET_CTB_PATTERN, /** < loads a pattern in the CTB */
F_WRITE_ADC_REG /** < writes an ADC register */
/* Always append functions hereafter!!! */

55
slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c
View File

@ -1218,7 +1218,15 @@ int64_t setPeriod(int64_t value){
// value*=(1E-9*CLK_FREQ);
value*=(1E-3*clkDivider[0]);
}
if (value%2==0) {
printf("Adding one to period: was %08llx ", value);
value+=1;
printf("now is %08llx\n ", value);
} else
printf("Period already even is %08llx\n ", value);
return set64BitReg(value,SET_PERIOD_LSB_REG, SET_PERIOD_MSB_REG)/(1E-3*clkDivider[0]);//(1E-9*CLK_FREQ);
@ -1592,6 +1600,7 @@ int configureMAC(uint32_t destip,uint64_t destmac,uint64_t sourcemac,int source
unsigned short *addr;
long int sum = 0;
long int checksum;
volatile u_int32_t conf= bus_r(CONFIG_REG);
ip.ip_ver = 0x4;
ip.ip_ihl = 0x5;
@ -1634,7 +1643,7 @@ ip.ip_destip = destip;
sleep(1);
bus_w(CONTROL_REG,0);
usleep(10000);
bus_w(CONFIG_REG,GB10_NOT_CPU_BIT);
bus_w(CONFIG_REG,conf | GB10_NOT_CPU_BIT);
printf("System status register is %08x\n",bus_r(SYSTEM_STATUS_REG));
return;
@ -1890,20 +1899,24 @@ int i;
for(i=0;i<100;i++){
//start state machine
bus_w16(CONTROL_REG, FIFO_RESET_BIT);
bus_w16(CONTROL_REG, 0x0);
bus_w16(CONTROL_REG, START_ACQ_BIT | START_EXPOSURE_BIT);
bus_w16(CONTROL_REG, 0x0);
bus_w16(CONTROL_REG, 0x0);
bus_w16(CONTROL_REG, START_ACQ_BIT | START_EXPOSURE_BIT);
bus_w16(CONTROL_REG, 0x0);
//verify
if(bus_r(STATUS_REG) & RUN_BUSY_BIT)
break;
else
usleep(5000);
if(bus_r(STATUS_REG) & RUN_BUSY_BIT)
break;
else {
printf("status: %08x\n",bus_r(STATUS_REG));
usleep(5000);
}
}
if(i!=0)
printf("tried to start state machine %d times\n",i);
if(i==100){
printf("\n***********COULD NOT START STATE MACHINE***************\n");
return FAIL;
if(i!=0)
printf("tried to start state machine %d times\n",i);
if(i==100){
printf("\n***********COULD NOT START STATE MACHINE***************\n");
return FAIL;
}
printf("statusreg=%08x\n",bus_r(STATUS_REG));
@ -2031,7 +2044,7 @@ u_int16_t* fifo_read_event(int ns)
}
a = bus_r(LOOK_AT_ME_REG);
//#ifdef VERBOSE
printf(".");
// printf(".");
//#endif
}
/* #ifdef TIMEDBG */
@ -2067,18 +2080,19 @@ u_int16_t* fifo_read_event(int ns)
if (i!=0 || ns!=0) {
a=0;
while (*((u_int32_t*)now_ptr)==*((u_int32_t*)(now_ptr)-1) && a<10) {
while (*((u_int32_t*)now_ptr)==*((u_int32_t*)(now_ptr)-1) && a++<10) {
// printf("******************** %d: fifo %d: new %08x old %08x\n ",ns, i, *((u_int32_t*)now_ptr),*((u_int32_t*)(now_ptr)-1));
*((u_int32_t*)now_ptr)=*values;
a++;
// printf("%d-",i);
}
}
}
now_ptr+=4;
bus_w16(DUMMY_REG,i+1);
// *(((u_int16_t*)(now_ptr))+i)=bus_r16(FIFO_DATA_REG);
}
}
bus_w16(DUMMY_REG,0); //
/* #ifdef TIMEDBG */
@ -2113,6 +2127,11 @@ u_int16_t* fifo_read_frame()
printf("total read data loop = %ld usec\n",(tss.tv_usec) - (tsss.tv_usec));
#endif
/* #ifdef VERBOSE */
/* printf("+\n"); */
/* #else */
/* printf("+\n"); */
/* #endif */
// printf("%x %d\n",dum, ns);
if (ns) return ram_values;
#ifdef VERBOSE

67
slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c
View File

@ -247,6 +247,7 @@ int function_table() {
flist[F_STOP_RECEIVER]=&stop_receiver;
flist[F_CALIBRATE_PEDESTAL]=&calibrate_pedestal;
flist[F_SET_CTB_PATTERN]=&set_ctb_pattern;
flist[F_WRITE_ADC_REG]=&write_adc_register;
return OK;
}
@ -2712,7 +2713,7 @@ int configure_mac(int file_des) {
sscanf(arg[3], "%llx", &idetectormacadd);
sscanf(arg[4], "%x", &detipad);
#ifdef VERBOSE
//#ifdef VERBOSE
int i;
printf("\ndigital_test_bit in server %d\t",digitalTestBit);
printf("\nipadd %x\t",ipad);
@ -2726,7 +2727,7 @@ int configure_mac(int file_des) {
printf("detector mac adress %d is 0x%x \n",6-i,(unsigned int)(((idetectormacadd>>(8*i))&0xFF)));
printf("detipad %x\n",detipad);
printf("\n");
#endif
//#endif
@ -3305,3 +3306,65 @@ int set_ctb_pattern(int file_des){
}
int write_adc_register(int file_des) {
int retval;
int ret=OK;
int arg[2];
int addr, val;
int n;
u_int32_t address;
sprintf(mess,"Can't write to register\n");
n = receiveDataOnly(file_des,arg,sizeof(arg));
if (n < 0) {
sprintf(mess,"Error reading from socket\n");
ret=FAIL;
}
addr=arg[0];
val=arg[1];
#ifdef VERBOSE
printf("writing to register 0x%x data 0x%x\n", addr, val);
#endif
if (differentClients==1 && lockStatus==1) {
ret=FAIL;
sprintf(mess,"Detector locked by %s\n",lastClientIP);
}
if(ret!=FAIL){
ret=writeADC(addr,val);
if (ret==OK)
retval=val;
}
#ifdef VERBOSE
printf("Data set to 0x%x\n", retval);
#endif
if (retval==val) {
ret=OK;
if (differentClients)
ret=FORCE_UPDATE;
} else {
ret=FAIL;
sprintf(mess,"Writing to register 0x%x failed: wrote 0x%x but read 0x%x\n", addr, val, retval);
}
/* send answer */
/* send OK/failed */
n = sendDataOnly(file_des,&ret,sizeof(ret));
if (ret!=FAIL) {
/* send return argument */
n += sendDataOnly(file_des,&retval,sizeof(retval));
} else {
n += sendDataOnly(file_des,mess,sizeof(mess));
}
/*return ok/fail*/
return ret;
}

1
slsDetectorSoftware/jungfrauDetectorServer/server_funcs.h
View File

@ -95,4 +95,5 @@ int calibrate_pedestal(int);
int set_roi(int);
int set_ctb_pattern(int);
int write_adc_register(int);;
#endif

22
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3847,6 +3847,28 @@ int multiSlsDetector::writeRegister(int addr, int val){
};
int multiSlsDetector::writeAdcRegister(int addr, int val){
int i;//imi, ima,
int ret, ret1=-100;
for (i=0; i<thisMultiDetector->numberOfDetectors; i++) {
if (detectors[i]) {
ret=detectors[i]->writeAdcRegister(addr,val);
if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i));
if (ret1==-100)
ret1=ret;
else if (ret!=ret1)
ret1=-1;
}
}
return ret1;
};
int multiSlsDetector::readRegister(int addr){
int i;//imi, ima,

3
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -956,6 +956,9 @@ class multiSlsDetector : public slsDetectorUtils {
int writeRegister(int addr, int val);
int writeAdcRegister(int addr, int val);
int readRegister(int addr);

45
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -1972,6 +1972,51 @@ int slsDetector::writeRegister(int addr, int val){
return retval;
};
/* write or read register */
int slsDetector::writeAdcRegister(int addr, int val){
int retval;
int fnum=F_WRITE_ADC_REG;
int ret=FAIL;
char mess[100];
int arg[2];
arg[0]=addr;
arg[1]=val;
#ifdef VERBOSE
std::cout<< std::endl;
std::cout<< "Writing to adc register "<< hex<<addr << " data " << hex<<val << std::endl;
#endif
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (connectControl() == OK){
controlSocket->SendDataOnly(&fnum,sizeof(fnum));
controlSocket->SendDataOnly(arg,sizeof(arg));
controlSocket->ReceiveDataOnly(&ret,sizeof(ret));
if (ret!=FAIL)
controlSocket->ReceiveDataOnly(&retval,sizeof(retval));
else {
controlSocket->ReceiveDataOnly(mess,sizeof(mess));
std::cout<< "Detector returned error: " << mess << std::endl;
}
controlSocket->Disconnect();
if (ret==FORCE_UPDATE)
updateDetector();
}
}
#ifdef VERBOSE
std::cout<< "ADC Register returned "<< retval << std::endl;
#endif
if (ret==FAIL) {
std::cout<< "Write ADC to register failed " << std::endl;
}
return retval;
};

10
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -785,6 +785,16 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
*/
int writeRegister(int addr, int val);
/**
write register
\param addr address
\val value
\returns current register value
*/
int writeAdcRegister(int addr, int val);
/**
read register
\param addr address

12
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -462,6 +462,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRegister;
i++;
descrToFuncMap[i].m_pFuncName="adcreg"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRegister;
i++;
descrToFuncMap[i].m_pFuncName="setbit"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdRegister;
i++;
@ -3301,6 +3305,12 @@ string slsDetectorCommand::cmdRegister(int narg, char *args[], int action) {
else
return string("Could not scan value (hexadecimal fomat) ")+string(args[2]);
sprintf(answer,"%x",myDet->writeRegister(addr,val));
} else if (cmd=="adcreg") {
if (sscanf(args[2],"%x",&val))
;
else
return string("Could not scan value (hexadecimal fomat) ")+string(args[2]);
sprintf(answer,"%x",myDet->writeAdcRegister(addr,val));
} else {
if (sscanf(args[2],"%d",&n))
@ -3323,6 +3333,8 @@ string slsDetectorCommand::cmdRegister(int narg, char *args[], int action) {
return string("Cannot get");
if (cmd=="clearbit")
return string("Cannot get");
if (cmd=="adcreg")
return string("Cannot get");
if (cmd=="reg") {
if (narg<2)

11
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -445,6 +445,17 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
*/
virtual int writeRegister(int addr, int val)=0;
/**
write ADC register
\param addr address
\param val value
\returns current register value
DO NOT USE!!! ONLY EXPERT USER!!!
*/
virtual int writeAdcRegister(int addr, int val)=0;
/**
read register