Merge branch '5-lima-core-1-10-recompilation' into 'master'

Resolve "lima-core 1.10 recompilation" Closes #5 See merge request limagroup/Lima-camera-lambda!7
esrf-bliss · Oct 3, 2024 · b08ab37 · b08ab37
2 parents 2029e03 + 0b9ecde
commit b08ab37
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -25,6 +25,8 @@ build-noarch:
     - conda mambabuild ./conda/tango --prefix-length=80 --output-folder=dist/ -c http://bcu-ci.esrf.fr/stable
   dependencies:
     - build-linux
+  tags:
+    - linux
 
 deploy-devel:
   stage: deploy

diff --git a/conda/camera/conda_build_config.yaml b/conda/camera/conda_build_config.yaml
@@ -6,6 +6,7 @@ cxx_compiler:
   - vs2017                     # [win]
 python:
   - 3.9
+  - 3.10
 # This differs from target_platform in that it determines what subdir the compiler
 #    will target, not what subdir the compiler package will be itself.
 #    For example, we need a win-64 vs2008_win-32 package, so that we compile win-32

diff --git a/conda/camera/meta.yaml b/conda/camera/meta.yaml
@@ -19,7 +19,7 @@ requirements:
   host:
     - python {{ python }}
     - sip 4.19*  # API v12.7 
-    - lima-core
+    - lima-core 1.10*
     - xspectrum-sdk 2.0.2
     - boost-cpp=1.74.0=h6cacc03_7
   build:
@@ -29,7 +29,7 @@ requirements:
   run:
     - python
     - {{ pin_compatible('sip', min_pin='x.x.x', max_pin='x') }} 
-    - {{ pin_compatible('lima-core', max_pin='x.x') }}
+    - {{ pin_compatible('lima-core', min_pin='x.x', max_pin='x.x') }}
     - xspectrum-sdk 2.0.2
     - boost-cpp=1.74.0=h6cacc03_7
 

diff --git a/conda/tango/meta.yaml b/conda/tango/meta.yaml
@@ -22,7 +22,7 @@ requirements:
     - ninja
     - lima-core
   run:
-    - lima-tango-server
+    - lima-tango-server 1.10*
     - lima-camera-lambda
 
 about:

diff --git a/src/LambdaInterface.cpp b/src/LambdaInterface.cpp
@@ -26,15 +26,6 @@ Interface::Interface(Camera& cam) :
 	m_cap_list.push_back(HwCap(m_det_info));
 	m_cap_list.push_back(HwCap(m_bufferCtrlObj));
 	m_cap_list.push_back(HwCap(m_sync));
-	Size image_size;
-	m_det_info->getMaxImageSize(image_size);
-	ImageType image_type;
-	m_det_info->getDefImageType(image_type);
-	FrameDim frame_dim(image_size, image_type);
-	m_bufferCtrlObj->setFrameDim(frame_dim);
-	m_bufferCtrlObj->setNbConcatFrames(1);
-	m_bufferCtrlObj->setNbBuffers(2);
-
 }
 
 //-----------------------------------------------------