Commit Graph

706 Commits

Author SHA1 Message Date
rivers
d50d8d903a Changed to have USE_GRAPHICSMAGICK=NO on all platforms because the SetImage conflict leads to run-time crashes on Linux
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15775 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-19 23:35:35 +00:00
rivers
398d09231c Change order for clarity, and may because the previous order did not do dbd file right?
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15758 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 23:37:30 +00:00
rivers
963cc61d0c Cleaned up; made andor be PROD_SYS_LIB on Linux so can do STATIC_BUILD; set new variable USE_GRAPHICSMAGICK=NO on windows-x64 because of function name conflict
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15738 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:52:01 +00:00
rivers
90f63d7efb Removed DLLs not allowed to redistribute and move Windows files to os/ directories
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15737 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:48:55 +00:00
rivers
e8ec15be6a Not needed and not allowed to redistribute
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15736 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:48:17 +00:00
rivers
f8b31d378a Move os os/windows-x64
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15735 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:40:23 +00:00
rivers
ed7a78aa4f Move to os/win32-x86
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15734 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-18 18:39:38 +00:00
rivers
cce563cd23 Added AutoSize[X,Y,Z]
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15720 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 22:55:26 +00:00
rivers
4645f43fa2 Added AutoSize[X,Y,Z]
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15719 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 22:55:02 +00:00
rivers
0a4e49af84 Added AutoSize[X,Y,Z]
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15718 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-14 22:54:45 +00:00
rivers
55c2856f82 Changes to work with new commonDriverMakefile
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15704 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-13 20:18:44 +00:00
rivers
2a0f88680b Now built dynamically
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15703 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-13 20:12:44 +00:00
rivers
e47cc1df85 Minor changes to avoid compiler warnings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15599 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-12-03 22:02:24 +00:00
rivers
a68cbf93e6 Minor changes to avoid compiler warnings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15527 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-28 18:40:02 +00:00
rivers
00c3c04f76 Changes for new features
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15475 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:54:24 +00:00
rivers
3142f31926 Added PoolUsedMem.SCAN for pool polling rate
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15474 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:52:54 +00:00
rivers
e0a4cc85fc Changed default scan rate for pool polling from 0.1 second to 1 second
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15473 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:52:24 +00:00
rivers
b08574bbaf Added NoiseFilter
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15472 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:51:36 +00:00
rivers
9ac08d994f Added UInt32 to DataType; added NoiseFilter; added TransferRate
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15471 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-24 14:51:10 +00:00
rivers
a3f5381bfd Many additions
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15444 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-08 00:01:34 +00:00
rivers
8510fda948 Removed strings and values from all mbbo and mbbi records, now come from driver via asynEnum interface; added FanSpeed, ReadoutTime, ReadoutRate, Overlap, PreAmpGain
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15440 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-06 00:43:49 +00:00
rivers
589c24a289 Added PreAmpGain, ReadoutRate, Overlap, FanSpeed
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15439 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-06 00:41:30 +00:00
rivers
c104bc6497 Added SerialNumber, FirmwareVersion, SoftwareVersion, ControllerID
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15436 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 23:33:44 +00:00
rivers
7e98ea22ca Fixed typo
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15435 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 23:32:57 +00:00
rivers
2dd658d809 Added new records: SoftwareTrigger, SerialNumber, FirmwareVersion, SoftwareVersion, ControllerID
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15434 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 23:32:25 +00:00
rivers
6a38912b24 Added A3Binning
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15431 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 15:23:21 +00:00
rivers
1dfddb75d7 Added A3Binning
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15430 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-11-01 15:22:57 +00:00
rivers
a6b83aa950 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15427 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-31 18:24:49 +00:00
rivers
bfad3e2045 Added Andor3.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15426 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-31 18:24:32 +00:00
rivers
0bb5d945f9 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15425 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-31 18:15:29 +00:00
rivers
a02c92c634 New file
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15424 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-31 18:15:09 +00:00
rivers
4a8717ba8c Added BoundaryThreshold
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15356 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-05 17:41:13 +00:00
rivers
7734f5b753 Added BoundaryAlign and BoundaryThreshold
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15353 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-04 21:37:32 +00:00
rivers
1f06a87894 Added BoundaryAlign and BoundaryThreshold
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15352 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-04 21:35:53 +00:00
rivers
3f1b199402 Added BoundaryAlign and BoundaryThreshold
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15351 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-04 21:34:35 +00:00
jemian
ada4873363 corrections
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15348 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-02 17:19:25 +00:00
jemian
1ca7c278d8 synchronized from recent changes to .adl files
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15331 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-01 19:30:15 +00:00
rivers
588e3a4507 New files
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15321 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-01 16:52:32 +00:00
rivers
c53f861e9d Changed color mode on Enable PVs to Alarm and changed background color
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15320 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-01 02:09:00 +00:00
rivers
b4e86282ca Change Enable PV choices from No/Yes to Disable/Enable; set alarm severities
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15319 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-10-01 02:07:53 +00:00
rivers
6c4e0e7616 Make default for Enable[XYZ] be 1
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15318 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-30 20:08:27 +00:00
rivers
75964b4902 Add EnableX, EnableY, EnableZ from Tom Cobb
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15317 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-30 20:01:01 +00:00
rivers
593c79240e Add EnableX, EnableY, EnableZ from Tom Cobb
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15315 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-30 19:59:22 +00:00
rivers
7be6f2a85f Add EnableX, EnableY, EnableZ from Tom Cobb
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15314 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-30 19:59:17 +00:00
rivers
008fbdbdab Added AutoOffsetScale from Tom Cobb
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15294 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-30 15:36:23 +00:00
rivers
aaa4aee9f0 Removed tabs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15289 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-30 15:32:22 +00:00
rivers
843716a67c Added AutoOffsetScale
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15288 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-30 15:32:04 +00:00
rivers
8522ef1e4f Add QueueUse PVs, complement to QueueFree
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15287 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-30 00:15:05 +00:00
rivers
349fd82a4c New PVs from Tom Cobb: MinX_RBV, etc.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15286 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-29 22:26:19 +00:00
rivers
ade54168dc New PVs from Tom Cobb: MinX_RBV, etc.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15285 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2012-09-29 22:11:26 +00:00