1729 Commits

Author SHA1 Message Date
Hinko Kocevar
f2db3be024 update linux headers with SDK version 2.102.30034.0 2017-12-12 15:44:36 +01:00
Hinko Kocevar
5a3f87db8a update documentation with notes about SDK 2.102.30034.0 2017-12-12 15:43:16 +01: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
430c7f01f2 add SDK 102.30034.0 for linux-x86 2017-12-12 15:27:08 +01:00
Hinko Kocevar
3f3cd4cabf fix ShamrockGetCalibration() errors 2017-12-12 14:31:31 +01:00
Hinko Kocevar
75e78403c4 libUSBI2C.so and libUSBI2C.so.2 links 2017-12-12 14:11:12 +01:00
Hinko Kocevar
c6cd78569c add Andor SDK 2.102.30034.0 2017-12-12 14:05:58 +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
767c706dee Notes for R2-6 R2-6 2017-07-04 12:29:06 -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
3a73ff4590 Notes for R2-6 2017-04-22 12:02:02 -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
7511cd9214 Fixed release date of R2-5 R2-5 2017-02-19 15:25:13 -06:00
Mark Rivers
0a4b166047 New version for R2-5 2017-01-09 12:40:14 -06:00
Mark Rivers
a3a7759753 Changes for R2-5; minor reformatting 2017-01-09 12:39:59 -06:00
Mark Rivers
7ad2637810 Added note about EPICS shutter control for R2-5 2017-01-09 12:29:55 -06: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
cb2249ab64 Made win32-x86-static default ARCH; added dllPath.bat to TARGETS 2017-01-03 17:53:39 -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
Mark Rivers
6f87f27a48 Notes for R2-5 2017-01-03 17:48:01 -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
Hinko Kočevar
c9b4965341 Merge pull request #1 from areaDetector/master
update to upstream
2016-07-13 15:03:27 +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
0097e178fa Cleaned up R2-5 release notes 2016-07-13 07:26:26 -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
cbaf6021fc Updates for R2-5 2016-07-12 18:44:09 -05:00
Mark Rivers
4b7ba8a030 Merge branch 'mpdunning-master' 2016-07-12 18:41:49 -05:00
Mark Rivers
03a1468ac5 Notes for R2-5 2016-07-12 17:03:14 -05:00