Commit Graph

1582 Commits

Author SHA1 Message Date
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
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
b121171b14 documentation/andorDoc.html: add documentation for baseline clamp option. 2016-06-23 12:04:26 -04:00
Matthew Pearson
5ca26492e6 Add the ability to set the BaselineClamp setting in the Andor SDK. 2016-06-23 12:00:48 -04:00
Matthew Pearson
ebdef4d560 documentation/andorDoc.html: we also have FITS as an Andor file saving option. 2016-06-23 11:59:49 -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
Mark Rivers
21c589149d Removed _TOP, not needed and would require changes to st.cmd 2015-09-24 12:54:23 -05:00
Mark Rivers
4bea4d9b16 Changed to use relative path to top of module 2015-09-18 12:07:29 -05:00
Mark Rivers
4fc5132efb Reverted previous change, files moved back from ADExample to ADCore R2-4 2015-09-15 11:50:19 -05:00
Mark Rivers
95d3df00d5 Reverted previous change, files moved back from ADExample to ADCore 2015-09-15 11:49:58 -05:00
Mark Rivers
23b4d0e800 R2-4 notes 2015-09-08 14:49:37 -05:00
Mark Rivers
2b818f819f Moved commonPlugins.cmd from ADCore/iocBoot to ADExample/iocBoot 2015-09-08 14:46:43 -05:00
Mark Rivers
32db7aea69 Moved commonDriverMakefile from ADCore/ADApp to ADExample/exampleApp 2015-09-08 14:45:54 -05:00
Mark Rivers
04284014a2 Merge pull request #5 from timmmooney/master
new display-file translations
2015-06-28 09:55:53 -05:00
timmmooney
48e35cc8b2 new display-file translations 2015-06-25 14:09:16 -05:00
Mark Rivers
8058ba364b Changed release date R2-3 2015-04-16 12:14:14 -05:00
Mark Rivers
e21217aa95 Merge pull request #4 from timmmooney/master
new display-file translations
2015-04-07 06:08:02 -05:00
timmmooney
7e263afd13 new display-file translations 2015-04-03 14:56:21 -05:00
Mark Rivers
a19537a290 Notes for R2-3 2015-03-29 17:46:11 -05:00
Mark Rivers
93ed9a142b Remove settings that are included from other files 2015-03-29 17:37:00 -05:00
Mark Rivers
823a73fc73 include ADBase_settings.req and NDFile_settings.req 2015-03-29 17:34:56 -05:00
Mark Rivers
13fbaf475d Changes for ADCore R2-2 2015-03-19 12:59:03 -05:00
Mark Rivers
e7bab3ad69 Added includes for ADBase.template and NDFile.template 2015-03-19 12:58:18 -05:00
Mark Rivers
c54d5b1b25 Merge pull request #3 from mdmoo1978/master
Adding support for flipper mirror (input & output)
2015-03-19 09:34:57 -05:00
Matthew Moore
83c32e2100 Fixed Tabs to spaces 2015-03-18 08:50:15 -05:00
Matthew Moore
c8956e7dea adding flipper to adl 2015-03-17 14:38:57 -05:00
Matthew Moore
1c5e6fe119 Added support for flipper mirrors 2015-03-17 14:29:07 -05:00
Mark Rivers
24f1c1f6ed Changed comment and actual command for andorCCDConfig 2015-03-13 14:04:48 -05:00
Mark Rivers
9d743336d2 Added comment explaining shamrockConfig syntax 2015-03-13 09:29:41 -05:00
Mark Rivers
a38389bcdc New version from SDK 2.99.3 2015-03-12 14:03:53 -05:00
Mark Rivers
651bc35407 Fixed typo 2015-03-12 13:51:34 -05:00
Mark Rivers
8dde91e3c8 Added notes for R2-3 2015-03-12 13:51:03 -05:00
Mark Rivers
3acff712d1 Removed statement that Shamrock is only supported on Windows, no longer true 2015-03-12 13:50:29 -05:00
Mark Rivers
a38a5b6888 Fixed comment that incorrectly said Shamrock was not supported on Linux 2015-03-12 13:49:30 -05:00
Mark Rivers
c807e883a9 New library version 2.99.3 2015-03-12 13:41:46 -05:00
Mark Rivers
75615df782 Tagged R2-2 R2-2 2015-03-12 13:21:51 -05:00
Mark Rivers
69ea868a1b Changed name of shamrock library 2014-12-03 16:27:52 -06:00
Mark Rivers
83523d98e9 Changed name of shamrock library 2014-12-03 16:27:38 -06:00
Mark Rivers
cc8fdab270 Changed name of shamrock library 2014-12-03 16:27:09 -06:00
Mark Rivers
9b16059978 Changed name of shamrock library 2014-12-03 16:26:44 -06:00
Mark Rivers
33a9799b3d Fixed problem building dynamically on win32-x86 2014-11-18 14:19:49 -06:00
Mark Rivers
89018e77fc Removed blank line 2014-11-18 14:10:31 -06:00
Mark Rivers
e568f1ef32 Comment our #pragma hdrstop, not supported on Linux and not really needed 2014-11-18 14:10:03 -06:00
Mark Rivers
177b89f498 Fixed problem with dynamic builds on Windows; fixed to enable Shamrock on Linux 2014-11-18 14:09:19 -06:00
Mark Rivers
a292a74691 Updated notes for R2-2 2014-11-18 12:59:01 -06:00
Mark Rivers
f9abcc513c Notes for R2-2 2014-11-18 12:49:05 -06:00
Mark Rivers
bda4eb8c67 Library renamed to lowercase on win32-x86; link with shamrock on Linux, now have required library 2014-11-18 12:43:57 -06:00