fixed gothard not taking initial images after configuring MAC of detector.

This commit is contained in:
maliakal_d 2018-02-26 17:07:12 +01:00
parent ac9d9f6a93
commit de3bfd85a1
5 changed files with 14 additions and 7 deletions

View File

@ -240,6 +240,9 @@ Resolved Issues
11. Non Mythen and non Eiger detectors can also now get settings file from
board.
12. (Gotthard) Did not get first few images initially after configuring MAC
of detector. Fixed.
Receiver
@ -274,6 +277,9 @@ Resolved Issues
20. Removed option for compression in Gui as it is not available currently.
21. Can also show Jungfrau multi detector in x direction in gui.
22. Switching tabs sometimes results in delay and gates fields being incorrectly
enabled. Fixed.

View File

@ -1474,6 +1474,7 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
#endif
// if(val!=0x2820) return -1;
usleep(1000 * 1000);
return adcConfigured;
}

View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 94b61ea2c40176cf2a9a36c7d6477016cd5d7fcd
Revision: 218
Repsitory UUID: ac9d9f6a9312d17b1e01e5649bda9278f0466533
Revision: 220
Branch: 3.0.1
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3351
Last Changed Date: 2018-02-08 11:04:28.000000002 +0100 ./firmware_funcs.c
Last Changed Rev: 3438
Last Changed Date: 2018-02-26 17:01:54.000000002 +0100 ./firmware_funcs.c

View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "94b61ea2c40176cf2a9a36c7d6477016cd5d7fcd"
#define GITREPUUID "ac9d9f6a9312d17b1e01e5649bda9278f0466533"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3351
#define GITDATE 0x20180208
#define GITREV 0x3438
#define GITDATE 0x20180226
#define GITBRANCH "3.0.1"