Skip to content

Commit

Permalink
Merge pull request #207 from epics-modules/release-notes-update
Browse files Browse the repository at this point in the history
Updated documentation for R7-3
  • Loading branch information
kmpeters authored May 23, 2023
2 parents 80b011b + e7b6302 commit 01037f0
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 40 deletions.
27 changes: 22 additions & 5 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
# Motor Releases

## __R7-3 (2023-05-XX)__
## __R7-3 (2023-05-23)__
R7-3 is a release based on the master branch.

### Changes since R7-2-2

#### New features
* Added motorAcsMotion as a submodule
* TBD
* Commit [c764bd6](https://github.com/epics-modules/motor/commit/c764bd6426c3939bded75df2909b76d148c2f8c9): Added motorAcsMotion as a submodule
* Pull request [#160](https://github.com/epics-modules/motor/pull/160) from [Torsten Bögershausen](https://github.com/tboegi): Added the Restore Mode (**RSTM**) field
* Pull request [#163](https://github.com/epics-modules/motor/pull/163): Autosave the RSTM field and allow it to be specified when motor databases are loaded
* Pull request [#197](https://github.com/epics-modules/motor/pull/197): Added model-2-specific databases to work around MOTOR_REC_{OFFSET,RESOLUTION,DIRECTION} errors at iocInit
* Pull request [#193](https://github.com/epics-modules/motor/pull/193) from [Jack Harper](https://github.com/rerpha): Added raw limit (**RHLM**, **RLLM**) fields
* Pull request [#202](https://github.com/epics-modules/motor/pull/202) and [#204](https://github.com/epics-modules/motor/pull/204): Added prop(YES) to fields in motorRecord.dbd that should generate DBE_PROPERTY callbacks
* Pull request [#122](https://github.com/epics-modules/motor/pull/122) from [Torsten Bögershausen](https://github.com/tboegi): Addded Acceleration (**ACCS**) and Acceleration Used (**ACCU**) fields
* Pull request [#203](https://github.com/epics-modules/motor/pull/203): Changed the Acceleration Used (ACCU) field from a readback to a control

#### Modifications to existing features
* TBD
* Pull request [#180](https://github.com/epics-modules/motor/pull/180) from [Torsten Bögershausen](https://github.com/tboegi): Reset UEIP to 'No' if no encoder is present
* Pull request [#193](https://github.com/epics-modules/motor/pull/193) from [Jack Harper](https://github.com/rerpha): Soft limits are synced on MRES changes

#### Bug fixes
* TBD
* Pull request [#176](https://github.com/epics-modules/motor/pull/176) from [Torsten Bögershausen](https://github.com/tboegi): Added shareLib.h to motordrvCom.h for compatibility with base 7.0.4
* Pull request [#182](https://github.com/epics-modules/motor/pull/182) from [Freddie Akeroyd](https://github.com/FreddieAkeroyd): Bug fix for negative backlash distance when relative moves are used
* Pull request [#167](https://github.com/epics-modules/motor/pull/167) from [Torsten Bögershausen](https://github.com/tboegi): devMotorAsyn: remove initEvent in init_record()
* Commit [c3d6c6e](https://github.com/epics-modules/motor/commit/c3d6c6ee439e4d46fd2d4c2790091f7c76e31120) from [Mark Rivers](https://github.com/MarkRivers): Fixes for DTYP and EGU not displaying correctly in Phoebus
* Pull request [#206](https://github.com/epics-modules/motor/pull/206) from [Torsten Bögershausen](https://github.com/tboegi): Bug fix for RHLM, RLLM when MRES is negative

#### Documentation
* Commit [382c832](https://github.com/epics-modules/motor/commit/382c8324e5176ce769a09302bf829beca5a9cbea) from [Mark Rivers](https://github.com/MarkRivers): Added "Model 3 EPICS Motor Driver Support" slides

#### Continuous Integration
* Configured to build with GitHub Actions using ci-scripts v3.0.1

#### Driver submodules (and noteworthy changes)

Expand Down
32 changes: 27 additions & 5 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,22 @@ <h2>Where to Find it</h2> You can download the software using
<td><a href="https://github.com/epics-modules/motor/issues">github issues</a></td>
<td>n/a</td>
</tr>
<tr>
<td>R7-3</td>
<td>R3.15.7 or later</td>
<td><a href="https://github.com/epics-modules/motor/archive/R7-3.tar.gz">motorR7-3.tar.gz</a></td>
<td><a href="https://epics.anl.gov/bcda/synApps/motor/R7-3/motorRecord.html">motorRecord.html</a></td>
<td><a href="https://github.com/epics-modules/motor/releases/tag/R7-3">release notes</a></td>
<td><a href="https://github.com/epics-modules/motor/issues?utf8=%E2%9C%93&q=milestone%3AR7-3">github issues</a></td>
<td>2023-05-23</td>
</tr>
<tr>
<td>R7-2</td>
<td>R3.15.7 or later</td>
<td><a href="https://github.com/epics-modules/motor/archive/R7-2-1.tar.gz">motorR7-2-1.tar.gz</a></td>
<td><a href="https://epics.anl.gov/bcda/synApps/motor/R7-2-1/motorRecord.html">motorRecord.html</a></td>
<td><a href="https://github.com/epics-modules/motor/releases/tag/R7-2-1">release notes</a></td>
<td><a href="https://github.com/epics-modules/motor/issues?utf8=%E2%9C%93&q=milestone%3AR7-2-1">github issues</a></td>
<td><a href="https://github.com/epics-modules/motor/archive/R7-2-2.tar.gz">motorR7-2-2.tar.gz</a></td>
<td><a href="https://epics.anl.gov/bcda/synApps/motor/R7-2-2/motorRecord.html">motorRecord.html</a></td>
<td><a href="https://github.com/epics-modules/motor/releases/tag/R7-2-2">release notes</a></td>
<td><a href="https://github.com/epics-modules/motor/issues?utf8=%E2%9C%93&q=milestone%3AR7-2-2">github issues</a></td>
<td>2020-05-13</td>
</tr>
<tr>
Expand Down Expand Up @@ -324,6 +333,19 @@ <h2>Required Modules</h2> &nbsp;
<td><b>Required modules</b></td>
<td><b>Release needed</b></td>
</tr>
<tr>
<td>R7-3</td>
<td><a href="https://epics.anl.gov/modules/soft/asyn/">ASYN</a> &nbsp; <br />
<a href="https://github.com/epics-modules/ipac/wiki">IPAC</a> &nbsp;(for motorHytec &amp; VME-based serial and GPIB examples) <br />
<a href="https://github.com/epics-modules/lua">LUA</a> &nbsp;(for motorScriptMotor) <br />
<a href="https://github.com/epics-modules/modbus">MODBUS</a> &nbsp;(for motorAMCI IOCs)
</td>
<td>R4-41+<br />
R2-16<br />
R3-0<br />
R3-2
</td>
</tr>
<tr>
<td>R7-2</td>
<td><a href="https://epics.anl.gov/modules/soft/asyn/">ASYN</a> &nbsp; <br />
Expand Down Expand Up @@ -685,7 +707,7 @@ <h2>Installation and Building</h2> After obtaining a copy of the distribution,

<hr width="100%" />
<br />
Page Last Modified: 2020-05-14 <br />
Page Last Modified: 2023-05-23 <br />
<i><a href="mailto:[email protected]">Kevin Peterson</a></i> <br />
<br />
</body>
Expand Down
92 changes: 63 additions & 29 deletions docs/motorRecord.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ <h2>Contents</h2>
</ul>
<a name="Overview"></a>

<h2>Overview</h2> This documentation describes version R7-2-1 of the EPICS motor
<h2>Overview</h2> This documentation describes version R7-3 of the EPICS motor
record, and related EPICS software required to build and use it.&nbsp; Version
R7-2-1 of the motor record is compatible with EPICS base R3.15.7 and above.
R7-3 of the motor record is compatible with EPICS base R3.15.7 and above.
<p>
The motor record is intended to support positioning motors of all kinds, but currently
supports motor controllers from the following manufacturers:
</p>

<ul>
<li>
ACS Motion Control: <a href="https://github.com/epics-motor/motorAcsTech80">motorAcsTech80</a>
ACS Motion Control: <a href="https://github.com/epics-motor/motorAcsMotion">motorAcsMotion</a> &amp; <a href="https://github.com/epics-motor/motorAcsTech80">motorAcsTech80</a>
</li>
<li>
Advanced Control Systems, Corp: <a href="https://github.com/epics-motor/motorAcs">motorAcs</a>
Expand All @@ -62,15 +62,9 @@ <h2>Overview</h2> This documentation describes version R7-2-1 of the EPICS motor
<li>
attocube systems: <a href="https://github.com/epics-motor/motorAttocube">motorAttocube</a>
</li>
<li>
Delta Tau: <a href="https://github.com/epics-motor/motorDeltaTau">motorDeltaTau</a>
</li>
<li>
Faulhaber: <a href="https://github.com/epics-motor/motorFaulhaber">motorFaulhaber</a>
</li>
<li>
Hytec: <a href="https://github.com/epics-motor/motorHytec">motorHytec</a>
</li>
<li>
Kohzu: <a href="https://github.com/epics-motor/motorKohzu">motorKohzu</a>
</li>
Expand All @@ -89,12 +83,21 @@ <h2>Overview</h2> This documentation describes version R7-2-1 of the EPICS motor
<li>
Newport: <a href="https://github.com/epics-motor/motorNewport">motorNewport</a>
</li>
<li>
Newwood Solutions Ltd (formerly Hytec): <a href="https://github.com/epics-motor/motorHytec">motorHytec</a>
</li>
<li>
Novanta IMS (formerly Schneider Electric (formally IMS)): <a href="https://github.com/epics-motor/motorIms">motorIms</a>
</li>
<li>
Micronix: <a href="https://github.com/epics-motor/motorMicronix">motorMicronix</a>
</li>
<li>
nPoint: <a href="https://github.com/epics-motor/motorNPoint">motorNPoint</a>
</li>
<li>
Omron Delta Tau: <a href="https://github.com/epics-motor/motorDeltaTau">motorDeltaTau</a>
</li>
<li>
Oregon Micro Systems: <a href="https://github.com/epics-motor/motorOms">motorOms</a> &amp; <a href="https://github.com/epics-motor/motorOmsAsyn">motorOmsAsyn</a>
</li>
Expand All @@ -110,9 +113,6 @@ <h2>Overview</h2> This documentation describes version R7-2-1 of the EPICS motor
<li>
piezosystem jena GmbH: <a href="https://github.com/epics-motor/motorPiJena">motorPiJena</a>
</li>
<li>
Schneider Electric (formally IMS): <a href="https://github.com/epics-motor/motorIms">motorIms</a>
</li>
<li>
SmarAct GmbH: <a href="https://github.com/epics-motor/motorSmarAct">motorSmarAct</a>
</li>
Expand Down Expand Up @@ -904,22 +904,6 @@ <h2>Field Descriptions</h2> In addition to fields common to all record types (se
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_res">RSTM</a></td>
<td>R/W</td>
<td>Restore Mode</td>
<td>RECCHOICE</td>
<td>(0:"Never", 1:"Always", 2:"NearZero", 3:"Conditional")<br>
</td>
</tr>
<tr>
<td><a href="#Fields_motion">SPDB</a></td>
<td>R/W</td>
<td>Set Point Deadband (EGU)</td>
<td>DOUBLE</td>
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_link">RDBL</a></td>
<td>R</td>
Expand All @@ -944,6 +928,14 @@ <h2>Field Descriptions</h2> In addition to fields common to all record types (se
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_limit">RHLM</a></td>
<td>R</td>
<td>Raw High Limit</td>
<td>DOUBLE</td>
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_limit">RHLS</a></td>
<td>R</td>
Expand All @@ -960,6 +952,14 @@ <h2>Field Descriptions</h2> In addition to fields common to all record types (se
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_limit">RLLM</a></td>
<td>R</td>
<td>Raw Low Limit</td>
<td>DOUBLE</td>
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_limit">RLLS</a></td>
<td>R</td>
Expand Down Expand Up @@ -1016,6 +1016,14 @@ <h2>Field Descriptions</h2> In addition to fields common to all record types (se
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_res">RSTM</a></td>
<td>R/W</td>
<td>Restore Mode</td>
<td>RECCHOICE</td>
<td>(0:"Never", 1:"Always", 2:"NearZero", 3:"Conditional")<br>
</td>
</tr>
<tr>
<td><a href="#Fields_motion">RTRY</a></td>
<td>R/W</td>
Expand Down Expand Up @@ -1079,6 +1087,14 @@ <h2>Field Descriptions</h2> In addition to fields common to all record types (se
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_motion">SPDB</a></td>
<td>R/W</td>
<td>Set Point Deadband (EGU)</td>
<td>DOUBLE</td>
<td><br>
</td>
</tr>
<tr>
<td><a href="#Fields_command">SPMG</a></td>
<td>R/W*</td>
Expand Down Expand Up @@ -2123,6 +2139,24 @@ <h2>Field Descriptions</h2> In addition to fields common to all record types (se
the DIR field has the value "Pos", then DLLM will always be consistent with LLM,
otherwise DLLM will always be consistent with HLM.&nbsp;</td>
</tr>
<tr valign="top">
<td>RHLM</td>
<td>R</td>
<td>Raw High Limit</td>
<td>DOUBLE</td>
<td>The maximum allowed value of the RVAL field. If the MRES field is negative,
then RHLM will always be consistent with DLLM, otherwise RHLM will always be
consistent with DHLM.&nbsp;</td>
</tr>
<tr valign="top">
<td>RLLM</td>
<td>R</td>
<td>Raw Low Limit</td>
<td>DOUBLE</td>
<td>The minimum allowed value of the RVAL field. If the MRES field is negative,
then RLLM will always be consistent with DHLM, otherwise RLLM will always be
consistent with DLLM.&nbsp;</td>
</tr>
<tr valign="top">
<td>LVIO</td>
<td>R</td>
Expand Down Expand Up @@ -3666,6 +3700,6 @@ <h2>Design Decisions</h2> This section of the document is an attempt to record
<hr>
<address>Suggestions and comments to:</address> <br>
<a href="mailto:[email protected]">Kevin Peterson</a> : ([email protected]) <br>
Last modified: 2020-05-14
Last modified: 2023-05-23
</body>
</html>
2 changes: 1 addition & 1 deletion motorApp/MotorSrc/motorRecord.cc
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ USAGE... Motor Record Support.
* .79 21-11-22 jrh - Added raw limits, sync limits on motor resolution change
*/

#define VERSION 7.2
#define VERSION 7.3

#include <stdlib.h>
#include <string.h>
Expand Down

0 comments on commit 01037f0

Please sign in to comment.