Commits · master · Michal Gandor / Lima-camera-basler

21 Jun, 2021 1 commit
- Merge branch '15-color-camera-inttrigmult-is-not-working' into 'master' · 075d2eee
  Laurent Claustre authored Jun 21, 2021
```
Resolve "color camera IntTrigMult is not working"

Closes #15

See merge request limagroup/Lima-camera-basler!16
```
  075d2eee
17 Jun, 2021 1 commit
- fixed IntTrigMult for color camera · d7c17fa8
  bliss administrator authored Jun 17, 2021
  
  d7c17fa8
22 Feb, 2020 3 commits
- Stop support for python 2.7 and 3.6 · 7e3e3acb
  Laurent Claustre authored Feb 22, 2020
  
  7e3e3acb
- Merge branch '11-acquistionframecount-not-supported' into 'master' · 732b1c30
  Laurent Claustre authored Feb 22, 2020
```
Resolve "AcquistionFrameCount not supported"

Closes #11

See merge request limagroup/Lima-camera-basler!13
```
  732b1c30
- Merge branch '13-color-camera-segfault' into 'master' · b22164d2
  Laurent Claustre authored Feb 22, 2020
```
Resolve "color camera segfault"

Closes #13

See merge request limagroup/Lima-camera-basler!15
```
  b22164d2
17 Feb, 2020 4 commits
- Scout model does not support AcquisitionFrameCount · 72d4ab94
  Laurent Claustre authored Nov 14, 2019
  
  72d4ab94
- Error met with Scout model · 01f7283f
  Laurent Claustre authored Nov 12, 2019
  
  01f7283f
- Remove numpy from host dependencies · d3881886
  Samuel Debionne authored Feb 17, 2020
  
  d3881886
- fix empty buffer allocation · 62b59389
  bliss administrator authored Feb 17, 2020
  
  62b59389
21 Nov, 2019 2 commits
- Merge branch '12-live-mode-roi-segfault' into 'master' · 4388fa3a
  Samuel Debionne authored Nov 21, 2019
```
Resolve "live mode + roi = segfault"

Closes #12

See merge request limagroup/Lima-camera-basler!14
```
  4388fa3a
- Store the buffer size from SoftBufferMgr for later use and thus give the... · 30d46d6c
  Laurent Claustre authored Nov 21, 2019 and Samuel Debionne committed Nov 21, 2019
```
Store the buffer size from SoftBufferMgr for later use and thus give the correct number of bytes to StreamGrabber::RegisterBuffer()
```
  30d46d6c
03 Oct, 2019 2 commits
- Merge branch '10-missing-output1-line-source-setting' into 'master' · b7a71393
  Laurent Claustre authored Oct 03, 2019
```
Resolve "missing output1 line source setting"

Closes #10

See merge request limagroup/Lima-camera-basler!12
```
  b7a71393
- Added attributes for output1 line control · 8fa6c31c
  Laurent Claustre authored Oct 03, 2019
  
  8fa6c31c
11 Sep, 2019 2 commits
- Merge branch 'prepare-1.9' into 'master' · 826a4795
  Samuel Debionne authored Sep 11, 2019
```
Prepare 1.9

See merge request limagroup/Lima-camera-basler!11
```
  826a4795
- Prepare 1.9 · 06bb68eb
  Laurent Claustre authored Sep 11, 2019 and Samuel Debionne committed Sep 11, 2019
  
  06bb68eb
19 Jul, 2019 1 commit
- Moved tango plugin documentation from applications/tango/python to here · 8cc14e72
  Laurent Claustre authored Jul 19, 2019
  
  8cc14e72
20 Mar, 2019 3 commits
- Merge branch '5-manage-frame-error-for-b-w-camera-and-continuous-acq-frame' into 'master' · bca89ae3
  Samuel Debionne authored Mar 20, 2019
```
Resolve "Manage frame error for B/W camera and continuous acq frame"

Closes #5

See merge request limagroup/Lima-camera-basler!8
```
  bca89ae3
- Merge branch '8-add-testimage-control' into 'master' · b9849245
  Samuel Debionne authored Mar 20, 2019
```
Resolve "add TestImage control"

Closes #8

See merge request limagroup/Lima-camera-basler!9
```
  b9849245
