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
Matthew Pearson
928f79fc9d
Keep the sign information on the MRES and ERES used to calculate the encoder ratio. This fixes issue #82 .
2017-09-29 12:01:48 -04:00
Matthew Pearson
8229bb7658
Fix issue with power being left on when using autoPower option in asynMotorController. This could happen if the motor doesn't move because it's already in position, so the poller doesn't detect a move.
2017-09-29 11:36:59 -04: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
Keenan Lang
07d4ac6dfe
lua script module renamed
2017-08-30 15:32:27 -05:00
Keenan Lang
a763198783
Files were renamed in lua script module
2017-08-30 14:23:11 -05:00
Keenan Lang
7d3d93387f
Merge remote-tracking branch 'upstream/master'
2017-08-30 14:16:34 -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
Keenan Lang
1bb6ca05c1
Revert "Revert "Merge branch 'master' into master""
...
This reverts commit a3cd81031a .
2017-08-23 16:09:54 -05:00
Keenan Lang
6e4da0b56a
Merge pull request #2 from epics-modules/master
...
Update
2017-08-23 15:51:12 -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
Mark Rivers
4afa942448
New file
2017-04-18 12:58: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
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 Rivers
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_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