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

gotthard server bug fix: updated a register for token timing for revision 2 boards

Browse Source
This commit is contained in:
maliakal_d 2018-11-30 11:27:06 +01:00
parent 287efde54a
commit 64183d8d6a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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: d69d69e8928f90b053a0e5ffccb9cfc4e9c5f960 Repsitory UUID: 287efde54ae1e0ac2613728af3dd638e86a46d6b
Revision: 225 Revision: 226
Branch: 3.1.4-rc Branch: 3.1.5-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: GitHub_GitHub
Last Changed Rev: 3483 Last Changed Rev: 3494
Last Changed Date: 2018-07-25 14:56:37.000000002 +0200 ./firmware_funcs.c Last Changed Date: 2018-11-30 11:16:03.000000002 +0100 ./server_defs.h

10
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 "d69d69e8928f90b053a0e5ffccb9cfc4e9c5f960" #define GITREPUUID "287efde54ae1e0ac2613728af3dd638e86a46d6b"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "GitHub_GitHub"
#define GITREV 0x3483 #define GITREV 0x3494
#define GITDATE 0x20180725 #define GITDATE 0x20181130
#define GITBRANCH "3.1.4-rc" #define GITBRANCH "3.1.5-rc"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.4.0 → slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv3.1.5.0
View File

Binary file not shown.

2
slsDetectorSoftware/gotthardDetectorServer/server_defs.h
View File

@ -42,7 +42,7 @@
#define TOKEN_RESTART_DELAY 0x88000000 #define TOKEN_RESTART_DELAY 0x88000000
#define TOKEN_RESTART_DELAY_ROI 0x1b000000 #define TOKEN_RESTART_DELAY_ROI 0x1b000000
#define TOKEN_TIMING_REV1 0x1f16 #define TOKEN_TIMING_REV1 0x1f16
#define TOKEN_TIMING_REV2 0x1f0f #define TOKEN_TIMING_REV2 0x1f10
#define DEFAULT_PHASE_SHIFT 120 #define DEFAULT_PHASE_SHIFT 120
#define DEFAULT_IP_PACKETSIZE 0x0522 #define DEFAULT_IP_PACKETSIZE 0x0522