Merge pull request areaDetector#2 from areaDetector/master

updating to latest

RELEASE.md

@@ -22,14 +22,19 @@ files respectively, in the configure/ directory of the appropriate release of th
 
 Release Notes
 =============
-R2-5 (July XXX, 2016)
+R2-5 (January XXX, 2017)
 ----
 * 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.
-* Add support for Full Vertical Binning (FVB) readout mode.
+* Implemented ReverseX and ReverseY.
+* Fixed bug with AndorPreAmpGain; previously it was not actually calling SetPreAmpGain().
+* Added support for SerialNumber, FirmwareVersion, SDKVersion, DriverVersion, and ADCoreVersion which
+  were added in ADCore R2-6. 
+* Added support for Full Vertical Binning (FVB) readout mode. Thanks to Hinko Kocevar for this.
+* Added support for EPICS shutter control.
 
 R2-4 (September 15, 2015)
 ----

andorApp/Db/andorCCD.template

@@ -209,10 +209,16 @@ record(mbbo, "$(P)$(R)AndorShutterMode")
     field(PINI, "1")
     field(DTYP, "asynInt32")
     field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))ANDOR_SHUTTER_MODE")
-    field(ZRST, "Auto")
+    field(ZRST, "Fully Auto")
     field(ZRVL, "0")
-    field(ONST, "Open")
+    field(ONST, "Always Open")
     field(ONVL, "1")
+    field(TWST, "Always Closed")
+    field(TWVL, "2")
+    field(THST, "Open for FVB")
+    field(THVL, "4")
+    field(FRST, "Open for Any")
+    field(FRVL, "5")
 }
 
 record(bo, "$(P)$(R)AndorShutterExTTL")
@@ -391,19 +397,3 @@ record(mbbi, "$(P)$(R)ColorMode_RBV")
 {
     field(DISA, "1")
 }
-record(bo, "$(P)$(R)ReverseX")
-{
-    field(DISA, "1")
-}
-record(bi, "$(P)$(R)ReverseX_RBV")
-{
-    field(DISA, "1")
-}
-record(bo, "$(P)$(R)ReverseY")
-{
-    field(DISA, "1")
-}
-record(bi, "$(P)$(R)ReverseY_RBV")
-{
-    field(DISA, "1")
-}

andorApp/Db/andorCCD_settings.req

@@ -4,6 +4,9 @@ $(P)$(R)AndorShutterMode
 $(P)$(R)AndorShutterExTTL
 $(P)$(R)PALFilePath
 $(P)$(R)AndorPreAmpGain
+$(P)$(R)AndorEMGain
+$(P)$(R)AndorEMGainMode
+$(P)$(R)AndorEMGainAdvanced
 $(P)$(R)AndorADCSpeed
 $(P)$(R)AndorReadOutMode
 file "ADBase_settings.req", P=$(P), R=$(R)