ed2698f66a
Merge pull request #59 from keenanlang/master
Mark Rivers
2024-01-23 10:57:04 -06:00
2722b7240e
Specify x86 to avoid linux-arm
keenanlang
2024-01-07 21:12:47 -06:00
2eb2fa3421
Use OS_CLASS and ARCH_CLASS
keenanlang
2024-01-07 21:03:45 -06:00
9a077b0704
use new updateTimeStamps method
James Souter
2023-11-17 09:17:23 +00:00
2c4265d493
base frame timestamp off epicsTS
James Souter
2023-11-16 10:10:02 +00:00
5a2f546858
Update link for Github Pages docs
Mark Rivers
2023-03-14 12:02:10 -05:00
f9b3e897de
Merge pull request #55 from hz-b/wait_done
Mark Rivers
2023-03-14 12:01:08 -05:00
558fcc0b89
Revert "changed line endings"
Will Smith
2023-03-02 16:31:21 +00:00
dc6463c7e7
changes required to wait before setting Busy
Will Smith
2023-03-02 16:31:07 +00:00
7c55466343
changed line endings
Will Smith
2023-03-02 16:29:22 +00:00
262f15bd87
undoing
Will Smith
2023-03-02 16:27:54 +00:00
d88206e027
wait for the ADStatus to change, allow other threads to change
Will Smith
2023-03-01 14:05:11 +00:00
71ba531999
Fix logic waiting for camera actually being done
Mark Rivers
2023-02-28 09:02:22 -06:00
440176e7c0
Wait for the status thread to set ADStatus to something other than ADStatusAcquire in the dataTask before finishing an acquisition
Mark Rivers
2023-02-24 16:06:47 -06:00
f4f28bdba1
Merge pull request #50 from pheest/master
Mark Rivers
2022-02-10 06:40:38 -06:00
96aef8af8f
Only call SetVSAmplitude if the camera supports it. (Issue #49)
Heesterman, Peter J
2022-02-10 08:38:22 +00:00
ccad8dc0b9
Build test programs
Mark Rivers
2022-02-02 20:41:05 -06:00
6f3a1f440d
Merge pull request #44 from sudilav/master
Mark Rivers
2021-10-25 09:08:23 -05:00
e17010bca8
Update to correct WITH rather than USE
sudilav
2021-10-25 15:03:14 +01:00
c7b8075c9c
Merge pull request #42 from pheest/master
Mark Rivers
2021-08-25 11:00:16 -04:00
7dce622ee3
Corrected pixel index misunderstanding. areaDetector uses 0-based indexes, whereas the Andor API uses 1-based indexes.
Heesterman, Peter J
2021-08-25 14:55:24 +01:00
546f31c29f
Change and to && to compiler on Windows
Mark Rivers
2020-03-23 17:42:24 -05:00
92dab36a11
Merge pull request #40 from dls-controls/fix/temperatureControl
Mark Rivers
2020-03-20 06:44:02 -05:00
5d3277e549
Fixed logic from < to >
Tom Trafford
2020-03-20 09:29:25 +00:00
22abc2a3c4
Merge pull request #39 from dls-controls/fix/temperatureControl
Mark Rivers
2020-03-19 12:57:59 -05:00
1b58f21f6d
Added check in constructor before setting temperature
Tom Trafford
2020-03-18 14:01:52 +00:00
112ab065de
Merge pull request #37 from dls-controls/fix/destructor-hanging
Mark Rivers
2020-03-16 17:01:07 -05:00
557cbf8f00
Added check in desctructor to see if it had errored
Tom Trafford
2020-03-16 11:20:55 +00:00
4b803b4585
Merge pull request #34 from dls-controls/fix/wait-for-acquire
Mark Rivers
2020-03-10 07:25:43 -05:00
4027f3656f
Add ref
Mark Rivers
2020-03-05 10:14:40 -06:00
bcce3518fe
Improve st.cmd
Mark Rivers
2020-03-05 10:14:17 -06:00
bf9421a514
Merge pull request #31 from dls-controls/fix/temperature-control
Mark Rivers
2020-03-04 13:15:09 -06:00
30d52f7843
Merge pull request #35 from dls-controls/fix/catch-ADCSpeed-error
Mark Rivers
2020-03-04 13:10:46 -06:00
ee79be3f5a
Re-added comment for dataTask event
Benjamin Bradnick
2020-02-26 14:12:54 +00:00
0284160349
Catch exception thrown while changing ADCSpeed during acquisition
Tom Trafford
2020-02-25 17:21:38 +00:00
30bc883ea5
Re-add setting status to asynError when starting acquisition throws exception
Benjamin Bradnick
2020-02-21 09:09:38 +00:00
d2320b8b76
Acquisition setup and start now occur in writeInt32
Benjamin Bradnick
2020-02-21 09:03:40 +00:00
323eece01c
Cleaned up comments
Benjamin Bradnick
2020-02-20 13:19:40 +00:00
45b8b8af12
Revert "Now set ADAcquire parameter to 1 after detector acquisition has started"
Benjamin Bradnick
2020-02-20 13:15:44 +00:00
86153c20ca
Now set ADAcquire parameter to 1 after detector acquisition has started
Benjamin Bradnick
2020-02-19 11:15:00 +00:00
6b60c8c07d
Temperature parameter is set on startup to current temperature. Invalid temperatures no longer update the parameter.
Benjamin Bradnick
2020-02-17 16:38:31 +00:00
f38dbf0012
Clean up
Mark Rivers
2020-02-14 08:49:15 -06:00
47183c09d7
Add bob conversion
Mark Rivers
2020-01-25 11:37:24 -06:00
2eb495df73
Add bob
Mark Rivers
2020-01-25 11:37:04 -06:00
157143f018
Add op directory
Mark Rivers
2020-01-25 11:36:52 -06:00
8c826b3217
Updated documentation to point to github.io
Mark Rivers
2019-12-05 16:49:30 -06:00
6c4d6d98d3
Note for R2-9
Mark Rivers
2019-12-05 11:37:26 -06:00
94a2307982
Changed title; fixed error with br
Mark Rivers
2019-12-05 09:30:01 -06:00
fe4ba31347
Notes for R2-9
Mark Rivers
2019-12-05 09:29:15 -06:00
591bbca85d
Fixed bug with ADShutterMode; setupShutter was not being called when ADShutterMode changed
Mark Rivers
2019-12-05 09:28:47 -06:00
c0acd78f50
Merge pull request #26 from pheest/master
Mark Rivers
2019-12-02 10:57:40 -06:00
01bdd4e95a
Converted tables from raw html to flat-table; fixed links
Mark Rivers
2019-12-02 08:52:42 -06:00
250a1f5ad3
Merge pull request #22 from stuwilkins/add_sphinx_docs
Mark Rivers
2019-12-01 17:43:26 -06:00
9d60dfbc1f
Added call to mMultiTrack.storeTrackAttributes(pArray->pAttributeList) in order to store the attributes. Also, removed unnecessary use of NUM_ANDOR_DET_PARAMS and NUM_SR_PARAMS.
Heesterman, Peter J
2019-11-28 12:06:03 +00:00
4bbfb42864
Merge pull request #27 from mp49/master
Mark Rivers
2019-11-22 15:16:43 -06:00
985e0c201c
Updated R2-5 release notes
Matt Pearson
2019-11-22 15:11:51 -05:00
5e34010855
Added capability for CCD multi-track use. This is typically used in spectroscopy applications.
Heesterman, Peter J
2019-11-20 11:14:21 +00:00
087d9c1352
Fixed number of arguments parameter in iocshFuncDef, was 7 increased to 8
Mark Rivers
2019-11-11 06:48:35 -06:00
9b26e5c36a
Replace http with https
Mark Rivers
2019-04-01 16:41:12 -05:00
972e80960c
Initial version of Andor docs converted to Sphinx.
Stuart B. Wilkins
2019-02-24 13:18:46 -05:00
e06e61ae96
Merge pull request #21 from areaDetector/multiple_cameras
Mark Rivers
2018-12-19 17:58:33 -06:00
73757f9661
Change from epicsInt32 to at_32 to compile on 64-bit Windows
Mark Rivers
2018-12-19 17:57:28 -06:00
48e51b0074
Merge pull request #20 from hinxx/multiple_cameras
Mark Rivers
2018-12-19 17:39:11 -06:00
7641988b51
use device serial number to select the camera (0 for any camera)
Hinko Kocevar
2018-12-18 15:23:38 +01:00
5808038639
Added cameraID to andorCCDConfig
Mark Rivers
2018-12-05 09:47:31 -06:00
a0787d23c2
Add cameraID to constructor to select which camera in a multiple camera system; select camera
Mark Rivers
2018-12-04 17:04:19 -06:00
a39a033940
Add cameraID to constructor to select which camera in a multiple camera system
Mark Rivers
2018-12-04 17:04:06 -06:00
1589ecddd5
Merge pull request #18 from jerryjiahaha/master
Mark Rivers
2018-08-15 16:17:31 -05:00
a0860fed15
missing comma in addprefix function
JerryJia
2018-08-04 02:51:52 +08:00
7924393d04
Set R2-8 release date
R2-8
Mark Rivers
2018-07-01 18:14:09 -05:00
c844710f26
Notes for R2-8
Mark Rivers
2018-07-01 18:13:24 -05:00
02ee37f819
R2-8
Mark Rivers
2018-07-01 18:12:29 -05:00
e0d9cc34be
Use addprefix to add -I
Mark Rivers
2018-07-01 08:59:00 -05:00
ee3a307bf4
Added NumQueuedArrays, ADBuffers
Mark Rivers
2018-07-01 08:58:13 -05:00
7c50914bfb
Changed to use RELEASE_LIBS_INCLUDE and RELEASE_PRODS_INCLUDE
Mark Rivers
2018-02-03 09:16:29 -06:00
89f30cca96
Notes for R2-7
R2-7
Mark Rivers
2018-01-31 12:21:12 -06:00
fe1cbc9798
Updated conversions with improved medm adl files
Mark Rivers
2018-01-31 12:19:32 -06:00
6ff8eb8563
Fixed size and datatype of text and text update widgets
Mark Rivers
2018-01-31 12:18:33 -06:00
63d055e10c
New file for OPI conversions
Mark Rivers
2018-01-31 12:09:52 -06:00
31062a1fd4
Changed DRIVER_REVISION from 6 to 7
Mark Rivers
2018-01-31 12:00:10 -06:00
24bae995e0
Merge pull request #17 from hinxx/check_error
Mark Rivers
2018-01-31 11:56:47 -06:00
97893329be
Check for error from SDK.
Hinko Kocevar
2018-01-29 16:27:46 +01:00
22531574ff
Must use different Andor header files on Windows and Linux
Mark Rivers
2018-01-04 16:16:24 -06:00
5290b0b07a
Merge pull request #15 from mpdunning/master
Mark Rivers
2017-12-13 09:08:50 -06:00
d9891d8e61
Merge pull request #14 from hinxx/master
Mark Rivers
2017-12-13 09:08:18 -06:00
e177c51930
fix soflinks for .so and .so.2 files
Hinko Kocevar
2017-12-13 09:27:42 +01:00
5daf4e2e74
Update RELEASE.md
Michael Dunning
2017-12-12 11:08:52 -08:00
d69c97e28c
Update documentation
Michael Dunning
2017-12-12 11:03:30 -08:00
6d2be9f6b0
Add try/catch block for call to SetBaselineClamp()
Michael Dunning
2017-11-05 19:46:29 -08:00
81138d5a18
Add support for Vertical Shift Period
Michael Dunning
2017-11-05 18:13:10 -08:00
afc7109cd2
Add support for Frame Transfer Mode
Michael Dunning
2017-11-04 11:24:07 -07:00
soederqvist_a
Mark Rivers