Commits · master · LimaGroup / Lima-camera-pco

03 Oct, 2019 3 commits
- Merge branch 'imgNr1' into 'master' · add903c1
  Roberto Arturo Homs-Regojo authored Oct 03, 2019
```
refactoring pco imgNr

See merge request !13
```
  add903c1
- Merge branch 'master' into 'imgNr1' · d3839915
  Roberto Arturo Homs-Regojo authored Oct 03, 2019
```
# Conflicts:
#   include/PcoGitVersion.h
```
  d3839915
- imgNr refactoring · ab68ec30
  Roberto Arturo Homs-Regojo authored Sep 30, 2019
  
  ab68ec30
02 Oct, 2019 2 commits

Merge branch 'pcolin1' into 'master' · b0a98c2c
Roberto Arturo Homs-Regojo authored Oct 02, 2019
```
configure/update conda meta.yaml cmake for linux

See merge request !11
```
b0a98c2c

configure/update conda meta.yaml cmake for linux · 73a71f3d

Roberto Arturo Homs-Regojo authored Sep 26, 2019

conda / disable test
include pco git version in linux
incuded siso-sdk
removed siso-sdk from the run requirements (linking with the siso-sdk of the pc)

73a71f3d

01 Oct, 2019 1 commit
- Remove siso from the run requirements · 412583f2
  Samuel Debionne authored Oct 01, 2019
  
  412583f2
30 Sep, 2019 5 commits
- [wip] fix syntax ... · 73aef6ea
  Roberto Arturo Homs-Regojo authored Sep 30, 2019
  
  73aef6ea
- [wip] delete sdkSisoLin, include pco git version in linux · 40e13afe
  Roberto Arturo Homs-Regojo authored Sep 30, 2019
  
  40e13afe
- [wip] fix pco sdk lin version · 3f8229a9
  Roberto Arturo Homs-Regojo authored Sep 30, 2019
  
  3f8229a9
- [wip] fix the lib/inc path for siso-skd · a6b6bff2
  Roberto Arturo Homs-Regojo authored Sep 30, 2019
  
  a6b6bff2
- Add siso-sdk to the requirements · 4a63969e
  Samuel Debionne authored Sep 30, 2019
  
  4a63969e
26 Sep, 2019 11 commits
- [wip] conda / disable test · 9b58ae67
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  9b58ae67
- Merge branch 'pcolin' of gitlab.esrf.fr:limagroup/lima-camera-pco into pcolin · a140023e
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  a140023e
- [wip] chmod +x for the libs · c08e0b67
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  c08e0b67
- Update meta.yaml · fcac496e
  Samuel Debionne authored Sep 26, 2019
  
  fcac496e
- [wip] conda temporary PcoGitVersion.h · b481bfa3
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  b481bfa3
- [wip] fix SISO dir in cmake / rename SISO dir · b9c1cc26
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  b9c1cc26
- - add SISO sdk linnux · 01df8159
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  01df8159
- [wip] conda linux · b4952899
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  b4952899
- [wip] conda / linux · 124f9556
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  124f9556
- - CI - linux (from basler) · 3e419732
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  3e419732
- - update with master · 96037234
  Roberto Arturo Homs-Regojo authored Sep 26, 2019
  
  96037234
25 Sep, 2019 2 commits
- Merge branch 'prepare-1.9' into 'master' · a6696dc3
  Roberto Arturo Homs-Regojo authored Sep 25, 2019
  
  a6696dc3
- - improvement of sdk call getSizes · d91713e6
  Laurent Claustre authored Sep 25, 2019 and Roberto Arturo Homs-Regojo committed Sep 25, 2019
```
- fix resolution for win
```
  d91713e6
19 Jul, 2019 1 commit
- Moved tango plugin documentation from applications/tango/python to here · c77013bd
  Laurent Claustre authored Jul 19, 2019
  
  c77013bd
02 Jul, 2019 10 commits
- [wip] include pco-sdk · 5bcda340
  Roberto Arturo Homs-Regojo authored Jul 02, 2019
  
  5bcda340
- [wip] no pco sdk / lima debug macro · 7f4e06b3
  Roberto Arturo Homs-Regojo authored Jul 02, 2019
  
  7f4e06b3
- [wip] no pco sdk · 5752720f
  Roberto Arturo Homs-Regojo authored Jul 02, 2019
  
  5752720f
- [wip] NOP · 2cdfe577
  Roberto Arturo Homs-Regojo authored Jul 02, 2019
  
  2cdfe577
- [wip] minor verbosity level · ad6a813d
  Roberto Arturo Homs-Regojo authored Jul 02, 2019
  
  ad6a813d
- One more try · ce8e5413
  Samuel Debionne authored Jul 02, 2019
  
  ce8e5413
- Add /verbosity:detailed · 057150fe
  Samuel Debionne authored Jul 02, 2019
  
  057150fe
- [wip] fix cmakeList · 98e8d0cd
  Roberto Arturo Homs-Regojo authored Jul 02, 2019
  
  98e8d0cd
- [wip] temp stopRec inside _xferImage() · c54c2c8f
  Roberto Arturo Homs-Regojo authored Jul 02, 2019
  
  c54c2c8f
- [wip] cmake win / fix · d64f3e1c
  Roberto Arturo Homs-Regojo authored Jul 02, 2019
  
  d64f3e1c
28 Jun, 2019 1 commit
- Pin lima core version to 1.8 · ecdd390b
  Samuel Debionne authored Jun 28, 2019
  
  ecdd390b
27 Jun, 2019 4 commits
- Merge branch 'master-work' into 'master' · 71d64456
  Roberto Arturo Homs-Regojo authored Jun 27, 2019
```
Master work

See merge request !8
```
  71d64456
- Master work · 8c3ddea5
  Roberto Arturo Homs-Regojo authored Jun 27, 2019
  
  8c3ddea5
- Merge branch 'master' of gitlab.esrf.fr:limagroup/Lima-camera-pco · 129000ad
  Roberto Arturo Homs-Regojo authored Jun 27, 2019
  
  129000ad
- Merge branch 'sytle' into 'master' · 8d8a5c56
  Roberto Arturo Homs-Regojo authored Jun 27, 2019
```
Sytle

See merge request !7
```
  8d8a5c56