Commit Graph

122 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
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
591bbca85d Fixed bug with ADShutterMode; setupShutter was not being called when ADShutterMode changed 2019-12-05 09:28:47 -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
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
73757f9661 Change from epicsInt32 to at_32 to compile on 64-bit Windows 2018-12-19 17:57:28 -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
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
JerryJia
a0860fed15 missing comma in addprefix function
USR_INCLUDES += $(addprefix -I, $(XML2_INCLUDE))
2018-08-04 02:51:52 +08: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
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
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
Michael Dunning
6d2be9f6b0 Add try/catch block for call to SetBaselineClamp() 2017-12-12 12:17:41 -08:00
Michael Dunning
81138d5a18 Add support for Vertical Shift Period 2017-12-12 12:17:29 -08:00
Michael Dunning
afc7109cd2 Add support for Frame Transfer Mode 2017-12-12 12:16:55 -08:00
Hinko Kocevar
96a3c336ab WIP 2017-12-12 15:43:00 +01:00
Hinko Kocevar
286201f2fa add ftdi_table.c and linux-x86_64 compiled libd2xx_table.so 2017-12-12 15:41:52 +01:00
Hinko Kocevar
3f3cd4cabf fix ShamrockGetCalibration() errors 2017-12-12 14:31:31 +01:00
Hinko Kocevar
7a8cc75b9b do not use deprecated asynPortDriver() 2017-12-12 14:03:09 +01:00
Mark Rivers
917322ad52 Added missing -I to USR_INCLUDES 2017-11-20 11:53:37 -06:00
Mark Rivers
dcb85833a3 Remove unlock() and lock() around call to doCallbacksGenericPointer; not needed and can cause problems 2017-11-04 13:03:15 -05:00
Mark Rivers
141bab2124 Changed DRIVERS_REVISION from 5 to 6 2017-09-27 10:48:52 -05:00
Mark Rivers
a61e494e92 Fixed screen for larger version of ADAttrFile.adl 2017-07-03 15:46:45 -05:00
Mark Rivers
f330cccd41 Add XML2_INCLUDE 2017-04-30 15:36:57 -05:00
Mark Rivers
335e1c0ae1 Change from using TinyXml to libxml2 2017-04-22 11:43:37 -05:00
Mark Rivers
15c81d2242 Change from using TinyXml to libxml2 2017-04-22 11:42:45 -05:00
Mark Rivers
c2bbe5f114 Changed AShutter choice names to be closer to their documentation 2017-01-09 12:27:22 -06:00
Mark Rivers
9aab9bbddf Changed AShutter choice names to be closer to their documentation 2017-01-09 12:27:02 -06:00
Mark Rivers
0d3b9d244b Added EMGain PVs 2017-01-09 12:26:19 -06:00
Mark Rivers
18ca996943 Added more AndorShutterMode choices 2017-01-09 12:25:01 -06:00
Mark Rivers
1627ed5fbb Added EMGain and ReadoutMode PVs 2017-01-09 12:23:39 -06:00
Mark Rivers
7e6156906b Merge branch 'master' into epics_shutter 2017-01-09 10:29:44 -06:00
Mark Rivers
a632aff600 Merge Hinko's addition of AndorReadoutMode 2017-01-09 10:20:52 -06:00
Mark Rivers
23b828168a New shutter modes 2017-01-09 08:38:44 -06:00
Mark Rivers
27ff6f008e Support for EPICS shutter 2017-01-09 08:38:21 -06:00
Mark Rivers
156fbd251b New shutter modes 2017-01-09 08:37:57 -06:00