merge fix

This commit is contained in:
maliakal_d 2021-10-08 11:57:19 +02:00
commit 29b9f71361
4 changed files with 4 additions and 4 deletions

View File

@ -254,7 +254,7 @@ This document describes the differences between 6.0.0 and 5.2.0 releases.
Eiger
=====
Compatible version : 08.09.2020 (v27)
Compatible version : 08.10.2021 (v29)
Jungfrau
========

View File

@ -1,7 +1,7 @@
#pragma once
#include "sls/sls_detector_defs.h"
#define REQUIRED_FIRMWARE_VERSION (27)
#define REQUIRED_FIRMWARE_VERSION (29)
// virtual ones renamed for consistency
// real ones keep previous name for compatibility (already in production)
#ifdef VIRTUAL

View File

@ -1,13 +1,13 @@
/** API versions */
#define GITBRANCH "g2speed"
#define APICTB 0x211007
#define APIGOTTHARD 0x211007
#define APIMYTHEN3 0x211007
#define APIMOENCH 0x211005
#define APIEIGER 0x211007
#define APILIB 0x211007
#define APIRECEIVER 0x211007
#define APIGUI 0x210819
#define APIJUNGFRAU 0x211008
#define APIGOTTHARD2 0x211008
#define APIEIGER 0x211008