Commit Graph

2962 Commits

Author SHA1 Message Date
Mark Rivers 302d4d61fc Merge branch 'master' of github.com:epics-modules/motor 2022-10-10 08:15:13 -05:00
Mark Rivers 382c8324e5 New documentation file 2022-10-10 08:14:57 -05:00
Kevin Peterson 4c383ca916 Merge pull request #190 from xiaoqiangwang/doc_fix
Doc: fix some field types according to motorRecord.dbd
2022-09-15 13:59:28 -05:00
Xiaoqiang Wang b0cabdf66d fix some field types according to motorRecord.dbd 2022-09-14 13:09:24 +02:00
Kevin Peterson 9c0bc96b1e Merge pull request #186 from justincslac/justincslac-patch-1
Update .gitignore
2022-08-08 11:13:00 -05:00
keenanlang 96509caba2 req file for basic asyn motor. Fixes #183 2022-08-02 13:16:23 -05:00
justincslac e1f63e5fea Update .gitignore 2022-05-09 12:01:23 -07:00
Kevin Peterson 6b2409b03a Merge pull request #184 from epics-modules/github-actions
Configured to build with github-actions
2022-04-28 16:05:23 -05:00
Kevin Peterson 642fcf541d Fixed ambiguous directory mask 2022-04-28 15:35:10 -05:00
Kevin Peterson cba123e69a Use the travis post-prepare.py and util.py scripts 2022-04-28 15:21:20 -05:00
Kevin Peterson a5bf21c94e Configured to build with github-actions 2022-04-28 14:55:43 -05:00
Kevin Peterson cc6c6a9b18 Merge pull request #182 from FreddieAkeroyd/Ticket181_fix_relative_moves_with_negative_backlash
Fix negative backlash with relative moves in a negative direction.  Fixes #181
2021-12-01 14:21:58 -06:00
Freddie Akeroyd 524696a8d0 Fix negative backlash with relative moves in a negative direction
A negative BDST was correctly applied to negative direction moves
if moves are absolute. When retries are enabled all moves become
relative and backlash was not applied correctly for negative direction
moves.
2021-11-26 18:23:29 +00:00
Kevin Peterson 8fdd35dc11 Merge pull request #180 from EuropeanSpallationSource/reset-ueip-if-no-encoder-present
motorRecord: Reset UEIP to No if no encoder is present
2021-11-18 13:25:25 -06:00
Torsten Bögershausen 24a53e660e motorRecord: Reset UEIP to No if no encoder is present
When a database is loaded with UEIP=Yes and the controller says that there is no
encoder present, reset UEIP to No
2021-11-17 08:42:23 +01:00
Kevin Peterson 6d127cd6f4 Merge pull request #176 from EuropeanSpallationSource/motordrvCom_h-needs-shareLib_h
motordrvCom.h needs shareLib.h
2021-04-26 11:19:58 -05:00
Torsten Bögershausen 784e41927b motordrvCom.h needs shareLib.h
We can't compile motor against this commit of EPICS base:
  commit 0f428ea3346d89719b03a6419319c85afb0fee13
  Author: Michael Davidsaver <mdavidsaver@gmail.com>
  Date:   Thu Apr 1 10:57:19 2021 -0700

      use DBCORE_API

