lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity
2,594 Commits 5 Branches 29 Tags
7d3d93387f73f241eefa9aaff4a13f2efdff3f2f
Commit Graph

2045 Commits

Author SHA1 Message Date
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
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 372c99d8cc Merge pull request #34 from Brudhu/master 
Add files for supporting PIE517 piezo controller
 2017-08-24 13:53:46 -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
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
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
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
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
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
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
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
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
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 Lang 931dc8f1c7 Changed c function name to match iocsh function. 2016-09-15 09:25:40 -05:00
Keenan Lang 0b4edac838 Add database to top level directory 2016-09-14 17:07:20 -05:00
Keenan Lang 4b926bf094 Added reload screen 2016-09-14 15:24:50 -05:00
Keenan Lang 5c0d5d8c1f Scriptable motor support 2016-09-14 15:22:27 -05:00
prjemian 8d473ceb10 remove widgets for M5-M8 from 4motor form 2016-08-31 14:42:18 -05:00
Keenan Lang ee4bddd761 Merge pull request #33 from keenanlang/master 
Switch asynMotorAxis status_ and statusChanged_ to be protected
 2016-08-25 13:41:20 -05:00
Mark Rivers 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
rsluiter 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
Bruno Luvizotto f31ed90b25 Add files for supporting PIE517 piezo controller 2016-08-10 10:35:52 -04: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