bcdff1c0dc
Merge pull request #2 from epics-modules/master
...
Syncing from original
2016-10-20 10:02:22 +02:00
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
c970afbfe7
Reverted FLNK change. Except for the condition that DMOV == FALSE, FLNK processing was standard.
2016-09-28 16:07:59 -05:00
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
a87835c14a
Merge pull request #39 from keenanlang/scripts
...
Callable iocsh scripts
2016-09-01 09:50:24 -05:00
8d473ceb10
remove widgets for M5-M8 from 4motor form
2016-08-31 14:42:18 -05:00
2afa0b7128
Renamed substitutions file
2016-08-30 15:29:08 -05:00
0451a98a52
Switched ACS MCB4B support to use new gen3 support
2016-08-26 16:05:00 -05:00
ee4bddd761
Merge pull request #33 from keenanlang/master
...
Switch asynMotorAxis status_ and statusChanged_ to be protected
2016-08-25 13:41:20 -05:00
17d10a8158
Added various motor controller setup scripts.
2016-08-25 13:39:42 -05:00
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
62b41c4150
On comm. error, signal motorAxisProblem to user and skip controller initialization
2016-08-23 13:20:51 -05:00
c460055f93
Merge pull request #32
2016-08-23 11:48:21 -05:00
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
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
7ee34a791b
Velocity, baseVelocity and acceleration read only when needed. Fix for #37
2016-08-22 09:59:03 +02:00
ebe51c0ebb
Reverted wrong change, this should get it back to what I wanted it to be.
2016-07-25 14:42:51 -05:00
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
4494eb14be
Switched motor status and statusChanged to be protected instead of private.
2016-07-25 14:32:44 -05:00
316760fbe9
Remove redundant epicsMutexUnlock that causes thread suspension.
2016-05-25 14:22:19 -05:00
ec84e95589
Add all missing stdlib.h and errlog.h includes
2016-05-23 18:01:38 -03:00
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
997f276174
add PI C-884 as motor controller
2016-05-11 14:51:45 +02:00
9a9fcf0a2c
Merge branch 'master' of https://github.com/PI-SRau/motor
2016-05-11 14:44:23 +02:00
43d56576a7
add E-712 as piezo controller
2016-05-11 14:37:40 +02:00
755d4c15ba
Merge pull request #1 from epics-modules/master
...
sync with epics-modules
2016-04-20 12:40:53 +02:00
46a4afa308
add PI E-861 as motor controller
2016-04-20 12:37:44 +02:00
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
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
ae84076e42
Merge pull request #23 from kmpeters/PI_E-727
...
Corrected setIntegerParam() calls in PIasyn{Axis,Controller}.cpp
2016-03-24 13:51:14 -05:00
c399a7c1b9
Replaced motorAxisHasClosedLoop with pController_->motorStatusGainSupport_ in calls to setIntegerParam()
2016-03-24 12:52:54 -05:00
724dd71a72
Merge pull request #21 from kmpeters/PI_E-727
...
Added a check for the E-727
2016-03-24 12:09:13 -05:00
d989e788c9
Added a check for the E-727
2016-03-24 12:02:29 -05:00
639b892b71
Correct EnsembleAsynSetupArgs array allocation
2016-03-22 15:25:54 -05:00
634e49d507
Merge pull request #13 from waynelewis/newfocus874x
...
Add support for NewFocus 874x series of controllers
2016-03-16 16:33:29 -05:00
968b68ee64
Fix locations of database files
2016-03-16 10:52:46 -04:00
4efe15e76c
Merge pull request #18 from rsluiter/JogLimit
...
Jog limit
2016-02-23 11:19:34 -06:00
bd21bbdb29
Merge branch 'master' of github.com:epics-modules/motor
2016-02-23 09:02:59 -06:00
84ea83a3c7
Added AG_CONEX and AG_UC classes
2016-02-23 09:02:49 -06:00
ef6876c4e1
Update CDIR documentation
2016-02-19 14:16:13 -06:00
d52fe5ee2e
Changed jog error checks from dial to user limits.
2016-02-19 11:14:53 -06:00
333374afbb
Merge branch 'master' of https://github.com/epics-modules/motor
2016-02-10 14:07:16 -06:00
ab6092f8b5
Merge pull request #15 from rsluiter/MAXvIRQ1
...
Document valid MAXv IRQ's are 2-6
2016-02-10 13:55:16 -06:00
084f6d9c67
Document valid MAXv IRQ's are 2-6
2016-02-10 13:41:14 -06:00
fc54e37f57
Doc valid MAXv IRQ's are 2-6
2016-02-10 13:36:17 -06:00
165c38694a
Merge branch 'master' of github.com:epics-modules/motor
2016-02-09 12:13:25 -06:00
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
1196bbe4df
Merge pull request #14 from rsluiter/master
...
MAXv error check for invalid IRQ=1 value.
2016-02-09 09:07:29 -06:00
69d4ffc9e8
Error check for invalid IRQ=1 value.
2016-02-08 16:54:39 -06:00
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
PI-SRau