lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Merge pull request #53 from epics-modules/igset

Browse Source 
ignore SET field, so a database can do it instead
This commit is contained in:
rsluiter
2017-01-13 12:35:25 -06:00
committed by GitHub
parent f718aaa3ba 5cad105357
commit 14b1070b7d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/motorRecord.cc
+4 -4
View File
@@ -1378,7 +1378,7 @@ enter_do_work:
if (pmr->lvio != old_lvio)
{
MARK(M_LVIO);
if (pmr->lvio && !pmr->set)
if (pmr->lvio && (!pmr->set && !pmr->igset))
{
pmr->stop = 1;
MARK(M_STOP);
@@ -1868,7 +1868,7 @@ static RTN_STATUS do_work(motorRecord * pmr, CALLBACK_VALUE proc_ind)
WRITE_MSG(SET_ENC_RATIO, ep_mp);
SEND_MSG();
}
if (pmr->set)
if (pmr->set && !pmr->igset)
{
pmr->pp = TRUE;
INIT_MSG();
@@ -2082,7 +2082,7 @@ static RTN_STATUS do_work(motorRecord * pmr, CALLBACK_VALUE proc_ind)
if (pmr->val != pmr->lval)
{
MARK(M_VAL);
if (set && !pmr->foff)
if ((set && !pmr->igset) && !pmr->foff)
{
/*
* Act directly on .val. and return. User wants to redefine .val
@@ -2132,7 +2132,7 @@ static RTN_STATUS do_work(motorRecord * pmr, CALLBACK_VALUE proc_ind)
pmr->rdif = NINT(pmr->diff / pmr->mres);
MARK(M_RDIF);
if (set)
if (set && !pmr->igset)
{
if ((pmr->mip & MIP_LOAD_P) == 0) /* Test for LOAD_POS completion. */
load_pos(pmr);
motorApp/MotorSrc/motorRecord.dbd
+4
View File
@@ -788,4 +788,8 @@ recordtype(motor) {
pp(TRUE)
interest(1)
}
field(IGSET,DBF_SHORT) {
prompt("Ignore SET field")
interest(2)
}
}