Solution: Include <shareLib.h>
2021-04-19 14:19:50 +02:00
Kevin Peterson da3bfab4c1 Added R7-2-2 to RELEASE.md 2021-02-02 12:18:21 -06:00
Kevin Peterson ac73654da1 Merge pull request #174 from EuropeanSpallationSource/motorOms-epicsMutexMustLock
Fixes the problem described here:
https://github.com/epics-modules/motor/issues/172#issuecomment-758139901
2021-02-02 11:33:52 -06:00
Torsten Bögershausen 996b7943db motorOms: epicsMutexMustLock 2021-02-02 16:25:58 +01:00
Kevin Peterson 173355c5ea Merge pull request #168 from epics-modules/add_shareLib
Add shareLib.h
2020-09-08 09:50:57 -05:00
Mark Rivers 394998bb1b Add shareLib.h 2020-09-04 11:01:47 -05:00
Kevin Peterson c764bd6426 Added motorAcsMotion (R1-0) as a submodule 2020-08-06 14:10:15 -05:00
Kevin Peterson c59afdcb60 Improved the travis post-prepare python script 2020-06-16 13:55:08 -05:00
kpetersn 4353a6ed8f Added local copy of ANSI colors 2020-06-15 17:01:33 -05:00
kpetersn 7080091177 Use subprocess.call instead of subprocess.run on older versions of python 2020-06-15 16:54:09 -05:00
Kevin Peterson efa32a948f Upgraded ci-scripts to v3.0.1 2020-06-15 16:33:28 -05:00
Kevin Peterson 8b7e2ade98 Merge pull request #163 from epics-modules/RSTM-improvements
Autosave the RSTM field and allow it to be specified when motor records are loaded.
2020-06-11 18:17:36 -05:00
kpetersn 4e9aae4e3e Allow the RSTM field to be specified when motor records are loaded with dbLoadRecords or dbLoadTemplate 2020-06-11 17:57:16 -05:00
Kevin Peterson 90efeda22a Added RSTM to basic_motor_settings.req 2020-06-11 17:34:38 -05:00
Kevin Peterson f47a376423 Corrected typo 2020-06-11 17:30:40 -05:00
Kevin Peterson d274e15863 Merge pull request #162 from EuropeanSpallationSource/motorNewport-070c93e1aa1a4
Update modules/motorNewport/ (travis should work)
2020-06-11 16:51:39 -05:00
Kevin Peterson b7fac8193b Merge pull request #160 from EuropeanSpallationSource/add-RSTM-field
Add field RSTM: Restore Mode
2020-06-11 16:39:22 -05:00
Torsten Bögershausen 2906f3d8f9 Add field RSTM: Restore Mode
Partly revert the following commit:
  commit 3090983c31
  Author: Ron Sluiter <rsluiter@users.noreply.github.com>
  Date:   Wed Jul 29 15:50:23 2015 +0000
      Bug fix for target position (VAL/DVAL/RVAL) initialization error
      when the motor record is configured to do retries.
And from the release notes:

6) Kevin Peterson discovered an initialization bug when the motor record is
    configured to do retries. When configured to do retries, the motor
    record issues incremental rather than absolute moves. If the motor
    behaves badly (e.g., a piezo stiction motor) the controller's absolute
    step count can be far from its' absolute readback position. The motor
    record initialization logic that determines how the target positions
    are initialized at boot-up was not taking into consideration whether
    or not the motor record is configured to do retries, and therefore,
    whether or not absolute or incremental moves were issued by the motor
    record. With this release, if the motor record is configured to do
    retries, then the controller's absolute position is ignored (because
    the controller's absolute position was "corrupted" by retries) and the
    autosave/restore position is used to set the controllers position.

    Switching between retries on and off (relative vs. absolute moves)
    between reboots will cause unpredictable results and is not covered
    by this bug fix.

   Files modified: motor_init_record_com() in MotorSrc/motordevCom.cc
                   init_controller()       in MotorSrc/devMotorAsyn.c

Commit 3090983c improves the situation for setups where autosave is
used, and makes things worse when autosave is not used.
When autosave is not used and the motor is configured to do retries,
the the DVAL field is loaded into the controller regardless.
And because DVAL is 0.0 at startup, the controller position is lost.

The first issue report is found here:
"Problem with R6-10 issue 6 fix - controller position can be lost on reboot"
https://github.com/epics-modules/motor/issues/85

And the we have another issue report here:
"IOC zeroes encoder on startup"
https://github.com/motorapp/Galil-3-0/issues/13

A possible way forward is discussed here:
"Add a field to the motor record to allow always restoring the
 autosaved position"
https://github.com/epics-modules/motor/issues/151

This commit adds the "RSTM" field:
- 0 Disables restoring the autosaved position
- 1 Always restores the autosaved position
- 2 Uses the same logic as motorRecord 6.9 (or older)
- 3 Uses the same logic as motorRecord 6.10

This numbering maps 0 and 1 somewhat to false/true, uses 2/3 for
special handlings and leaves room for more choices.

E.g. "use the encoder value, if valid, fall back to autosave if not.
Or "use the URIP/RDBL" if possible.
I am getting off-topic,
those improvements should be done in later commits anyway.
2020-06-10 07:55:22 +02:00
Torsten Bögershausen 41dd365db5 Update modules/motorNewport/ (travis should work) 2020-05-30 07:33:59 +02:00
Kevin Peterson 5224d2da3c Merge pull request #161 from EuropeanSpallationSource/ci-ignore-return-code-of-grep
travis/post-prepare.sh: Ignore return code of grep
2020-05-20 09:22:18 -05:00
Torsten Bögershausen ae2935c4fd travis/post-prepare.sh: Ignore return code of grep
When grepping for SUPPORT in the different files,
grep may fail, because "SUPPORT" is not present.
A failing grep will cause travis to fail.
Solution: Ignore the exit code of grep.
2020-05-19 19:48:12 +02:00
Kevin Peterson cafd96b0e9 Also omit the patch version from the 'Motor Version' column in index.html R7-2-1 2020-05-14 15:36:55 -05:00
Kevin Peterson 8d6b6cf33d Omit the patch version from the 'Module Version' column in index.html 2020-05-14 15:34:31 -05:00
Kevin Peterson ae9114e96c Updated documentation for R7-2-1 2020-05-14 15:31:02 -05:00
Kevin Peterson 2821af6f71 Updated driver modules to resolve build problems for Windows and
VxWorks:

  motorHytec	R1-0-2
  motorOmsAsyn	R1-0-2
  motorSmarAct	R1-2-1
