Commit Graph

1993 Commits

Author SHA1 Message Date
PI-SRau 9a9fcf0a2c Merge branch 'master' of https://github.com/PI-SRau/motor 2016-05-11 14:44:23 +02:00
PI-SRau 43d56576a7 add E-712 as piezo controller 2016-05-11 14:37:40 +02:00
PI-SRau 46a4afa308 add PI E-861 as motor controller 2016-04-20 12:37:44 +02:00
Matthew Pearson 9eb3a6d8e7 Clear the problem bit in MSTA as part of the home function.
This fixes a problem introduced in the motor record to do with issuing stops when the record has the RA_PROBLEM bit set. This broke the home function for the XPS controller, because we have to re-home from a problem state. The motor record was issuing a stop as soon as the home function completed, causing the home procedure on the XPS to fail.
2016-04-05 15:22:41 -04:00
kpetersn c399a7c1b9 Replaced motorAxisHasClosedLoop with pController_->motorStatusGainSupport_ in calls to setIntegerParam() 2016-03-24 12:52:54 -05:00
kpetersn d989e788c9 Added a check for the E-727 2016-03-24 12:02:29 -05:00
sluiter 639b892b71 Correct EnsembleAsynSetupArgs array allocation 2016-03-22 15:25:54 -05:00
rsluiter 634e49d507 Merge pull request #13 from waynelewis/newfocus874x
Add support for NewFocus 874x series of controllers
2016-03-16 16:33:29 -05:00
sluiter d52fe5ee2e Changed jog error checks from dial to user limits. 2016-02-19 11:14:53 -06:00
Mark Rivers 165c38694a Merge branch 'master' of github.com:epics-modules/motor 2016-02-09 12:13:25 -06:00
Mark Rivers 441f36e737 Comment out setting PCO min/max parameters from readback; does not work if there is a non-zero value for EncoderIndexOffet 2016-02-09 12:13:08 -06:00
sluiter 69d4ffc9e8 Error check for invalid IRQ=1 value. 2016-02-08 16:54:39 -06:00
Wayne Lewis 6ab2bd5d01 Add support for NewFocus 874x series of controllers
Tested successfully with 8742 controller.
Not tested with 8743 controller.
2015-12-04 16:02:12 -05:00
Torsten Bögershausen 532afdc5a0 Remove all lines with svn keywords
They have no meaning in Git, are not updated and may cause unwanted diffs when
otherwise nothing is changed in a file
2015-11-23 08:23:12 +01:00
prjemian 204515c143 Introduce end-of-line normalization 2015-10-16 12:31:42 -05:00
Ron Sluiter 7fce903a82 Added the "ReverseDirec" parameter to the logic for setting of "HomeSetup" parameter. 2015-10-14 16:18:58 +00:00
Ron Sluiter 8c13d7bfe8 Added the "ReverseDirec" parameter to the logic for setting of "HomeSetup" parameter. 2015-10-14 16:15:01 +00:00
Ron Sluiter 82eb77fa19 Bug introduced with -r 19129; change made to eliminate call to maybeRetry() removed DMOV check. Restored DMOV check. 2015-07-30 16:56:08 +00:00
Ron Sluiter 3090983c31 Bug fix for target position (VAL/DVAL/RVAL) initialization error when the motor record is configured to do retries. 2015-07-29 15:50:23 +00:00
timmmooney ac900b9061 Make syncTargetPosition() correctly handle URIP=True 2015-07-28 17:15:06 +00:00
jkirchman 5bc4fe5175 Change direction field to UP since it requires this, as well as the startBit=0 and endBit=15 which was already changed. 2015-07-13 21:19:55 +00:00
timmmooney 52e9024695 2015-07-10 16:46:16 +00:00
timmmooney fa546f5528 changed so that CaQtDM translation works without modification. (MEDM's default, sbit=15,ebit=0, isn't permitted by CaQtDM.) 2015-07-10 16:38:30 +00:00
timmmooney e41173473e Made startPosDial and endPosDial react automatically (CP link) to changes in motor.OFF and motor.DIR
Parameterized the axis foe PSO commands with $(AXIS=X)
2015-06-29 20:49:00 +00:00
Ron Sluiter 1053af6b60 Valid addresses start at zero for the A24 and A32 VME address spaces. 2015-06-26 20:21:26 +00:00
MarkRivers 9e55d9cc0f Fix location of include file 2015-05-28 19:34:25 +00:00
MarkRivers 8dff95075e Fixes to be like XPS_C8_drivers, build on windows dynamic debug 2015-05-28 19:33:30 +00:00
MarkRivers d0b32fa951 Fixed problem with include files, did not work on win32-x86-debug 2015-05-28 18:35:43 +00:00
Ron Sluiter 311b6f6ad9 Replaced misleading omsSetup() argument comment. 2015-05-07 13:34:18 +00:00
MarkRivers 921e70fd1a Replace strtok_r, removed in error 2015-05-06 17:34:19 +00:00
MarkRivers 327b3ee9d5 Fixed location of epicsExport to build on Cygwin 2015-05-06 17:21:25 +00:00
MarkRivers 368eca3925 Fixed location of epicsExport to build on Cygwin 2015-05-06 16:47:20 +00:00
Kurt Goetze 847402d758 status display for 120 motors 2015-04-30 21:51:17 +00:00
Ron Sluiter a52ec2f62f - Removed "Task number" argument from A3200AsynConfig and switched to using Task #2 for the ASCII Interface. Task #3 is used to clear Task #2 errors and ABORT axis moves issued by Task #2.
- Deleted duplicate A3200 Setup and Config arguments from AerotechRegister.cc.
- Switched from "LINEAR" TO "MOVE[ABS/INC]" commands.
- Added delays to motorAxisMove() and motorAxisVelocityMove() so controller has time to set MoveDone false before the 1st status update.
- Added axis name to "RAMP RATE" command.
2015-04-30 14:31:32 +00:00
jsullivan-anl 702bdcc6ad create 96 channel motorStatus screen 2015-04-28 17:06:13 +00:00
Ron Sluiter 6fa4ac9c95 Re-format only; tabs to spaces. No code changes. 2015-04-03 15:14:33 +00:00
kmpeters ff82293e58 Moved the Newport and Aerotech sequence-program registrars
to a dedicated dbd file so can be properly omitted from the
build when SNCSEQ isn't defined.
2015-03-26 14:18:53 +00:00
kmpeters e31dde4ce5 Only build HytecSrc if IPAC is defined 2015-03-25 19:52:38 +00:00
kmpeters 88ccc442c3 Only build EnsembleTrajectoryScan.st if SNCSEQ is defined 2015-03-25 19:47:47 +00:00
MarkRivers a271ecd7db Change to allow building on Windows 2015-03-25 18:45:11 +00:00
MarkRivers 026c7603de Removed positon offset, it was causing too many problems; now the dial coordinate is what the CONEX reports 2015-03-25 18:16:54 +00:00
MarkRivers 85013c6fa0 Fixed error 2015-03-21 22:18:54 +00:00
MarkRivers 627b5c1191 Fixed error 2015-03-21 22:11:41 +00:00
MarkRivers 01da70ef67 Swap min and max in both set and get for position compare 2015-03-21 22:05:02 +00:00
MarkRivers 3199fa8467 Fixed drvInfo 2015-03-21 21:56:50 +00:00
MarkRivers 41e83857b9 Removed TIMEOUT 2015-03-21 21:53:39 +00:00
MarkRivers 53f1be5de9 Fixed error 2015-03-21 21:50:44 +00:00
MarkRivers 780d12329d Added resolution, direction and offset records 2015-03-21 21:50:25 +00:00
MarkRivers 8049aeffd2 Improve error messages 2015-03-21 21:43:05 +00:00
MarkRivers 3b49d165fd Fix bug with min and max positions 2015-03-21 21:38:56 +00:00