Commits · master · LimaGroup / Lima-camera-maxipix

21 Sep, 2020 1 commit
- Merge branch '5-priamacq-false-minimum-period-calculation-in-startacq' into 'master' · ebfeb0f8
  Laurent Claustre authored Sep 21, 2020
```
Resolve "PriamAcq: wrong minimum period calculation in startAcq()"

Closes #5

See merge request !7
```
  ebfeb0f8
15 Sep, 2020 1 commit
- conda: add 'make' package as build deps for new runner conda-builder-cos7 · 837639c6
  Laurent Claustre authored Sep 15, 2020
  
  837639c6
11 Sep, 2020 2 commits
- conda: remove python 2.7/3.6 from support and clean for useless dep on numpy · 93ed366c
  Laurent Claustre authored Sep 11, 2020
  
  93ed366c
- PriamAcq: fixed wrong period calculation and only check timing for trigger mode Internal · cadb32f7
  Laurent Claustre authored Sep 11, 2020
  
  cadb32f7
11 Sep, 2019 2 commits
- Merge branch 'prepare-1.9' into 'master' · 036f4a7b
  Samuel Debionne authored Sep 11, 2019
```
Prepare 1.9

See merge request !6
```
  036f4a7b
- Prepare 1.9 · 502ac418
  Laurent Claustre authored Sep 11, 2019
  
  502ac418
19 Jul, 2019 1 commit
- Moved tango plugin documentation from applications/tango/python to here · d3735e96
  Laurent Claustre authored Jul 19, 2019
  
  d3735e96
18 Jul, 2019 1 commit
- Merge branch '4-dac-control-api-missing' into 'master' · 120a56b4
  Laurent Claustre authored Jul 18, 2019
```
Resolve "dac control api missing"

Closes #4

See merge request !5
```
  120a56b4
12 Jun, 2019 2 commits
- Hoops, error on getter signature for sip · 0930a9f4
  Laurent Claustre authored Jun 12, 2019
  
  0930a9f4
- Export to python API, Dacs handler and few functions · 3d8e9757
  Laurent Claustre authored Jun 12, 2019
  
  3d8e9757
08 Feb, 2019 1 commit
- Add README.md · 80a7461a
  Laurent Claustre authored Feb 08, 2019
  
  80a7461a
04 Feb, 2019 2 commits
- Rename CAMERA_ENABLE_PYTHON · 938514c1
  Samuel Debionne authored Feb 04, 2019
  
  938514c1
- Rename CAMERA_ENABLE_PYTHON · 7818a8ab
  Samuel Debionne authored Feb 04, 2019
  
  7818a8ab
24 Jan, 2019 1 commit
- Update conda_build_config.yaml: python 3.7 · d8a44f68
  Laurent Claustre authored Jan 24, 2019
  
  d8a44f68
10 Jan, 2019 1 commit
- Merge branch 'fix_build_submodules2' into 'master' · 831ca95e
  Alejandro Homs Puron authored Jan 10, 2019
  
  831ca95e
04 Jan, 2019 1 commit
- Fix SIP include dirs (missing espia) in lima master compilation · 048e93e6
  Samuel Debionne authored Jan 04, 2019
  
  048e93e6
06 Nov, 2018 1 commit
- Fix project version · f937b643
  Samuel Debionne authored Nov 06, 2018
  
  f937b643
05 Oct, 2018 1 commit
- Merge branch '56-build-standalone-camera-packages' into 'master' · efd55c98
  Laurent Claustre authored Oct 05, 2018
```
Update the build system to support devel conda package

See merge request !3
```
  efd55c98
04 Oct, 2018 1 commit
- Fix python 3 issues · 16273576
  Samuel Debionne authored Oct 03, 2018
  
  16273576
01 Oct, 2018 2 commits
- Update to SIP 4.19 and build for python 2 on Linux · 5346566a
  Samuel Debionne authored Oct 01, 2018
  
  5346566a
- Update the build sytem to support devel conda package · 654e4619
  Samuel Debionne authored Aug 03, 2018
  
  654e4619
26 Sep, 2018 1 commit
- Merge branch 'accumulation_hwtrigger_fix' into 'master' · 466f57c7
  Laurent Claustre authored Sep 26, 2018
```
allow accumulation with external trigger and external gate modes

Closes #2

See merge request !2
```
  466f57c7
14 Sep, 2018 1 commit
- allow accumulation with external trigger and external gate modes · c122ee32
  bliss administrator authored Sep 14, 2018
  
  c122ee32
02 Aug, 2018 1 commit
- Merge branch '16-generate-conda-packages' into 'master' · 2feb300f
  Samuel Debionne authored Aug 02, 2018
```
16 generate conda packages

See merge request !1
```
  2feb300f
18 May, 2018 2 commits
- Fix typo · 861cbc2c
  Samuel Debionne authored May 18, 2018
  
  861cbc2c
- Insert stream operator<<() is not defined for ostringstream · 2d42c0d2
  Samuel Debionne authored May 18, 2018
  
  2d42c0d2
09 Apr, 2018 1 commit
- Update the documentation (build with CMake) and cleanup · 491b097a
  Samuel Debionne authored Apr 09, 2018
  
  491b097a
27 Feb, 2018 1 commit
- Merge branch 'cmake' · 549b83af
  Sebastien Petitdemange authored Feb 27, 2018
  
  549b83af
11 Jan, 2018 2 commits
- New tag : maxipix-1.7.3 · e4d993f6
  Laurent Claustre authored Jan 11, 2018
  
  e4d993f6
- Merge branch 'port_debian8' into 'master' · 96af0121
  Alejandro Homs Puron authored Jan 11, 2018
  
  96af0121
30 Nov, 2017 1 commit
- Updated and fixed for backward comp with sip < 4.12 · 44c7910b
  Laurent Claustre authored Nov 30, 2017
  
  44c7910b
29 Nov, 2017 2 commits
- port to debian8 just needed some extrs "#include" of std header files · 37d49b63
  Laurent Claustre authored Nov 29, 2017
  
  37d49b63
- port to debian8 just needed some extrs "#include" of std header files · 37edf777
  Laurent Claustre authored Nov 29, 2017
  
  37edf777
04 Jul, 2017 2 commits
- Merge branch 'cmake' of gitlab.esrf.fr:aitor/Lima-camera-maxipix into cmake · d7c1d7c3
  Laurent Claustre authored Jul 04, 2017
```
Conflicts:
	CMakeLists.txt
```
  d7c1d7c3
- Use macro CameraRunSIP · 22d238d7
  Laurent Claustre authored Jul 04, 2017
  
  22d238d7
03 Jul, 2017 1 commit
- Using functions in new cmake file instead of including differents cmake files. · 5c09d692
  Aitor Henry authored Jul 03, 2017
  
  5c09d692
28 Jun, 2017 1 commit
- Should be final CMake. · f6fa3890
  Aitor Henry authored Jun 28, 2017
  
  f6fa3890
23 Jun, 2017 1 commit
- Used file instead of configure_file for copying full directory · cbeafd46
  Laurent Claustre authored Jun 23, 2017
  
  cbeafd46
22 Jun, 2017 1 commit
- Improved test prgs · 40aa27d6
  Laurent Claustre authored Jun 22, 2017
  
  40aa27d6
21 Jun, 2017 1 commit
- Updated test prg for future cmake integration · 8e2f7cb2
  Laurent Claustre authored Jun 21, 2017
  
  8e2f7cb2