Commit Graph

381 Commits

Author SHA1 Message Date
rivers 8ab869a4af Changed FileNumber logic with help from Tim Mooney so that it does not write value to driver when readback occurs
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8843 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-29 21:51:42 +00:00
hammonds 9bf6eefb0a Add in to support Perkin Elmer cameras.
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8806 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-21 03:24:09 +00:00
rivers 9237c69c5e Exclude the Roper classes from WinView
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8790 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-18 15:07:59 +00:00
rivers 5b7557241c Moved from ADApp, fixes and improvements
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8785 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-17 15:14:56 +00:00
rivers ac70ae0719 Changes for R1-5
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8755 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-13 19:36:51 +00:00
rivers 79b426853e Added support for color (GainRed, GainBlue, GainGreen)
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8754 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-13 19:23:06 +00:00
rivers 05a56182a6 Added support for color (GainRed, GainBlue, GainGreen); restrict ColorMode to allowed values
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8753 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-13 19:22:22 +00:00
rivers 27c6fa0208 Minor formatting changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8716 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-06 21:56:06 +00:00
rivers 5297343527 Added mar345 and Windows Firewire
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8715 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-06 21:27:17 +00:00
rivers c62136abff Fixed HTML errors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8714 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-06 21:22:42 +00:00
rivers c697a466c8 New file for Firewire
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8713 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-06 21:20:55 +00:00
rivers 3087d291fa Changed comment
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8712 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-06 21:19:04 +00:00
rivers ef6ee48400 Added Abort_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8711 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-04-06 21:18:07 +00:00
rivers 290b2404f1 New file for mar345 detector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8705 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-28 18:33:18 +00:00
rivers 8e6b51f6e2 Added NumErased and Abort; other changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8702 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-28 03:12:18 +00:00
rivers 013e0730fe Added Abort and NumErased_RBV
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8700 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-28 03:08:14 +00:00
rivers 92cd636d50 Added mar345
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8694 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-27 17:59:49 +00:00
rivers 2828c7f5a6 New file for mar345 detector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8693 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-27 17:58:53 +00:00
rivers e5f077ba5a Fixed problem with logic in initial value of FileNumber; this had broken when fixing asyn device support
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8692 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-27 17:57:13 +00:00
rivers d506c733c3 Changed Acquire_RBV from longin to bi, added descriptive state names
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8691 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-27 17:55:08 +00:00
rivers 4c7ff6cda9 Changes for white balance controls
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8685 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-24 23:10:29 +00:00
rivers 763219ba5d Significant changes in logic to get it to work
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8684 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-24 23:09:35 +00:00
rivers 60580289f8 New file to allow control of upper and lower part of white balance separately
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8679 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-24 12:37:44 +00:00
rivers 8db4c91e99 Added firewireVideoFormats
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8674 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:34:59 +00:00
rivers fb71d15a86 Moved video format controls to new file, firewireVideoFormats.adl
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8673 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:34:06 +00:00
rivers dbff8c8969 New screen for Firewire video formats, modes, rates, color codes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8672 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:32:37 +00:00
rivers ca55952e42 Added PINI to FEATURE and FEATURE_CTRL; minor formatting changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8670 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:22:43 +00:00
rivers 1b83707253 Added Format 7 color code records
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8669 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:20:38 +00:00
rivers 9108d0320a New template file for Format 7 color codes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8668 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-21 19:19:35 +00:00
rivers 0d7c75869d Added image2 for Firewire, for 16-bit mode
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8643 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-18 01:39:21 +00:00
rivers aed8b9b5d9 Update
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8634 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-15 15:25:20 +00:00
rivers f219d1036d Fixed error
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8631 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-15 15:16:13 +00:00
rivers 5383d31985 New file for Firewire settings
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8630 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-15 15:15:12 +00:00
rivers 12cafe4f99 Added Firewire for Windows controls
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8626 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-14 20:09:00 +00:00
rivers 9c46dd6c82 New file to control Firewire-specific features
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8625 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-14 20:08:02 +00:00
rivers ad97768ae2 New file for firewireWinDCAM support
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8623 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-03-14 19:58:30 +00:00
rivers 3e9d801107 New version of asyn and areaDetector
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8465 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-02-16 18:08:08 +00:00
rivers 3949917403 Fixed HTML errors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8464 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-02-16 18:00:08 +00:00
rivers 68b5226dfe Removed asynPortDriver documentation, now in asyn; fixed HTML errors
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8463 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-02-16 17:58:58 +00:00
rivers bf626fe272 Removed SUPPORT, not needed
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8443 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-02-11 18:43:59 +00:00
rivers 0b94f7109b Removed CYGWIN_HAVE_AFXWIN_H, not needed
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8442 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-02-11 18:42:50 +00:00
mooney 9d5b575ac3 added CYGWIN_HAVE_AFXWIN_H = YES, and -include /configure/CONFIG_SITE
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8413 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-02-09 21:22:21 +00:00
mooney 36df5a501b added SUPPORT=
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8412 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-02-09 21:20:57 +00:00
rivers e3ccd849f0 Minor format changes
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8317 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-30 21:00:14 +00:00
rivers 7df3ea3865 Changes for R1-4; hardware triggers and I/O; color support
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8316 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-30 20:53:40 +00:00
rivers 1f80a1d633 Changes for R1-4, mostly color support
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8315 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-30 20:52:33 +00:00
rivers 707f3f137e Changes for R1-4
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8314 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-30 20:51:41 +00:00
rivers e680b97807 Minor changes for R1-4
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8313 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-30 20:50:42 +00:00
rivers 8a18769e0c Added instructions for pre-built version
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8312 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-30 20:49:47 +00:00
rivers 1e3b39b590 Minor change for R1-4
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8311 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
2009-01-30 20:49:11 +00:00