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

fixed jungfrau server compile errors

Browse Source
This commit is contained in:
maliakal_d
2018-11-08 17:20:41 +01:00
parent 91dd176a0f
commit 7a99d4155a
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
View File

@ -1,5 +1,4 @@
#ifndef REGISTER_DEFS_H
#define REGISTER_DEFS_H
#pragma once
/* Definitions for FPGA*/
#define MEM_MAP_SHIFT 1
@ -398,8 +397,6 @@
#define ASIC_CTRL_DS_TMR_VAL ((0x1F << ASIC_CTRL_DS_TMR_OFST) & ASIC_CTRL_DS_TMR_MSK)
#endif //REGISTERS_G_H

8
slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 92123069ce045314a12416a7e8b308875d7f9f21
Revision: 7
Repsitory UUID: 91dd176a0fb314f583ca6e29140053f1eb742896
Revision: 11
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4158
Last Changed Date: 2018-11-02 12:00:46.000000002 +0100 ./Makefile
Last Changed Rev: 4166
Last Changed Date: 2018-11-08 17:17:22.000000002 +0100 ./RegisterDefs.h

6
slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "92123069ce045314a12416a7e8b308875d7f9f21"
#define GITREPUUID "91dd176a0fb314f583ca6e29140053f1eb742896"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4158
#define GITDATE 0x20181102
#define GITREV 0x4166
#define GITDATE 0x20181108
#define GITBRANCH "refactor"