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
Mark Rivers
d73ef8e0b4
Added SerialNumber, FirmwareVersion, SDKVersion, DriverVersion, and ADCoreVersion
2017-01-03 17:52:52 -06:00
Mark Rivers
6d7790e6a4
Fixed bug with AndorPreAmpGain; previously it was not actually calling SetPreAmpGain() in their SDK.
...
Implemented ReverseX and ReverseY via call to SetImageFlip().
Implemented SerialNumber, FirmwareVersion, SDKVersion, DriverVersion, and ADCoreVersion which were added in ADCore R2-6.
2017-01-03 17:49:15 -06:00
Mark Rivers
9d014865a7
Removed lines that disabled ReverseX and ReverseY because these are now implemented
2017-01-03 17:48:44 -06:00
Hinko Kocevar
39db9c7edf
Add support for detector serial number.
2016-11-09 09:52:18 +01:00
Hinko Kocevar
eb3ff72721
Modified OPI to support readout mode selection.
2016-07-14 15:51:50 +02:00
Hinko Kocevar
962518fc5b
Add support for Full Vertical Binning readout mode.
2016-07-13 17:00:17 +02:00
Mark Rivers
30de0dd746
Merge pull request #7 from hinxx/init-no-segfault
...
Do not segfault if camera initialization fails in constructor.
I am merging this pull request. Note that I have merged a previous pull request for EMGain support #6 into master. The RELEASE.md file for R2-5 is now:
R2-5 (July XXX, 2016)
----
* Added support for Electron Multiplying (EM) Gain. Thanks to Mike Dunning for this.
* Add ability to set the BaselineClamp in the Andor SDK. Thanks to Matt Pearson for this.
* Enforce minimum values of ADShutterOpenDelay and ADShutterCloseDelay based on query of SDK.
* Fix bug when setting MinX and MinY with binning. There was an incorrect factor of 2 present.
Thanks to Hinko Kocevar for this fix.
@hinxx you will need to update your master because of the previous merges.
2016-07-13 07:34:04 -05:00
Mark Rivers
14b6cac39d
Merge in EMGain support
2016-07-13 07:24:06 -05:00
Hinko Kocevar
4a566875fd
Provide descriptive error message for not supported features.
2016-07-13 11:10:26 +02:00
Hinko Kocevar
2d102d67dd
Check for shutter support before calling SetShutter().
...
In order to avoid signaling error if SetShutter() call in setupShutter()
would fail.
2016-07-13 11:06:08 +02:00
Hinko Kocevar
c7b253b037
Do not segfault if camera initialization fails in constructor.
...
Move allocation of enum string before calling Andor SDK init.
mInitOK is used to avoid divide by zero in setupAcquisition().
2016-07-13 10:43:10 +02:00
Mark Rivers
f4b38716f2
Merge branch 'master' of github.com:areaDetector/ADAndor
2016-07-12 16:55:41 -05:00
Mark Rivers
5ac3d236b0
Fixed bug in setupAcquisition when setting minX and minY based on binning; there was an incorrect factor of 2 present
2016-07-12 16:53:12 -05:00
Matthew Pearson
5ca26492e6
Add the ability to set the BaselineClamp setting in the Andor SDK.
2016-06-23 12:00:48 -04:00
Mark Rivers
a32342a2e3
Enforce minimum values of ADShutterCloseDelay and ADShutterOpenDelay based on query to SDK
2016-01-12 14:28:58 -06:00
timmmooney
48e35cc8b2
new display-file translations
2015-06-25 14:09:16 -05:00
