mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-20 08:38:00 +02:00
frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
@ -122,7 +122,7 @@ int fifoReset(){
|
||||
u_int32_t mask = FIFOCNTRL_RESET_MASK;
|
||||
|
||||
fifo_control_reg |= mask;
|
||||
printf("CTRL Register bits: 0x%08x\n",fifo_control_reg);
|
||||
//printf("CTRL Register bits: 0x%08x\n",fifo_control_reg);
|
||||
|
||||
bus_w(FIFO_CNTRL_REG,fifo_control_reg);
|
||||
bus_w(FIFO_CNTRL_REG,fifo_control_reg);
|
||||
@ -132,6 +132,8 @@ int fifoReset(){
|
||||
fifo_control_reg &= (~mask);
|
||||
bus_w(FIFO_CNTRL_REG,fifo_control_reg);
|
||||
|
||||
printf("fifo has been reset\n\n");
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
@ -142,7 +144,7 @@ int fifoTest(void){
|
||||
|
||||
int buffer_length = 256;
|
||||
int rec_buffer_length = 4096;
|
||||
char cmd[] = "fpgatfemp";
|
||||
char cmd[] = "help";
|
||||
unsigned int buffer[buffer_length];
|
||||
unsigned int rec_buffer[rec_buffer_length];
|
||||
unsigned int send_len;
|
||||
|
Reference in New Issue
Block a user