Commit Graph
2556 Commits
Author SHA1 Message Date
Torsten Bögershausen 38186d00e4 Record: motor record DLY and STOP problem
Fix the problem that the record gets stuck when STOP is
pressed while the record is in MIP_DELAY (and the motor
is standing still, so that there is no record processing).

Currently the MIP_DELAY bits are set to 0, when a STOP is issued.
As the motor already hase stopped, the DMOV field never goes to 1.
There are 2 possible solutions here:
a) STOP wins:
  pmr->dmov = FALSE;
  MARK(M_DMOV);

b) DELAY wins
  Send a STOP to the controller (just to be sure), but wait for the DELAY.

a) may cause probles later, whena new positionioning is done after the STOP
and a new DELAY is triggered.
As the old callback is still active, it may be executed before the new
callback. And the time will be too short.
For this reason go with b)

http://www.aps.anl.gov/epics/tech-talk/2015/msg01786.php
2017-03-09 10:58:31 +01:00
Mark RiversandGitHub 345fecadb8 Merge pull request #59 from jlmuir/patch-1
Fix motorApp/MotorSrc/README header dash lines
2017-03-08 07:45:46 -06:00
ext-muir_jandGitHub 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
Pete R JemianandGitHub 02e28d602c supports *positioning* motors 2017-02-13 13:07:56 -06:00
rsluiterandGitHub 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
rsluiterandGitHub 14b1070b7d Merge pull request #53 from epics-modules/igset
ignore SET field, so a database can do it instead
2017-01-13 12:35:25 -06: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
PI-SRauandGitHub 89220a12dd Merge pull request #3 from epics-modules/master
sync with epics-modules
2017-01-11 16:35:39 +01:00
Pete R JemianandGitHub f718aaa3ba link to all HTML docs 2016-11-09 14:55:54 -06:00
Pete R JemianandGitHub e23721fb0c the module name 2016-11-09 14:55:07 -06:00
Pete R JemianandGitHub 28f4a8f2ed display each HTML file 2016-11-09 14:52:29 -06:00
rsluiterandGitHub 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
rsluiterandGitHub a113a214a6 Merge pull request #45 from PI-SRau/PI-E-871_873
Support PI E-871 and E-873
2016-10-21 09:30:18 -05:00
PI-SRau e269064b27 add .gitignore 2016-10-20 17:42:12 +02: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
PI-SRauandGitHub bcdff1c0dc Merge pull request #2 from epics-modules/master
Syncing from original
2016-10-20 10:02:22 +02:00
rsluiterandGitHub 6cb7ff2a5e Merge pull request #42 from rsluiter/master
Reverted FLNK change. Except for the condition that DMOV == FALSE, FL…
2016-10-19 13:38:04 -05: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
Keenan LangandGitHub b867f013ef Issue/feature reporting link
Added links that will bring up issue reporting with a built-in response template.
2016-09-20 16:48:12 -05:00
Kevin PetersonandGitHub a87835c14a Merge pull request #39 from keenanlang/scripts
Callable iocsh scripts
2016-09-01 09:50:24 -05:00
prjemian 8d473ceb10 remove widgets for M5-M8 from 4motor form 2016-08-31 14:42:18 -05:00
Keenan Lang 2afa0b7128 Renamed substitutions file 2016-08-30 15:29:08 -05:00
Keenan Lang 0451a98a52 Switched ACS MCB4B support to use new gen3 support 2016-08-26 16:05:00 -05:00
Keenan LangandGitHub ee4bddd761 Merge pull request #33 from keenanlang/master
Switch asynMotorAxis status_ and statusChanged_ to be protected
2016-08-25 13:41:20 -05:00
Keenan Lang 17d10a8158 Added various motor controller setup scripts. 2016-08-25 13:39:42 -05:00
Mark RiversandGitHub 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
rsluiterandGitHub 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
Mark Rivers 81b15c09bb Merge pull request #30 from PI-SRau/PI-C-884
add PI C-884 as motor controller
2016-05-11 09:13:32 -05: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 755d4c15ba Merge pull request #1 from epics-modules/master
sync with epics-modules
2016-04-20 12:40:53 +02:00
PI-SRau 46a4afa308 add PI E-861 as motor controller 2016-04-20 12:37:44 +02:00
Kevin Peterson c844aae515 Merge pull request #24 from mp49/patch-1
Clear the problem bit in MSTA as part of the home function.
2016-04-07 09:29:16 -05:00