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

moench server: list.h fixed

Browse Source
This commit is contained in:
maliakal_d
2019-01-15 17:16:00 +01:00
parent 8bc9fa54fc
commit dd5bd60429
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/moenchDetectorServer/gitInfoMoench.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "91dd176a0fb314f583ca6e29140053f1eb742896"
#define GITREPUUID "8bc9fa54fc295aa2590f5aa53ffdd7bab4b6096d"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4166
#define GITDATE 0x20181108
#define GITREV 0x4248
#define GITDATE 0x20190114
#define GITBRANCH "refactor"

4
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -445,7 +445,7 @@ void initStopServer() {
/* set up detector */
void setupDetector() {
FILE_LOG(logINFO, ("This Server is for 1 Jungfrau module (500k)\n"));
FILE_LOG(logINFO, ("This Server is for 1 moench board\n"));
// default variables
dataBytes = 0;
@ -1247,7 +1247,7 @@ int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t
/* jungfrau specific - pll, flashing fpga */
// only for moench
int powerChip(int on) {
int powerChip(int on) { //FIXME only for moench? or only for ctb?
uint32_t addr = POWER_REG;
if (on >= 0) {
FILE_LOG(logINFO, ("Powering %s\n", (on > 0 ? "on" : "off")));