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

jungfrau reset core and usleep (fix for 6.1.1 now fixed in firmware) removed (#545)

Browse Source
This commit is contained in:
Dhanya Thattil 2022-09-01 15:05:41 +02:00 committed by GitHub
parent 4913c9c0b0
commit 02322bb3c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE.txt
View File

@ -93,6 +93,8 @@ This document describes the differences between v7.0.0 and v6.x.x
- g2 parallel command
- jungfrau sync
- ctb and moench Fw fixed (to work with pattern commdand) )addreess length
- jungfrau reset core and usleep removed (fix for 6.1.1 is now fixed in firmware)
2. Resolved Issues
==================

BIN
slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
View File

Binary file not shown.

3
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -2738,9 +2738,6 @@ int stopStateMachine() {
bus_w(CONTROL_REG, bus_r(CONTROL_REG) & ~CONTROL_STOP_ACQ_MSK);
LOG(logINFO, ("Status Register: %08x\n", bus_r(STATUS_REG)));
usleep(100 * 1000);
resetCore();
return OK;
}

4
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -5,8 +5,8 @@
#include "sls/sls_detector_defs.h"
#define MIN_REQRD_VRSN_T_RD_API 0x171220
#define REQRD_FRMWRE_VRSN_BOARD2 0x210831 // 1.0 pcb (version = 010)
#define REQRD_FRMWRE_VRSN 0x211008 // 2.0 pcb (version = 011)
#define REQRD_FRMWRE_VRSN_BOARD2 0x220421 // 1.0 pcb (version = 010)
#define REQRD_FRMWRE_VRSN 0x220422 // 2.0 pcb (version = 011)
#define LINKED_SERVER_NAME "jungfrauDetectorServer"

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

@ -7,8 +7,8 @@
#define APIGUI 0x220609
#define APIGOTTHARD 0x220816
#define APIEIGER 0x220816
#define APIJUNGFRAU 0x220816
#define APIMYTHEN3 0x220822
#define APICTB 0x220825
#define APIMOENCH 0x220825
#define APIGOTTHARD2 0x220830
#define APIJUNGFRAU 0x220831