Commit Graph

1788 Commits

Author SHA1 Message Date
mp49 fbfb02499c motor: added back in the model 2 XPS driver, and compiled it into a seperate library called NewportModel2. I also seperated out the XPS model 3 driver into a library called NewportModel3. For the model 3 driver there is now a seperate dbd file. 2011-07-22 12:58:28 +00:00
MarkRivers a0951feaea Fixed comment 2011-07-21 17:08:31 +00:00
MarkRivers d9bc5d29b2 Fixed comment; problem caught by doxygen 2011-07-21 17:06:14 +00:00
MarkRivers c1153aa6fb Fix comment, problem caught by doxygen 2011-07-21 17:05:03 +00:00
timmmooney 392f577e77 CSS-BOY displays 2011-07-19 20:44:16 +00:00
MarkRivers 53c93173f1 Enhancements to report function 2011-07-14 15:07:04 +00:00
MarkRivers e4ec209d71 Added note about shell limit in vxWorks 2011-07-14 15:05:55 +00:00
MarkRivers 083919e984 Fixed problem with dividing poll rates by 1000 twice; removed copy of poll periods to object, that is already done in startPoller 2011-07-13 21:49:28 +00:00
MarkRivers d5fa61ebba No longer needed 2011-07-13 18:53:00 +00:00
MarkRivers 6ecbdeb10a Changed back to ipmIntConnect rather than devConnectInterruptVME. cast to (long) rather than (int) fixes compile errors on 64-bit Linux 2011-07-11 15:14:19 +00:00
MarkRivers 29fa983a7d Change from ipmIntConnect to devConnectInterruptVME; downside is it only works on VME; upside is that it builds on 64-bit systems 2011-07-06 22:04:59 +00:00
kmpeters a490b1885f Commented out the conditional setting of CROSS_COMPILER_TARGET_ARCHS to RTEMS-uC5282, since it breaks builds for vl-linux-x86 2011-07-06 21:12:35 +00:00
Ron Sluiter 493511984e svn keywords added to header. 2011-07-06 16:15:22 +00:00
MarkRivers b4d52e3f33 V2.4 version 2011-06-28 20:05:08 +00:00
MarkRivers 17098e0b5d V2.4 version 2011-06-28 20:04:20 +00:00
kmpeters 7c76cbea52 Modified OmsSrc/Makefile to only build MAX_trajectoryScan.st if SNCSEQ is defined. 2011-06-27 21:10:56 +00:00
Ron Sluiter 5bafaed437 Unintended consequence of previous commit; no retries after backlash or jogging.
Moved setting MIP <- DONE and reactivating Jog request from postProcess() to maybeRetry().
2011-06-27 14:27:48 +00:00
kmpeters 7e918a48b0 Added a check for a non-zero MIP before doing retries.
This change fixes an uncommanded-motion bug that occurs under the following conditions:
1. A motor is moved from outside EPICS, making its EPICS readback position out-of-sync.
2. The motor is controlled by a controller that supports motor groups (like the Newport XPS).
3. The motor belongs to a motor group.
4. A status update is requested for any of the other motors in the motor group.
2011-06-23 20:11:13 +00:00
Ron Sluiter f72ae520df Bug fix for jog velocity and acceleration not converted from raw units to Ensemble user units
when the PosScaleFactor parameter is not 1.
2011-06-21 16:50:07 +00:00
Ron Sluiter 14c9877f3b Make dependences on motorRecord.h explicit 2011-06-06 19:15:07 +00:00
Ron Sluiter 61a3dfc9f8 Restore needed driver(motorEnsemble). 2011-06-02 20:51:40 +00:00
Ron Sluiter 2fb62bf267 Apple support for how bit fields are packed. 2011-05-27 21:53:48 +00:00
timmmooney e34e49704f Added Ipac to HytecMotor_LIBS 2011-05-25 20:21:32 +00:00
timmmooney 2241219675 Make spline fit optional
Remove test use of startPulses, endPulses, to select algorithm variations
2011-05-25 19:17:28 +00:00
mp49 76285f5536 motor: added a parameter to the XPS config axis function to prevent the driver setting the MSTA problem bit when the XPS axis is in disabled state. Added new code to poller to set problem bit when in certain states. Improved some error handling code. 2011-05-20 18:27:30 +00:00
mp49 1cc698c7d5 motor: Tom Cobb added a function that can be used to disable polling in the XPS driver. This is needed to help data corruption during GatheringStopAndSave operations in the trajectory scan SNL code. Forgot to commit header file. 2011-05-20 17:54:41 +00:00
mp49 079bb3e473 motor: Tom Cobb added a function that can be used to disable polling in the XPS driver. This is needed to help data corruption during GatheringStopAndSave operations in the trajectory scan SNL code. 2011-05-20 17:50:05 +00:00
mp49 a0056d7d7e motor: fixed the problem where an XPS axis cannot be homed if it is in state 50 or state 63. 2011-05-20 17:36:38 +00:00
mp49 1bc379f792 motor: added check for zero acceleration when doing a normal move in the XPS driver. This can happen if in the motor record VELO=VBAS. The move will fail if a zero acceleration is sent to the controller. So in the case of a zero acceleration I ignore it and use the controller value. 2011-05-20 17:25:45 +00:00
mp49 048fa5f0f4 motor: fixed return status for deferred moves in the XPS driver. This prevents error being sent to IOC console. 2011-05-20 17:17:27 +00:00
mp49 891a88c622 motor: I added a 50ms sleep when doing a set position in the XPS driver, just before the GroupReferencingStop() command. Some types of XPS axes seem to need this sent a little later than others (eg. a spindle type axis can be left in state 64 if this command is sent too quickly after a GroupReferencingActionExecute(). 2011-05-20 17:12:41 +00:00
mp49 a498fd318e motor: added logic to init_record in Asyn device support to support setting the encoder ratio. 2011-05-20 16:23:05 +00:00
mp49 29d82a3ab5 motor: Jon Thompson has added support for the PI 663, based on the PI 862 support. 2011-05-20 16:18:53 +00:00
mp49 3e7dec3a8d motor: changed the logic for setting the encoder ratio parameter so that it is always set if there is an encoder present. Previously the ratio was set if one was present AND we are using it, which didn't work when switching between different UEIP modes and setting the controller position at the same time. 2011-05-20 16:11:06 +00:00
mp49 942bb111d2 motor: setting motorAxisHasEncoder bit for Newport XPS axes. This is so we can make use of the UEIP field. 2011-05-20 16:06:50 +00:00
mp49 2edcb2fcba motor: fixed bug with deferred moves, that was causing axis drift when scanning multi axis groups using deferred moves. 2011-05-20 16:02:23 +00:00
mp49 5eb4b18d5c motor: changed XPS driver to read back theoretical position as well as actual position. Now the default motorAxisPosition is the theory pos
ition. This brings it into line with the PMAC driver.
2011-05-20 16:00:30 +00:00
mp49 5f421e9a03 motor: added new parameter to the asyn motor interface that can be used to trigger a move_to_home function. This is useful when a normal home command is not possible, or difficult, for example on diffractometers that home multiple axes at the same time. Also commiting an implementation for the XPS asyn driver. 2011-05-20 15:48:15 +00:00
MarkRivers 853ec58519 Change C++ style comments to C style so it can be used in .st and .c code 2011-05-11 17:21:54 +00:00
MarkRivers 03a1b92af1 Changes for new model 3 driver 2011-05-09 20:08:21 +00:00
MarkRivers 0c7be70002 New model 3 driver 2011-05-09 20:07:52 +00:00
MarkRivers 7a2e9e47e5 Obsolete 2011-05-09 20:07:27 +00:00
timmmooney d12eb503c0 Do not acquire real-time updates past MAX_PULSES 2011-05-02 19:36:52 +00:00
Ron Sluiter ddddd68e51 Setting svn:mime-type property to "text/html" for proper display from a web browser. 2011-04-15 18:26:00 +00:00
MarkRivers 33ac1256ef Changed C++ comment to C style in part of file used by C 2011-04-08 10:42:47 +00:00
MarkRivers 6478f1a658 Added debugging 2011-04-08 03:51:23 +00:00
MarkRivers d131db5b2f Bug fix fetching numReadbacks 2011-04-08 03:49:49 +00:00
MarkRivers f32a88fe6c Initialize profileExecuteState_ 2011-04-08 03:48:55 +00:00
MarkRivers 717864037c Bug fix in float64Array callbacks 2011-04-08 03:48:19 +00:00
MarkRivers 14027adde4 New file 2011-04-07 03:43:14 +00:00