Commit Graph

2027 Commits

Author SHA1 Message Date
Kurt A. Goetze b60e8ee404 update Makefile 2017-07-17 11:59:09 -05:00
Kurt A. Goetze 68463eca4f update 2017-07-17 09:51:41 -05:00
Kurt A. Goetze b9002b745d add AMCISrc dir 2017-07-14 16:42:36 -05:00
Keenan Lang 4125a39c40 Add iocsh bindings for oms58Setup command 2017-05-03 10:15:20 -05:00
Mark Rivers 2b853366f4 Added support for CONEX-PP 2017-04-18 12:51:16 -05:00
sluiter e604c9588a Error check for new failure mode where board reboots after 1st command with response. 2017-04-06 16:29:41 -05:00
sluiter 66b211adee Remove 'MAXv_axis[]' related compiler warnings and unused variables 'got_encoder'. 2017-04-06 16:02:31 -05:00
ext-muir_j 02612bad41 Fix motorApp/MotorSrc/README header dash lines
Make motorApp/MotorSrc/README header dash lines match length of header text.
2017-03-08 07:05:27 -06:00
Mark Rivers 1bc5b276d0 Merge branch 'master' of github.com:epics-modules/motor 2017-03-07 13:41:42 -06:00
Mark Rivers 38cfa6aedf Minor corrections 2017-03-07 13:41:32 -06:00
sluiter 4f54eb502b Optional test for VME58 failure mode where board reboots after the 1st motion related command. 2017-02-22 08:26:35 -06:00
rsluiter b7aba345ba Merge pull request #52 from PI-SRau/PI_ctrl_cannot_set_acceleration
Pi ctrl cannot set acceleration
2017-01-24 09:42:07 -06:00
PI-SRau 5bd92b2e58 replaces tabs with spaces 2017-01-16 08:44:30 +01:00
timmmooney 5cad105357 ignore SET field, so a database can do it instead 2017-01-12 11:09:55 -06:00
PI-SRau bc3811835f if controller does not know how to set velocity, setting acceleration and deceleration must be disabled also 2017-01-11 16:41:13 +01:00
rsluiter bd8ad1ea8f Merge pull request #44 from PI-SRau/PI_ctrl_does_not_know_VEL
Support PI controllers that do not know VEL command
2016-10-21 09:31:00 -05:00
PI-SRau 6b9ca72120 Merge branch 'PI_ctrl_does_not_know_VEL' 2016-10-20 17:41:16 +02:00
PI-SRau cbea70e429 add support for E-871 and E-873 as "motor" controllers 2016-10-20 17:39:45 +02:00
PI-SRau 548c1188ae Support controller that do not know "VEL(?)" command 2016-10-20 17:36:09 +02:00
sluiter c970afbfe7 Reverted FLNK change. Except for the condition that DMOV == FALSE, FLNK processing was standard. 2016-09-28 16:07:59 -05:00
prjemian 8d473ceb10 remove widgets for M5-M8 from 4motor form 2016-08-31 14:42:18 -05:00
Keenan Lang ee4bddd761 Merge pull request #33 from keenanlang/master
Switch asynMotorAxis status_ and statusChanged_ to be protected
2016-08-25 13:41:20 -05:00
Mark Rivers cb77427006 Merge pull request #38 from rokvintar/reading_velo_accl_params_fix
Velocity, baseVelocity and acceleration read only when needed. Fix fo…
2016-08-23 14:24:32 -05:00
sluiter 62b41c4150 On comm. error, signal motorAxisProblem to user and skip controller initialization 2016-08-23 13:20:51 -05:00
sluiter c460055f93 Merge pull request #32 2016-08-23 11:48:21 -05:00
sluiter 7a494e5cff Set motorAxisPowerOn indicator to force status update when Enable does not work. Remove unused MAX/MIN macros 2016-08-23 11:03:37 -05:00
rsluiter c1b99e9c9f Merge pull request #32 from hdante/master
Add all missing stdlib.h and errlog.h includes
2016-08-23 09:21:57 -05:00
Vintar Rok 7ee34a791b Velocity, baseVelocity and acceleration read only when needed. Fix for #37 2016-08-22 09:59:03 +02:00
Keenan Lang ebe51c0ebb Reverted wrong change, this should get it back to what I wanted it to be. 2016-07-25 14:42:51 -05:00
Keenan Lang 40816ddc65 Revert "Switched motor status and statusChanged to be protected instead of private."
This reverts commit 36ff229c44b8273cd7c4967a13eb64a24f73d37d.
2016-07-25 14:38:38 -05:00
Keenan Lang 4494eb14be Switched motor status and statusChanged to be protected instead of private. 2016-07-25 14:32:44 -05:00
sluiter 316760fbe9 Remove redundant epicsMutexUnlock that causes thread suspension. 2016-05-25 14:22:19 -05:00
Henrique Dante de Almeida ec84e95589 Add all missing stdlib.h and errlog.h includes 2016-05-23 18:01:38 -03:00
PI-SRau 997f276174 add PI C-884 as motor controller 2016-05-11 14:51:45 +02:00
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