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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
RELEASE.txt
View File

@ -240,6 +240,9 @@ Resolved Issues
11. Non Mythen and non Eiger detectors can also now get settings file from 11. Non Mythen and non Eiger detectors can also now get settings file from
board. board.
12. (Gotthard) Did not get first few images initially after configuring MAC
of detector. Fixed.
Receiver Receiver
@ -274,6 +277,9 @@ Resolved Issues
20. Removed option for compression in Gui as it is not available currently. 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. 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.

1
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

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

8
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

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

6
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

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

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.2 → slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.0.1.3
View File

Binary file not shown.