Commit Graph

1685 Commits

Author SHA1 Message Date
Mark Rivers
bf9421a514 Merge pull request #31 from dls-controls/fix/temperature-control
Temperature parameter is set on startup to current temperature. Inval…
2020-03-04 13:15:09 -06:00
Mark Rivers
30d52f7843 Merge pull request #35 from dls-controls/fix/catch-ADCSpeed-error
Catch exception thrown while changing ADCSpeed during acquisition
2020-03-04 13:10:46 -06:00
Tom Trafford
0284160349 Catch exception thrown while changing ADCSpeed during acquisition 2020-02-26 09:25:25 +00:00
Benjamin Bradnick
6b60c8c07d Temperature parameter is set on startup to current temperature. Invalid temperatures no longer update the parameter. 2020-02-17 16:38:31 +00:00
Mark Rivers
f38dbf0012 Clean up 2020-02-14 08:49:15 -06:00
Mark Rivers
5215cbccae Improved tables, removed unneeded columns, fixed lists 2020-02-13 05:49:23 -06:00
Mark Rivers
47183c09d7 Add bob conversion 2020-01-25 11:37:24 -06:00
Mark Rivers
2eb495df73 Add bob 2020-01-25 11:37:04 -06:00
Mark Rivers
157143f018 Add op directory 2020-01-25 11:36:52 -06:00
Mark Rivers
8c826b3217 Updated documentation to point to github.io 2019-12-05 16:49:30 -06:00
Mark Rivers
6c4d6d98d3 Note for R2-9 2019-12-05 11:37:26 -06:00
Mark Rivers
94a2307982 Changed title; fixed error with br 2019-12-05 09:30:01 -06:00
Mark Rivers
fe4ba31347 Notes for R2-9 2019-12-05 09:29:15 -06:00
Mark Rivers
591bbca85d Fixed bug with ADShutterMode; setupShutter was not being called when ADShutterMode changed 2019-12-05 09:28:47 -06:00
Mark Rivers
c0acd78f50 Merge pull request #26 from pheest/master
Added capability for CCD multi-track use.
2019-12-02 10:57:40 -06:00
Mark Rivers
01bdd4e95a Converted tables from raw html to flat-table; fixed links 2019-12-02 08:52:42 -06:00
Mark Rivers
250a1f5ad3 Merge pull request #22 from stuwilkins/add_sphinx_docs
Initial version of Andor docs converted to Sphinx.
2019-12-01 17:43:26 -06:00
Heesterman, Peter J
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.
2019-11-28 12:06:03 +00:00
Mark Rivers
4bbfb42864 Merge pull request #27 from mp49/master
Updated R2-5 release notes
2019-11-22 15:16:43 -06:00
Matt Pearson
985e0c201c Updated R2-5 release notes
Added notes about the change to default behavior to the camera shutter and PreAmpGain, and how to retain previous behavior.
2019-11-22 15:11:51 -05:00
Heesterman, Peter J
5e34010855 Added capability for CCD multi-track use.
This is typically used in spectroscopy applications.

Also, there was an issue that the dataTask thread was unable to exit, preventing clean shut-down when the user types 'exit'.
2019-11-20 11:14:21 +00:00
Mark Rivers
087d9c1352 Fixed number of arguments parameter in iocshFuncDef, was 7 increased to 8 2019-11-11 06:48:35 -06:00
Mark Rivers
9b26e5c36a Replace http with https 2019-04-01 16:41:12 -05:00
Stuart B. Wilkins
972e80960c Initial version of Andor docs converted to Sphinx. 2019-02-24 13:18:46 -05:00
Mark Rivers
e06e61ae96 Merge pull request #21 from areaDetector/multiple_cameras
Multiple cameras
2018-12-19 17:58:33 -06:00
Mark Rivers
73757f9661 Change from epicsInt32 to at_32 to compile on 64-bit Windows 2018-12-19 17:57:28 -06:00
Mark Rivers
48e51b0074 Merge pull request #20 from hinxx/multiple_cameras
use device serial number to select the camera (0 for any camera)
2018-12-19 17:39:11 -06:00
Hinko Kocevar
7641988b51 use device serial number to select the camera (0 for any camera) 2018-12-18 15:23:38 +01:00
Mark Rivers
5808038639 Added cameraID to andorCCDConfig 2018-12-05 09:47:31 -06:00
Mark Rivers
a0787d23c2 Add cameraID to constructor to select which camera in a multiple camera system; select camera 2018-12-04 17:04:19 -06:00
Mark Rivers
a39a033940 Add cameraID to constructor to select which camera in a multiple camera system 2018-12-04 17:04:06 -06:00
Mark Rivers
1589ecddd5 Merge pull request #18 from jerryjiahaha/master
missing comma in `addprefix` function
2018-08-15 16:17:31 -05:00
JerryJia
a0860fed15 missing comma in addprefix function
USR_INCLUDES += $(addprefix -I, $(XML2_INCLUDE))
2018-08-04 02:51:52 +08:00
Mark Rivers
7924393d04 Set R2-8 release date R2-8 2018-07-01 18:14:09 -05:00
Mark Rivers
c844710f26 Notes for R2-8 2018-07-01 18:13:24 -05:00
Mark Rivers
02ee37f819 R2-8 2018-07-01 18:12:29 -05:00
Mark Rivers
e0d9cc34be Use addprefix to add -I 2018-07-01 08:59:00 -05:00
Mark Rivers
ee3a307bf4 Added NumQueuedArrays, ADBuffers 2018-07-01 08:58:13 -05:00
Mark Rivers
7c50914bfb Changed to use RELEASE_LIBS_INCLUDE and RELEASE_PRODS_INCLUDE 2018-02-03 09:16:29 -06:00
Mark Rivers
89f30cca96 Notes for R2-7 R2-7 2018-01-31 12:21:12 -06:00
Mark Rivers
fe1cbc9798 Updated conversions with improved medm adl files 2018-01-31 12:19:32 -06:00
Mark Rivers
6ff8eb8563 Fixed size and datatype of text and text update widgets 2018-01-31 12:18:33 -06:00
Mark Rivers
63d055e10c New file for OPI conversions 2018-01-31 12:09:52 -06:00
Mark Rivers
31062a1fd4 Changed DRIVER_REVISION from 6 to 7 2018-01-31 12:00:10 -06:00
Mark Rivers
24bae995e0 Merge pull request #17 from hinxx/check_error
Check for error from SDK.
2018-01-31 11:56:47 -06:00
Hinko Kocevar
97893329be Check for error from SDK. 2018-01-29 16:27:46 +01:00
Mark Rivers
22531574ff Must use different Andor header files on Windows and Linux 2018-01-04 16:16:24 -06:00
Mark Rivers
5290b0b07a Merge pull request #15 from mpdunning/master
Add support for Frame Transfer Mode, Vertical Shift Speed
2017-12-13 09:08:50 -06:00
Mark Rivers
d9891d8e61 Merge pull request #14 from hinxx/master
Andor SDK 2.102.30034.0
2017-12-13 09:08:18 -06:00
Hinko Kocevar
e177c51930 fix soflinks for .so and .so.2 files 2017-12-13 09:27:42 +01:00