diff --git a/CMakeLists.txt b/CMakeLists.txt index 6124fd40f..ecef8ad77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # Copyright (C) 2021 Contributors to the SLS Detector Package cmake_minimum_required(VERSION 3.14) project(slsDetectorPackage) -set(PROJECT_VERSION 7.0.0) +set(PROJECT_VERSION 9.0.0) set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") diff --git a/RELEASE.txt b/RELEASE.txt index d1eab770b..b10c52cb0 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,7 +1,7 @@ -SLS Detector Package Major Release 7.x.x released on xx.xx.2023 +SLS Detector Package Major Release x.x.x released on xx.xx.202x =============================================================== -This document describes the differences between v7.x.x and v7.0.2 +This document describes the differences between vx.x.x and vx.0.2 @@ -28,9 +28,6 @@ This document describes the differences between v7.x.x and v7.0.2 ===================================== -- moench being made compatible with jungfrau 2.0 boards (jungfrau structure, away from ctb) -- eiger febl and feb in versions -- fix ctb slow adcs @@ -38,22 +35,24 @@ This document describes the differences between v7.x.x and v7.0.2 ========================================== - Eiger 7.0.0 - Jungfrau 7.0.2 - Mythen3 7.0.0 - Gotthard2 7.0.0 - Gotthard 7.0.0 - Moench 7.0.0 - Ctb 7.0.0 - + Eiger 9.0.0 + Jungfrau 9.0.0 + Mythen3 9.0.0 + Gotthard2 9.0.0 + Gotthard 9.0.0 + Moench 9.0.0 + On-board Detector Server Upgrade -------------------------------- From v6.1.0 (without tftp): - Using command 'updatedetectorserver' - From 5.0.0 (with tftp): - Using command 'copydetectorserver' + update only on-board detector server + Using command 'updatedetectorserver' + + + udpate both on-board detector server and firmware simultaneously + Using command 'update' Instructions available at https://slsdetectorgroup.github.io/devdoc/serverupgrade.html @@ -65,22 +64,20 @@ This document describes the differences between v7.x.x and v7.0.2 ======================== - Eiger 20.02.2023 (v31) + Eiger 02.10.2023 (v32) (updated in 7.0.3) - Jungfrau 04.11.2022 (v1.4, HW v1.0) - 03.11.2022 (v2.4, HW v2.0) + Jungfrau 01.10.2024 (v1.6, HW v1.0) (updated in 9.0.0) + 01.10.2024 (v2.6, HW v2.0) (updated in 9.0.0) - Mythen3 24.01.2023 (v1.4) + Mythen3 11.10.2024 (v1.5) (updated in 9.0.0) - Gotthard2 23.11.2022 (v0.3) + Gotthard2 03.10.2024 (v1.0) (updated in 9.0.0) + + Moench 26.10.2023 (v1.0) (updated in 9.0.0) Gotthard 08.02.2018 (50um and 25um Master) 09.02.2018 (25 um Slave) - Moench 05.12.2022 (v0.3) - - Ctb 03.04.2023 (v1.2?) - Detector Upgrade ---------------- @@ -92,7 +89,6 @@ This document describes the differences between v7.x.x and v7.0.2 Mythen3 via command <.rbf> Gotthard2 via command <.rbf> Moench via command <.pof> - Ctb via command <.pof> Gotthard cannot be upgraded remotely @@ -100,7 +96,7 @@ This document describes the differences between v7.x.x and v7.0.2 upgrade Using command 'programfpga' or - udpate both server and firmware simultaneously + udpate both on-board detector server and firmware simultaneously Using command 'update' @@ -113,6 +109,7 @@ This document describes the differences between v7.x.x and v7.0.2 4 Kernel Requirements ====================== + Blackfin -------- Latest version: Fri Oct 29 00:00:00 2021 @@ -120,10 +117,12 @@ This document describes the differences between v7.x.x and v7.0.2 Older ones will work, but might have issues with programming firmware via the package. + Nios ----- Compatible version: Mon May 10 18:00:21 CEST 2021 + Kernel Upgrade --------------- Eiger via bit files @@ -212,4 +211,4 @@ This document describes the differences between v7.x.x and v7.0.2 ------- dhanya.thattil@psi.ch - erik.frojdh@psi.ch + erik.frojdh@psi.ch \ No newline at end of file diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 3ed903583..8213afc3c 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -2,8 +2,6 @@ // Copyright (C) 2021 Contributors to the SLS Detector Package /** API versions */ #define RELEASE "developer" -#define APILIB "developer 0x230224" -#define APIRECEIVER "developer 0x230224" #define APICTB "developer 0x240918" #define APIGOTTHARD "developer 0x240918" #define APIMOENCH "developer 0x240918" @@ -12,3 +10,5 @@ #define APIMYTHEN3 "developer 0x241001" #define APIJUNGFRAU "developer 0x241001" #define APIGOTTHARD2 "developer 0x241007" +#define APILIB "developer 0x241014" +#define APIRECEIVER "developer 0x241014"