Commit Graph

2629 Commits

Author SHA1 Message Date
kpetersn ff2ac7196f Added macros for 32-bit registers 2018-03-22 14:45:02 -05:00
kpetersn 89cf615600 Cleaned up some of the code. 2018-03-22 11:51:04 -05:00
kpetersn 1fc33f95f9 Fixed the readReg32 calculation. Don't use registers_ for everything. Added zeroRegisters method. 2018-03-22 11:33:05 -05:00
kpetersn 1a4d1756b9 Corrected the max acceleration/deceleration 2018-03-21 15:07:55 -05:00
kpetersn 1f8e9d8a23 Added a reconfig routine. Corrected nElements after switching to modbus master branch on github. 2018-03-21 14:58:37 -05:00
kpetersn 5eef01248c Removed configBits 2018-03-20 14:57:17 -05:00
kpetersn 758f6fcc8b Print more info. Try to write/read registers for axis 2 (currently doesn't work properly). 2018-03-20 13:47:56 -05:00
kpetersn fae911bc35 Uncommented lines that zeroed the command register before a move (required for every move after the first after power-on to succeed) 2018-03-19 15:33:32 -05:00
kpetersn 2c269bb69f Also set all the registers when setting the position. Allows a single move to succeed after each setPosition call. 2018-03-16 16:30:06 -05:00
kpetersn 13ee3d23e4 Only configure the axis once 2018-03-16 15:37:30 -05:00
kpetersn d792f9afe7 Send all the registers when setting the configuration (fixes failure-to-configure problem after an error occurs). Also try to send move data with all 10 registers (fails in the same way as setting the registers independently) 2018-03-16 15:16:03 -05:00
kpetersn aaae2e642a Zeroing the CMD_MSW doesn't fix the unable-to-move problem 2018-03-16 13:50:41 -05:00
kpetersn 65dea5b7d2 Added a GetInfo that results in the getInfo() axis method being called. 2018-03-16 13:02:41 -05:00
kpetersn a05f47f96c Cleaned up code. Reduced delays added for testing. 2018-03-14 11:18:25 -05:00
kpetersn faba02a442 Set the configuration bits with array writes 2018-03-14 10:28:05 -05:00
kpetersn 43c8eee384 Added a port to enable atomic writes of the config data 2018-03-09 15:54:00 -06:00
kpetersn 5651f7071e Added some variables and methods to troubleshoot init problems. Unsuccessful so far. 2018-03-09 14:37:00 -06:00
kpetersn 751905b275 Removed some print statements. Added more report info. 2018-03-08 15:55:46 -06:00
kpetersn 646b5fb87d Added support for the ANF2. Code compiles without error but hasn't been tested yet. 2018-03-08 11:41:19 -06:00
sluiter c1c4407644 Replaced invalid LT_EPICSBASE logic with working logic from SSCAN. Since EPICS_VERSION_INT defined in EPICSbase 3.15, added EPICS_PATCH_LEVEL argument. 2018-01-04 14:52:05 -06:00
Mark Rivers 60aa414b37 Add missing include files stdLib.h and errlog.h 2017-12-06 17:45:20 -06:00
Mark Rivers 8409249849 Added missing includes for stdLib.h and errlog.h, needed for base 7.0 2017-12-04 18:21:47 -06:00
kpetersn 73e076be46 Added R6-10 to documentation 2017-11-30 14:27:20 -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