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

ctb and moench fw fixed to work with pattern length so pattern command works (#535)

Browse Source
This commit is contained in:
Dhanya Thattil 2022-08-25 15:01:59 +02:00 committed by GitHub
parent 4638bf7cf8
commit 5a22e8b926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE.txt
View File

@ -92,6 +92,7 @@ This document describes the differences between v7.0.0 and v6.x.x
- jungfrau master - jungfrau master
- g2 parallel command - g2 parallel command
- jungfrau sync - jungfrau sync
- ctb and moench Fw fixed (to work with pattern commdand) )addreess length
2. Resolved Issues 2. Resolved Issues
================== ==================

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -5,7 +5,7 @@
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#define MIN_REQRD_VRSN_T_RD_API 0x181130 #define MIN_REQRD_VRSN_T_RD_API 0x181130
#define REQRD_FRMWR_VRSN 0x220714 #define REQRD_FRMWR_VRSN 0x220825
#define LINKED_SERVER_NAME "ctbDetectorServer" #define LINKED_SERVER_NAME "ctbDetectorServer"

12
slsDetectorServers/moenchDetectorServer/bin/DefaultPattern_moench.txt
View File

@ -287,15 +287,15 @@ patwaittime 1 0
patwait 2 0x0400 patwait 2 0x0400
patwaittime 2 0 patwaittime 2 0
patloop 3 0x0000 0x0000 patloop 3 0x1fff 0x1fff
patnloop 3 0 patnloop 3 0
patloop 4 0x0000 0x0000 patloop 4 0x1fff 0x1fff
patnloop 4 0 patnloop 4 0
patloop 5 0x0000 0x0000 patloop 5 0x1fff 0x1fff
patnloop 5 0 patnloop 5 0
patwait 3 0x0000 patwait 3 0x1fff
patwaittime 3 0 patwaittime 3 0
patwait 4 0x0000 patwait 4 0x1fff
patwaittime 4 0 patwaittime 4 0
patwait 5 0x0000 patwait 5 0x1fff
patwaittime 5 0 patwaittime 5 0

BIN
slsDetectorServers/moenchDetectorServer/bin/moenchDetectorServer_developer
View File

Binary file not shown.

2
slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h
View File

@ -5,7 +5,7 @@
#include "sls/sls_detector_defs.h" #include "sls/sls_detector_defs.h"
#define MIN_REQRD_VRSN_T_RD_API 0x180314 #define MIN_REQRD_VRSN_T_RD_API 0x180314
#define REQRD_FRMWR_VRSN 0x220714 #define REQRD_FRMWR_VRSN 0x220825
#define LINKED_SERVER_NAME "moenchDetectorServer" #define LINKED_SERVER_NAME "moenchDetectorServer"

2
slsDetectorServers/slsDetectorServer/src/loadPattern.c
View File

@ -92,7 +92,7 @@ uint64_t readPatternWord(int addr) {
uint32_t reg_msb = PATTERN_STEP0_MSB_REG + addr * REG_OFFSET * 2; uint32_t reg_msb = PATTERN_STEP0_MSB_REG + addr * REG_OFFSET * 2;
return get64BitReg(reg_lsb, reg_msb); return get64BitReg(reg_lsb, reg_msb);
#else #else
LOG(logINFORED, (" Reading (Executing) Pattern Word (addr:0x%x)\n", addr)); LOG(logDEBUG1, (" Reading (Executing) Pattern Word (addr:0x%x)\n", addr));
uint32_t reg = PATTERN_CNTRL_REG; uint32_t reg = PATTERN_CNTRL_REG;
// overwrite with only addr // overwrite with only addr

4
slsSupportLib/include/sls/versionAPI.h
View File

@ -9,6 +9,6 @@
#define APIEIGER 0x220816 #define APIEIGER 0x220816
#define APIJUNGFRAU 0x220816 #define APIJUNGFRAU 0x220816
#define APIGOTTHARD2 0x220818 #define APIGOTTHARD2 0x220818
#define APIMOENCH 0x220822
#define APIMYTHEN3 0x220822 #define APIMYTHEN3 0x220822
#define APICTB 0x220822 #define APICTB 0x220825
#define APIMOENCH 0x220825