Commit 668a7e49 authored by Laurent Claustre's avatar Laurent Claustre
Browse files

Merge branch '150-add-new-camera-submodule-dhyana' into 'master'

Resolve "add new camera submodule dhyana"

Closes #150

See merge request !194
parents 83f7abf3 07499b85
Pipeline #46201 passed with stages
in 21 minutes and 54 seconds
...@@ -142,3 +142,6 @@ ...@@ -142,3 +142,6 @@
[submodule "camera/ximea"] [submodule "camera/ximea"]
path = camera/ximea path = camera/ximea
url = ../Lima-camera-ximea url = ../Lima-camera-ximea
[submodule "camera/dhyana"]
path = camera/dhyana
url = ../Lima-camera-dhyana
Subproject commit bc54996db41f7877001aafb97b9eb19596e5dc3b
...@@ -21,9 +21,9 @@ Under development ...@@ -21,9 +21,9 @@ Under development
During the coming year, several new detector plugins should be released: During the coming year, several new detector plugins should be released:
- Arinax Bi-zoom (Arinax ltd.) - Arinax Bi-zoom (Arinax ltd.)
- QHYCCD model Q178-Cool (FRMII) - Basler SDK Pylon 6.1.X (ESRF)
Foreseen Foreseen
======== ========
- Ximea for high resolution, 6kx6k pixel (ESRF) - QHYCCD model Q178-Cool (FRMII)
...@@ -53,6 +53,12 @@ The following Conda packages are available from the `esrf-bcu` channel. Some cam ...@@ -53,6 +53,12 @@ The following Conda packages are available from the `esrf-bcu` channel. Some cam
+--------------------+-------+---------+----------------------+ +--------------------+-------+---------+----------------------+
| Xh | Yes | | n/a | | Xh | Yes | | n/a |
+--------------------+-------+---------+----------------------+ +--------------------+-------+---------+----------------------+
| TUCSEN Dhyana | Yes | | tucam 1.0.0 |
+--------------------+-------+---------+----------------------+
| Ximea | Yes | | ximeas-sdk 4.21.23 |
+--------------------+-------+---------+----------------------+
| Xspectrum Lambda | Yes | | xsp 1.4.1 |
+--------------------+-------+---------+----------------------+
Windows Only Windows Only
============ ============
...@@ -83,6 +89,7 @@ Linux Only ...@@ -83,6 +89,7 @@ Linux Only
Dectris Pilatus 2 & 3 <camera/pilatus/doc/index> Dectris Pilatus 2 & 3 <camera/pilatus/doc/index>
Fli <camera/fli/doc/index> Fli <camera/fli/doc/index>
ImXpad <camera/imxpad/doc/index> ImXpad <camera/imxpad/doc/index>
Lambda <camera/lambda/doc/index>
Merlin <camera/merlin/doc/index> Merlin <camera/merlin/doc/index>
Pixirad <camera/pixirad/doc/index> Pixirad <camera/pixirad/doc/index>
PointGrey <camera/pointgrey/doc/index> PointGrey <camera/pointgrey/doc/index>
...@@ -93,6 +100,7 @@ Linux Only ...@@ -93,6 +100,7 @@ Linux Only
Ueye <camera/ueye/doc/index> Ueye <camera/ueye/doc/index>
Ultra <camera/ultra/doc/index> Ultra <camera/ultra/doc/index>
V4l2 <camera/v4l2/doc/index> V4l2 <camera/v4l2/doc/index>
Ximea <camera/ximea/doc/index>
Xpad <camera/xpad/doc/index> Xpad <camera/xpad/doc/index>
Xspress3 <camera/xspress3/doc/index> Xspress3 <camera/xspress3/doc/index>
Xh <camera/xh/doc/index> Xh <camera/xh/doc/index>
...@@ -106,5 +114,6 @@ Windows and Linux ...@@ -106,5 +114,6 @@ Windows and Linux
Andor SDK2 <camera/andor/doc/index> Andor SDK2 <camera/andor/doc/index>
Basler <camera/basler/doc/index> Basler <camera/basler/doc/index>
Dhyana <camera/dhyana/doc/index>
RoperScientific (former Princeton) <camera/roperscientific/doc/index> RoperScientific (former Princeton) <camera/roperscientific/doc/index>
Simulator <camera/simulator/doc/index> Simulator <camera/simulator/doc/index>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment