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

changed dac values, fixed settings bug of not looking at nchan,nchips, , fixed clock divider, changed usleep in configuremac

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-03 09:16:01 +01:00
parent 754a4f8bdc
commit 0aecad6644
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c
View File

@@ -90,7 +90,7 @@ u_int32_t progressMask=0;
int phase_shift=0;//DEFAULT_PHASE_SHIFT;
int ipPacketSize=DEFAULT_IP_PACKETSIZE;
int udpPacketSize=DEFAULT_UDP_PACKETSIZE;
int clockdivider;
int clockdivider = 20;
/*
#ifndef NEW_PLL_RECONFIG
u_int32_t clkDivider[2]={32,16};
@@ -539,7 +539,6 @@ u_int32_t adcPipeline(int d) {
if (d>=0){
printf("Setting ADC Pipeline to 0x%x\n",d);
bus_w(ADC_PIPELINE_REG, d);
clockdivider = d;
}
return bus_r(ADC_PIPELINE_REG);
@@ -1504,12 +1503,12 @@ int configureInterface(uint32_t destip,uint64_t destmac,uint64_t sourcemac,int
#endif
bus_w(CONTROL_REG,GB10_RESET_BIT);
sleep(1);
usleep(500 * 1000);
bus_w(CONTROL_REG,0);
usleep(10000);
usleep(10* 1000);
bus_w(CONFIG_REG,conf | GB10_NOT_CPU_BIT);
printf("System status register is %08x\n",bus_r(SYSTEM_STATUS_REG));
usleep(500 * 1000);
return 0; //any value doesnt matter - dhanya
}
@@ -1550,7 +1549,7 @@ int configureMAC(uint32_t destip,uint64_t destmac,uint64_t sourcemac,int source
bus_w(CONTROL_REG,GB10_RESET_BIT);
bus_w(CONTROL_REG,0);
usleep(10000);
usleep(10 * 1000);
bus_w(CONFIG_REG,conf | GB10_NOT_CPU_BIT);
printf("System status register is %08x\n",bus_r(SYSTEM_STATUS_REG));
return OK;