2020-05-14 15:01:56 -05:00
Kevin Peterson 3f207f6662 Fixed typo R7-2 2020-05-13 17:36:26 -05:00
Kevin Peterson 7fe4b35aa6 Updated the html documentation for version 7.2 2020-05-13 17:31:15 -05:00
Kevin Peterson d472dd10f5 Updated the motor record version to 7.2 2020-05-13 17:30:57 -05:00
Kevin Peterson 57d9f53728 Minor changes to the formatting of RELEASE.md 2020-05-13 17:16:24 -05:00
Kevin Peterson 2508548009 Updated RELEASE.md for R7-2 2020-05-13 17:12:18 -05:00
Kevin Peterson 714478d6b0 Updated driver modules:
motorAcs		R1-1	8c1fd9366435b7b9a34d0d5d84a5ad981b241846
motorAcsTech80		R1-0-1	d7706b0f8189f5d253a4e6a610c34c33115be6f6
motorAerotech		R1-1	3fa94b7429cdf3df88ee0cb02c4c7f46a070ce26
motorAMCI		R1-0-1	4c88334bd8dcd82034ccd126fbc11e9007cd4802
motorAttocube		R1-0-1	cc28182ecdb7d4325f5102be1e4bd4375422e492
motorDeltaTau		R1-0-1	b889129d8b24b7d8e0d74b726850c174d9d4f051
motorFaulhaber		R1-0-1	86dbaa795d651db2bd93f04015b3fa816c812676
motorHytec		R1-0-1	fad4155ff5c0765157edfe96cffbdbea6d336262
motorIms		R1-0-1	cebdb170b91dd4db48f5b4742b7a16528abcf573
motorKohzu		R1-0-1	f406c18bde2f9ec36dd9fee9f7d6576c247b13df
motorMclennan		R1-1	03750269099922d6ac1d12b5c89bece77f4009e2
motorMicos		R2-0	d98d5c2989f4f0c596c64b3daf3e5160bac344b8
motorMicroMo		R1-0-1	c0845b24aa3a603dc9692d79beaeb0e2ea0d532d
motorMicronix		R1-0-1	e2fcf8a4a03a0fd0d9d1c88ef9b242a2aaf306c4
motorMotorSim		R1-1	6e2f64601e5f27ba212fc8e8488ac655cc4bb483
motorMXmotor		R1-0-1	d3efe48cf07f9a3ca5914e629c824e1df6d82094
motorNewFocus		R1-1-1	176006e881fcec8a4ea0b300d5ee908fcfd0d655
motorNewport		R1-1	d7b6818a893feb622c9c7dcafa645095561e965d
motorNPoint		R1-0-1	37ab6f1eddb358987d4c4e2b3479c0058d8c63c6
motorOms		R1-1	c3cfa1628015cd17176ebcd97babd8f78ea03630
motorOmsAsyn		R1-0-1	625c0248460dae6d6804582cf249230668d80c15
motorOriel		R1-0-1	32bbe993211535313aff4c1a3157f9089ed08273
motorParker		R1-1	0d78e498aa9c6e5ce393acac45429f34496523d1
motorPhytron		R1-1	55509f404e8746684d3ac1ba4fe26c98adeab7b6
motorPI			R1-0-1	c58c5a4e3db676dc0744b116a64de67530a087ad
motorPIGCS2		R1-1	b52f98361b055d9505c84cee0099ab08b1de0367
motorPiJena		R1-0-1	535e9ac1590d9b294d05518ae9a0acc824fcafad
motorScriptMotor	R1-1	374a23bae3d0cfe4aa9f268ae5703e43f3d129da
motorSmarAct		R1-2	9ca8f47ae0e814b4d9669e04a76f96f305caab53
motorSmartMotor		R1-0-1	79ea9a72980c04f43b43c56ed9a84cdaea7c7e8b
motorThorLabs		R1-0-1	bffd7c94f6f2dc37485a90e40085f181af2bfeb2
2020-05-13 14:25:33 -05:00
Mark Rivers 84caef3ba4 Merge branch 'master' of github.com:epics-modules/motor 2020-05-11 09:41:55 -05:00
Mark Rivers 700a338fd5 New autoconvert 2020-05-11 09:41:01 -05:00
keenanlang de29f768d1 Add support definition so modules can install iocsh 2020-05-06 13:55:44 -05:00