- Resolve "add TestImage control" · a6e81b57
  Laurent Claustre authored Mar 20, 2019 and Samuel Debionne committed Mar 20, 2019
  
  a6e81b57
18 Mar, 2019 2 commits
- tango device force_video_mode passed as a string via get_control · 3c03d5c0
  Laurent Claustre authored Mar 18, 2019
  
  3c03d5c0
- mem. alloc failure proof · 620a387b
  Laurent Claustre authored Mar 18, 2019
  
  620a387b
20 Feb, 2019 2 commits
- Added and manage a new property force_video_mode to swich B/W cameras to video mode · 562a88cf
  Laurent Claustre authored Feb 20, 2019
  
  562a88cf
- local buffer is now managed by a unique method for color, B/W cameras and live mode · bc99bad2
  Laurent Claustre authored Feb 20, 2019
  
  bc99bad2
08 Feb, 2019 2 commits
- Update README.md · 66e83647
  Laurent Claustre authored Feb 08, 2019
  
  66e83647
- Add README.md · a3f7bb7a
  Laurent Claustre authored Feb 08, 2019
  
  a3f7bb7a
06 Feb, 2019 1 commit
- Make the camera non-copiable · d07056ee
  Samuel Debionne authored Feb 06, 2019
  
  d07056ee
23 Jan, 2019 1 commit
- Update conda_build_config.yaml to add python 3.7 · b6618d6f
  Laurent Claustre authored Jan 23, 2019
  
  b6618d6f
18 Jan, 2019 2 commits
- Merge branch 'master' of https://github.com/esrf-bliss/Lima-camera-basler · 23e26a6d
  Samuel Debionne authored Jan 18, 2019
  
  23e26a6d
- Merge pull request #24 from droldan/AcquisitionFrameRate · 17f83c4d
  Samuel Debionne authored Jan 18, 2019
```
Add AcquisitionFrameRate feature
```
  17f83c4d
21 Dec, 2018 1 commit
- Rename CAMERA_ENABLE_PYTHON · 09621d4c
  Samuel Debionne authored Dec 21, 2018
  
  09621d4c
06 Nov, 2018 1 commit
- Fix project version · 6df5d7d5
  Samuel Debionne authored Nov 06, 2018
  
  6df5d7d5
02 Oct, 2018 1 commit
- Merge branch '65-port-to-sip-4-19' into 'master' · b3de1291
  Laurent Claustre authored Oct 02, 2018
```
Update to SIP 4.19 and build for python 2 on Linux

See merge request limagroup/Lima-camera-basler!6
```
  b3de1291
01 Oct, 2018 1 commit
- Update to SIP 4.19 and build for python 2 on Linux · 445a3065
  Samuel Debionne authored Oct 01, 2018
  
  445a3065
24 Sep, 2018 1 commit
- Merge branch '56-build-standalone-camera-packages' into 'master' · dd25b396
  Laurent Claustre authored Sep 24, 2018
```
56 build standalone camera packages

See merge request !5
```
  dd25b396
20 Sep, 2018 3 commits
- Update the build sytem to support devel conda package · ae72f945
  Samuel Debionne authored Jul 31, 2018
```
Update FindPylon5 for 5.1 under Windows
```
  ae72f945
- Add standalone conda build and CI · 8f7d03bf
  Samuel Debionne authored Jul 30, 2018
  
  8f7d03bf
- Merge branch '4-inttrigmult-wrong-camera-status' into 'master' · eb94dde3
  Samuel Debionne authored Sep 20, 2018
```
Fixed Camera::getStatus() when trigger is IntTrigMulti and detector is Readout

Closes #4

See merge request !4
```
  eb94dde3
18 Sep, 2018 1 commit
- Fixed Camera::getStatus() when trigger is IntTrigMulti and detector is Readout · 5c3b6062
  bliss administrator authored Sep 18, 2018
  
  5c3b6062
08 Aug, 2018 1 commit

Merge branch '1-video-camera-internal_trigger_mullti-mode' into 'master' · 41382656

Laurent Claustre authored Aug 08, 2018

Fixed missing start of acquisition when camera is video and trigger mode is internal_trigger_multi

Closes #1

See merge request !3

41382656

03 Aug, 2018 1 commit
- Fixed missing start of acquisition when camera is video and trigger mode is internal_trigger_multi · 52cac647
  bliss administrator authored Aug 03, 2018
  
  52cac647