updated release notes and project version

A delay of 100ms has been added between the generation of the stop pulse and the resetCore function call. This should give enough time to the detector to readout and streamout the ongoing frame before the internal logic is reset (even after the transmission is delayed with txndelay_frame).

Conflicts:
	slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.0

CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright (C) 2021 Contributors to the SLS Detector Package
 cmake_minimum_required(VERSION 3.12)
 project(slsDetectorPackage)
-set(PROJECT_VERSION 6.1.0)
+set(PROJECT_VERSION 6.1.1)
 
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 

RELEASE.txt

@@ -1,117 +1,39 @@
-SLS Detector Package Minor Release 6.1.0 released on 25.11.2021
+SLS Detector Package Minor Release 6.1.1 released on 04.01.2022
 ===============================================================
 
-This document describes the differences between v6.1.0 and v6.0.0.   
+This document describes the differences between v6.1.1 and v6.1.0.   
 
 
 
     CONTENTS
     --------
-    1.  New or Changed Features
-    2.  Resolved Issues
-    3.  Firmware Requirements
-    4.  Kernel Requirements
-    5.  Download, Documentation & Support
+    1.  Resolved Issues
+    2.  Firmware Requirements
+    3.  Kernel Requirements
+    4.  Download, Documentation & Support
 
 
 
-
-1. New or Changed Features
-==========================
-
-    Client
-    ------
-
-    1.  Kernel version
-        Commandline: kernelversion, API: getKernelVersion
-
-    2.  [Jungfrau][Mythen3][Gotthard2][Gotthard][Moench][Ctb]
-        Update Kernel
-        Commandline: updatekernel, API: updatekernel
-        You could damage the detector. Please use with caution.
-
-    3.  Update Detector Server (no tftp)
-        Commandline: updatedetectorserver, API: updateDetectorServer
-        Updates the detector server without using tftp. It also creates a 
-        symbolic link to a shorter name and reboots. The API using tftp
-        (copydetectorserver) is deprecated.
-
-    4.  Update Firmware and Server (no tftp)
-        Commandline: update (fewer arguments), API: updateFirmwareAndServer 
-        (overloaded) Same as before, except the server is transferred to the 
-        detector without tftp. The previous API and command (fewer arguments) 
-        using tftp is deprecated.
-
-    5.  Update mode in Detector server
-        Commandline: udpatemode, API set/getUpdateMode
-        One can set detector server to update mode (especially if server and 
-        firmware are incompatible that the server cannot start up without errors).
-        This mode will limit access to a few operations only needed to update the 
-        detector. Setting it will create an empty file (udpate.txt) and resetting
-        it will delete the empty file. Ofcourse, command line "--update" will 
-        overwrite any file detection and start server in update mode.
-
-    
-    Detector Server
-    ---------------
-
-    1.  [Gotthard2] speed
-        Ensuring dbitpipeline is default when changing speed. This has an effect
-        only if dbitpipeline was changed in between.
-
-
-
-2. Resolved Issues
+1. Resolved Issues
 ==================
 
     Detector Server
     ---------------
     
-    1.  [Jungfrau][Moench][Ctb] Programming Firmware Failures 
-        Firmware programming via software failures are fixed using a new kernel 
-        and corresponding changes in server software. Software works with both 
-        old and new kernels.
-
-    2.  [Gotthard2][Mythen3]  
-        Verifies kernel version at server start up.
-
-    3.  [Jungfrau]
-        Verifies HW2.0 before trying to set read n rows or flip rows.
-        Has no effect when not using slsReceiver.
-
-    4.  [Eiger]
-        Thresholdnotb command loads threshold energy without trimbits, but had 
-        a bug in the server that was setting nchip to 0 and further trimval or 
-        trim commands would no work reliably. This is fixed now.
-
-
-    Client
-    ------
-
-    1.  Receiver Id in the commands in config files were ignored. Fixed.
-
-    2.  Execute command now also mentions which module failed.
-
-    3.  [Jungfrau][Moench][Ctb] 
-        Programming firmware procedure did not delete temporary file created in 
-        6.0.0. Fixed.
-
-
-    Receiver
-    --------
-
-    1.  Setting receiver hostname to "none" threw an exception. Fixed.
-
-    2.  [Jungfrau]
-        Since the server verifies HW2.0 for number of rows before trying to set it, 
-        the receiver now does not show incorrect missing packets stemming from this 
-        issue.
+    1.  [Jungfrau] Cannot start 
+        Under some circumstances and not always reproducible, the detector 
+        cannot start once it has stopped. Fixed by adding a delay between the 
+        stop pulse and the resetting core to give sufficient time to readout and 
+        stream out the ongoing frame.        
 
 
 
-3. Firmware Requirements
+2. Firmware Requirements
 ========================
         
+    Note: No change to 6.1.0.
+
+
     Eiger
     =====  
     Compatible version : 08.10.2021 (v29)
@@ -162,9 +84,12 @@ This document describes the differences between v6.1.0 and v6.0.0.
 
 
 
-4. Kernel Requirements
+3. Kernel Requirements
 ======================
 
+    Note: No change to 6.1.0.
+
+
     Blackfin 
     ========
     Latest version: Fri Oct 29 00:00:00 2021
@@ -189,7 +114,7 @@ This document describes the differences between v6.1.0 and v6.0.0.
 
 
 
-5. Download, Documentation & Support
+4. Download, Documentation & Support
 ====================================
 
     Download

serverBin/jungfrauDetectorServerv6.1.0

@@ -1 +0,0 @@
-../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.0

serverBin/jungfrauDetectorServerv6.1.1

@@ -0,0 +1 @@
+../slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServerv6.1.1

slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c

@@ -2646,6 +2646,7 @@ int stopStateMachine() {
 
     LOG(logINFO, ("Status Register: %08x\n", bus_r(STATUS_REG)));
 
+    usleep(100 * 1000);
     resetCore();
     return OK;
 }

slsSupportLib/include/sls/versionAPI.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-other
 // Copyright (C) 2021 Contributors to the SLS Detector Package
 /** API versions */
-#define GITBRANCH "6.1.0"
+#define GITBRANCH "6.1.1"
 
 #define APILIB 0x211125
 #define APIRECEIVER 0x211125
@@ -9,7 +9,7 @@
 #define APICTB 0x211125
 #define APIGOTTHARD 0x211125
 #define APIGOTTHARD2 0x211125
-#define APIJUNGFRAU 0x211125
 #define APIMYTHEN3 0x211125
 #define APIMOENCH 0x211124
 #define APIEIGER 0x211125
+#define APIJUNGFRAU 0x220104