Merge branch 'master' of github.com:epics-modules/motor

This commit is contained in:
Mark Rivers
2022-10-10 08:15:13 -05:00
3 changed files with 18 additions and 15 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ O.*
*.swp *.swp
*BAK.adl *BAK.adl
bin/ bin/
db/ /db/
dbd/ dbd/
html/ html/
include/ include/
+14 -14
View File
@@ -455,7 +455,7 @@ below.
<td><a href="#Fields_motion">FRAC</a></td> <td><a href="#Fields_motion">FRAC</a></td>
<td>R/W</td> <td>R/W</td>
<td>Move Fraction</td> <td>Move Fraction</td>
<td>DOUBLE</td> <td>FLOAT</td>
<td><br> <td><br>
</td> </td>
</tr> </tr>
@@ -676,7 +676,7 @@ below.
<td><a href="#Fields_private">LRVL</a></td> <td><a href="#Fields_private">LRVL</a></td>
<td>R</td> <td>R</td>
<td>Last Raw Des Val</td> <td>Last Raw Des Val</td>
<td>DOUBLE</td> <td>LONG</td>
<td><br> <td><br>
</td> </td>
</tr> </tr>
@@ -925,7 +925,7 @@ below.
<td><a href="#Fields_status">REP</a></td> <td><a href="#Fields_status">REP</a></td>
<td>R</td> <td>R</td>
<td>Raw Encoder Position</td> <td>Raw Encoder Position</td>
<td>DOUBLE</td> <td>LONG</td>
<td><br> <td><br>
</td> </td>
</tr> </tr>
@@ -981,7 +981,7 @@ below.
<td><a href="#Fields_status">RMP</a></td> <td><a href="#Fields_status">RMP</a></td>
<td>R</td> <td>R</td>
<td>Raw Motor Position</td> <td>Raw Motor Position</td>
<td>DOUBLE</td> <td>LONG</td>
<td><br> <td><br>
</td> </td>
</tr> </tr>
@@ -989,7 +989,7 @@ below.
<td><a href="#Fields_status">RRBV</a></td> <td><a href="#Fields_status">RRBV</a></td>
<td>R</td> <td>R</td>
<td>Raw Readback Value</td> <td>Raw Readback Value</td>
<td>DOUBLE</td> <td>LONG</td>
<td><br> <td><br>
</td> </td>
</tr> </tr>
@@ -1013,7 +1013,7 @@ below.
<td><a href="#Fields_drive">RVAL</a></td> <td><a href="#Fields_drive">RVAL</a></td>
<td>R/W*</td> <td>R/W*</td>
<td>Raw Desired Value</td> <td>Raw Desired Value</td>
<td>DOUBLE</td> <td>LONG</td>
<td><br> <td><br>
</td> </td>
</tr> </tr>
@@ -1209,7 +1209,7 @@ below.
<td><a href="#Fields_misc">VERS</a></td> <td><a href="#Fields_misc">VERS</a></td>
<td>R</td> <td>R</td>
<td>Code Version</td> <td>Code Version</td>
<td>DOUBLE</td> <td>FLOAT</td>
<td>e.g., "1.95"</td> <td>e.g., "1.95"</td>
</tr> </tr>
<tr> <tr>
@@ -1827,7 +1827,7 @@ below.
<td>FRAC</td> <td>FRAC</td>
<td>R/W</td> <td>R/W</td>
<td>Move Fraction</td> <td>Move Fraction</td>
<td>DOUBLE</td> <td>FLOAT</td>
</tr> </tr>
<tr> <tr>
<td colspan="5">This field supports closed-loop control of pathological devices <td colspan="5">This field supports closed-loop control of pathological devices
@@ -2426,7 +2426,7 @@ below.
<td>RVAL</td> <td>RVAL</td>
<td>R/W*</td> <td>R/W*</td>
<td>Raw Desired Value</td> <td>Raw Desired Value</td>
<td>DOUBLE</td> <td>LONG</td>
<td>This is the desired position in raw coordinates. When this field is written <td>This is the desired position in raw coordinates. When this field is written
to, VAL and DVAL will be changed correspondingly, and the motor will move (with to, VAL and DVAL will be changed correspondingly, and the motor will move (with
backlash takeout if BDST is nonzero) to the newly written position.&nbsp;</td> backlash takeout if BDST is nonzero) to the newly written position.&nbsp;</td>
@@ -2533,7 +2533,7 @@ below.
<td>RRBV</td> <td>RRBV</td>
<td>R</td> <td>R</td>
<td>Raw Readback Value</td> <td>Raw Readback Value</td>
<td>DOUBLE</td> <td>LONG</td>
<td>The current position of the motor, encoder, or readback link, as received <td>The current position of the motor, encoder, or readback link, as received
from whatever source has been selected to provide position information. The from whatever source has been selected to provide position information. The
units associated with this field depend on the source.&nbsp;</td> units associated with this field depend on the source.&nbsp;</td>
@@ -2542,7 +2542,7 @@ below.
<td>RMP</td> <td>RMP</td>
<td>R</td> <td>R</td>
<td>Raw Motor Position</td> <td>Raw Motor Position</td>
<td>DOUBLE</td> <td>LONG</td>
<td>The contents of the hardware's step-count register. This field contains the <td>The contents of the hardware's step-count register. This field contains the
same information as the dial value, but in steps, rather than in engineering same information as the dial value, but in steps, rather than in engineering
units.&nbsp;</td> units.&nbsp;</td>
@@ -2551,7 +2551,7 @@ below.
<td>REP</td> <td>REP</td>
<td>R</td> <td>R</td>
<td>Raw Encoder Position</td> <td>Raw Encoder Position</td>
<td>DOUBLE</td> <td>LONG</td>
<td>The contents of the hardware's encoder-count register. Ideally, this field <td>The contents of the hardware's encoder-count register. Ideally, this field
contains the same information as the dial value, but in encoder counts, rather contains the same information as the dial value, but in encoder counts, rather
than in engineering units.&nbsp;</td> than in engineering units.&nbsp;</td>
@@ -2952,7 +2952,7 @@ below.
<td>VERS</td> <td>VERS</td>
<td>R</td> <td>R</td>
<td>Code Version</td> <td>Code Version</td>
<td>DOUBLE</td> <td>FLOAT</td>
<td>Version number of the recMotor.c code.</td> <td>Version number of the recMotor.c code.</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
@@ -3186,7 +3186,7 @@ below.
<td>LRVL</td> <td>LRVL</td>
<td>R</td> <td>R</td>
<td>Last Raw Des Val</td> <td>Last Raw Des Val</td>
<td>DOUBLE</td> <td>LONG</td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td>LRLV</td> <td>LRLV</td>
@@ -0,0 +1,3 @@
# FILE... motor_settings.req
file basic_motor_settings.req P=$(P),M=$(M)