detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 10:44:39 +01:00
Code Issues Actions 1 Packages Releases Activity

fixed jungfrau problem, changed set receiver to updatedetector before

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-04 17:14:47 +01:00
parent 25780a2b4f
commit 8caa9d8779
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c
View File

@@ -1630,12 +1630,30 @@ int configureInterface(uint32_t destip,uint64_t destmac,uint64_t sourcemac,int
#endif
bus_w(CONTROL_REG,GB10_RESET_BIT);
usleep(500 * 1000);
//usleep(50 * 1000);
bus_w(CONTROL_REG,0);
usleep(10* 1000);
//usleep(500* 1000);
//bus_w(CONFIG_REG,conf | GB10_NOT_CPU_BIT);
printf("System status register is %08x\n",bus_r(SYSTEM_STATUS_REG));
/*
bus_w(CONTROL_REG,GB10_RESET_BIT);
bus_w(CONTROL_REG,0);
usleep(500 * 1000);
bus_w(CONFIG_REG,conf | GB10_NOT_CPU_BIT);
printf("System status register is %08x\n",bus_r(SYSTEM_STATUS_REG));
*/
printf("Reset mem machine fifos\n");
bus_w(MEM_MACHINE_FIFOS_REG,0x4000);
bus_w(MEM_MACHINE_FIFOS_REG,0x0);
printf("Reset run control\n");
bus_w(MEM_MACHINE_FIFOS_REG,0x0400);
bus_w(MEM_MACHINE_FIFOS_REG,0x0);
usleep(500 * 1000);
return 0; //any value doesnt matter - dhanya
}
@@ -1674,11 +1692,7 @@ int configureMAC(uint32_t destip,uint64_t destmac,uint64_t sourcemac,int source
for (interface=0; interface <ngb; interface++)
configureInterface(destip, destmac, sourcemac+interface, sourceip+interface, ival, destport+interface, sourceport+interface, interface);
bus_w(CONTROL_REG,GB10_RESET_BIT);
bus_w(CONTROL_REG,0);
usleep(500 * 1000);
bus_w(CONFIG_REG,conf | GB10_NOT_CPU_BIT);
printf("System status register is %08x\n",bus_r(SYSTEM_STATUS_REG));
return OK;
}

BIN
slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.0
View File

Binary file not shown.

2
slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c
View File

@@ -2024,7 +2024,7 @@ int set_dynamic_range(int file_des) {
int retval;
int ret=OK;
printf("Set dynamic range?\n");
printf("Set dynamic range\n");
sprintf(mess,"can't set dynamic range\n");