Commit Graph

2619 Commits

Author SHA1 Message Date
kpetersn 9ee282c98b Minor improvements to documentation:
* Use APS links instead of github preview links until the
  release contains the relevant documentation (motor.html)
  * Changed one instance of 6-9 to 6-10 (motorRecord.html)

(cherry picked from commit 4bbba98bd5)
2018-06-06 14:32:53 -05:00
Kevin Peterson 478ac824c3 Merge pull request #96 from kmpeters/R6-10-documentation
Added R6-10 documentation
(cherry picked from commit 2cfd494c16)
2018-06-06 14:31:21 -05:00
Kevin Peterson 422a996137 Merge pull request #60 from EuropeanSpallationSource/record-DLYandSTOP-problem
Record: motor record DLY and STOP problem
(cherry picked from commit 90bb52f3c6)
2018-06-06 14:30:43 -05:00
Kevin Peterson 12c9d900df Merge pull request #83 from mp49/autopower_fix
Fix issue with power being left on when using autoPower option in asy…
(cherry picked from commit f3d4e0fd1d)
2018-06-06 14:29:00 -05:00
Kevin Peterson 7c287138ff Merge pull request #94 from shadowguy/master
Added I/O flush before first query (Micronix MMC-x00)
(cherry picked from commit beba85f7b2)
2018-06-06 14:27:44 -05:00
kpetersn 1cb778ae55 Corrected ANL EPICS URLs in travis-prepare.sh
(cherry picked from commit 23b8c5f528)
2018-06-06 14:26:03 -05:00
sluiter 66e8dcb485 If URIP=Yes and reading RDBL causes LINK error, do not start a new target position move.
(cherry picked from commit 7493d50bc8)
2018-06-06 14:25:21 -05:00
Keenan Lang 427890142f Readded INIT due to iocsh interpretation issues
(cherry picked from commit 75162d1fef)
2018-06-06 14:23:58 -05:00
Keenan Lang a90ce0d4d7 fix typos
(cherry picked from commit 6998c37163)
2018-06-06 14:23:26 -05:00
sluiter 39b17d907e Replaced invalid LT_EPICSBASE logic with working logic from SSCAN. Since EPICS_VERSION_INT defined in EPICSbase 3.15, added EPICS_PATCH_LEVEL argument.
(cherry picked from commit c1c4407644)
2018-06-06 14:22:50 -05:00
Mark Rivers 3f2fb84c1f Add missing include files stdLib.h and errlog.h
(cherry picked from commit 60aa414b37)
2018-06-06 14:20:00 -05:00
Mark Rivers 8868cd9771 Added missing includes for stdLib.h and errlog.h, needed for base 7.0
(cherry picked from commit 8409249849)
2018-06-06 14:19:06 -05:00
kpetersn 15e37a5eda Added R6-10 to documentation 2017-11-30 14:26:29 -06:00
rsluiter 691d375f0a Merge pull request #87 from epics-modules/gcc-fix
After testing these changes in MotorSrc and several drivers, this looks good to me.
R6-10
2017-11-30 11:10:51 -06:00
rsluiter 5245991323 Merge pull request #88 from epics-modules/fix-esp300
Fix problems with devESP300 and drvESP300
2017-11-27 10:21:34 -06:00
Mark Rivers 91b2e335d2 Set deceleration the same as acceleration for SET_ACCEL command; previously the default controller decleration was always used 2017-11-22 15:50:33 -06:00
Mark Rivers 1512357f70 Added comments, improved logic 2017-11-22 15:49:51 -06:00
Mark Rivers b969f5a0ab Set drive_resolution when open-loop steppers are used.
Previously drive resolution was determined using the SU? command, which returns the encoder resolution.
The SU? value is not meaningful when open-loop steppers are used, and cannot even be set in the controller.
Use the ZB? command to see if stepper positioning is enabled and encoder feedback is disabled.
If so the full-step (FR?) and microstep (QS?) values are used to determine drive_resolution.
If not then SU? is used to determine drive resolution, as previously.
2017-11-22 15:49:30 -06:00
klang a62c5e4e57 Further gcc errors reported 2017-11-21 16:49:37 -06:00
klang 914832910d Changed NULL casts from 'char' to 'char*' 2017-11-08 14:04:12 -06:00
rsluiter 220d18fcff Merge pull request #63 from rsluiter/master
Stop motor if URIP is Yes and RDBL read returns an error.
2017-09-13 13:45:04 -05:00
rsluiter 67a9bc2225 Merge pull request #70 from kmpeters/issue69
Added extern "C" to iocsh registration code in HytecMotorDriver.cpp
2017-09-07 09:17:41 -05:00
rsluiter 18dd3cbbf5 Merge pull request #68 from kmpeters/issue67
I am not sure why "C" linkage is required, but it is.
2017-09-07 09:16:54 -05:00
Mark Rivers 4cf25d83c8 Merge pull request #66 from kmpeters/issue65
Removed AMCIRegister.{cc,h}.
2017-08-31 15:50:53 -05:00
Mark Rivers d827ae8a51 Merge branch 'master' of github.com:epics-modules/motor 2017-08-28 18:09:33 -05:00
Mark Rivers 192e7c1bef Added Travis CI status link 2017-08-28 18:09:25 -05:00
Kevin Peterson 4b89359e1c Merge pull request #75 from klauer/velo_vbas_fix
Fix ACCL calculation when VELO == VBAS.
2017-08-28 13:32:27 -05:00
Kevin Peterson 4ade0a7f37 Merge pull request #74 from klauer/travis_ci_from_source
Add TravisCI configuration (3.14 - 3.16, Linux/RTEMS/mingw32)
2017-08-24 14:47:47 -05:00
K Lauer 8a16af5067 Add TravisCI configuration 2017-08-24 12:08:16 -07:00
Kevin Peterson 372c99d8cc Merge pull request #34 from Brudhu/master
Add files for supporting PIE517 piezo controller
2017-08-24 13:53:46 -05:00
Kevin Peterson 0bc027e2e4 Merge pull request #72 from epics-modules/motorxU-screens
Also fixes #73
2017-08-24 10:48:53 -05:00
Pete Jemian 468a96c506 fixes #73 2017-08-24 10:43:45 -05:00
Pete Jemian 6ccf596162 additional panels used by USAXS 2017-08-24 07:20:21 -05:00
kpetersn a3cd81031a Revert "Merge branch 'master' into master"
This reverts commit 3ec6ec433c, reversing
changes made to 8966aeabf2.
2017-08-23 15:36:12 -05:00
Keenan Lang 3ec6ec433c Merge branch 'master' into master 2017-08-23 15:18:33 -05:00
kpetersn 57b8cdca25 Added extern "C" to iocsh registration code. Fixes #69 2017-08-23 10:47:14 -05:00
kpetersn 2dafc4757c Added extern "C" to iocsh registration code. Fixes #67 2017-08-22 15:44:55 -05:00
kpetersn 5c2d62e56f Removed AMCIRegister.{cc,h}. Fixes #65 2017-08-22 15:13:09 -05:00
Mitch D'Ewart b201e40ee3 Changed ACCL calculation when VELO == VBAS.
Previously ACCL was only calculated as (VELO-VBAS)/TIME.
This could cause problems for drivers setting ACCL=0.
Now if VELO == VBAS, ACCL = VELO/TIME.
2017-08-07 13:56:07 -07:00
Mark Rivers dc8e0f0da0 Merge branch 'master' of github.com:epics-modules/motor 2017-07-19 12:02:40 -05:00
Mark Rivers 8966aeabf2 Merge pull request #64 from kurtgoetze/master
AMCI ANG1 stepper controller/driver support
2017-07-19 11:02:23 -06:00
Kurt A. Goetze f00dc933f7 update comments 2017-07-19 11:53:39 -05:00
Kurt A. Goetze 2ff3d3a562 Add support files 2017-07-18 12:12:57 -05:00
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
Mark Rivers 7324d917dc Put epicsExportRegistrar in extern C; otherwise it won't link on Windows 2017-07-03 13:25:53 -05:00
sluiter db5da2f075 Stop motor if URIP is Yes and RDBL read returns an error. 2017-05-19 10:19:36 -05:00
Keenan Lang 4125a39c40 Add iocsh bindings for oms58Setup command 2017-05-03 10:15:20 -05:00
Keenan Lang d10c31ff2e Fixed Formatting 2017-04-19 16:01:07 -05:00