detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02:00
Code Issues Actions Packages Releases Activity

changes

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-11-01 09:12:58 +01:00
parent 5b4528925d
commit 2a7a11b80f
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c
View File

@ -65,6 +65,7 @@ typedef struct ip_header_struct {
struct timeval tss,tse,tsss; //for timing
int gpiopinsdefined = 0;
@ -1058,6 +1059,7 @@ int64_t setPeriod(int64_t value){
printf("\nSetting period to %lld\n",(long long int)value);
value*=(1E-3*clockdivider);
}
return set64BitReg(value,SET_PERIOD_LSB_REG, SET_PERIOD_MSB_REG)/(1E-3*clockdivider);//(1E-9*CLK_FREQ);
}
@ -1434,12 +1436,16 @@ int writeGbeReg(int ivar, uint32_t val, int addr, int interface) {
int configureInterface(uint32_t destip,uint64_t destmac,uint64_t sourcemac,int sourceip,int ival,uint32_t destport, uint32_t sourceport, int interface) {
//int configureMAC(int ipad,long long int macad,long long int detectormacad, int detipad, int ival, int udpport){
/*
if(!gpiopinsdefined){
defineGPIOpins();
gpiopinsdefined = 1;
}
//tell FPGA to not touch flash
system("echo 0 > /sys/class/gpio/gpio9/value");
//tell FPGA to touch flash to program itself
system("echo 1 > /sys/class/gpio/gpio9/value");
*/
volatile u_int32_t conf= bus_r(CONFIG_REG);

BIN
slsDetectorSoftware/jungfrauDetectorServer/jungfrauDetectorServerv2.2.1
View File

Binary file not shown.

5
slsDetectorSoftware/jungfrauDetectorServer/server_funcs.c
View File

@ -97,9 +97,6 @@ int init_detector(int b) {
);
defineGPIOpins();
printf("Resetting PLL\n");
resetPLL();
bus_w16(CONTROL_REG, SYNC_RESET);
@ -172,6 +169,7 @@ int init_detector(int b) {
setDelay(0);
setGates(0);
setTiming(GET_EXTERNAL_COMMUNICATION_MODE);
setMaster(GET_MASTER);
setSynchronization(GET_SYNCHRONIZATION_MODE);
@ -2461,6 +2459,7 @@ int send_update(int file_des) {
retval=setExposureTime(tns);
n = sendDataOnly(file_des,&retval,sizeof(int64_t));
retval=setPeriod(tns);
cprintf(RED,"updated frame period from %lld tns:%d\n", (long long int)retval, tns);
n = sendDataOnly(file_des,&retval,sizeof(int64_t));
retval=setDelay(tns);
n = sendDataOnly(file_des,&retval,sizeof(int64_t));