 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Keenan Lang
|
6d114d9765
|
script module API change
|
2017-03-01 16:39:12 -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 Jemian
|
02e28d602c
|
supports *positioning* motors
|
2017-02-13 13:07:56 -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 |
|
|
rsluiter
|
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-SRau
|
89220a12dd
|
Merge pull request #3 from epics-modules/master
sync with epics-modules
|
2017-01-11 16:35:39 +01:00 |
|
|
Pete R Jemian
|
f718aaa3ba
|
link to all HTML docs
|
2016-11-09 14:55:54 -06:00 |
|
|
Pete R Jemian
|
e23721fb0c
|
the module name
|
2016-11-09 14:55:07 -06:00 |
|
|
Pete R Jemian
|
28f4a8f2ed
|
display each HTML file
|
2016-11-09 14:52:29 -06: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 |
|
|
rsluiter
|
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 |
|