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

gotthard server bug fix: adc channel shifted by one fixed changin token timing rev for board 2

Browse Source
This commit is contained in:
maliakal_d 2018-12-03 10:48:52 +01:00
parent 05d8ef6277
commit 2b0208bd98
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
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: c2db073d5e936d64733ba9bdfdce311a556ae212
Revision: 241
Branch: 4.0.0
Repsitory UUID: 05d8ef6277b9d367aea69cc5b57e322d40079e27
Revision: 242
Branch: 4.0.1-rc
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4018
Last Changed Date: 2018-09-27 16:32:41.000000002 +0200 ./firmware_funcs.c
Last Changed Rev: 4029
Last Changed Date: 2018-12-03 10:46:49.000000002 +0100 ./server_defs.h

8
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "c2db073d5e936d64733ba9bdfdce311a556ae212"
#define GITREPUUID "05d8ef6277b9d367aea69cc5b57e322d40079e27"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4018
#define GITDATE 0x20180927
#define GITBRANCH "4.0.0"
#define GITREV 0x4029
#define GITDATE 0x20181203
#define GITBRANCH "4.0.1-rc"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.3 → slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.1.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_ROI 0x1b000000
#define TOKEN_TIMING_REV1 0x1f16
#define TOKEN_TIMING_REV2 0x1f0f
#define TOKEN_TIMING_REV2 0x1f10
#define DEFAULT_PHASE_SHIFT 120
#define DEFAULT_IP_PACKETSIZE 0x0522