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

Elminated "hiding variable" compiler warnings.

Browse Source
This commit is contained in:
Ron Sluiter
2003-05-23 19:45:08 +00:00
parent 38d6d06bb3
commit 535795ef59
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/motorRecord.cc
+5 -6
View File
@@ -2,9 +2,9 @@
FILENAME... motorRecord.cc
USAGE... Motor Record Support.
Version: $Revision: 1.6 $
Version: $Revision: 1.7 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2003-05-19 17:54:19 $
Last Modified: $Date: 2003-05-23 19:45:08 $
*/
/*
@@ -2477,7 +2477,6 @@ pidcof:
if ((pmr->mip & MIP_JOGF) || (pmr->mip & MIP_JOGR))
{
int dir = (pmr->dir == motorDIR_Pos) ? 1 : -1;
double jogv = (pmr->jvel * dir) / pmr->mres;
double jacc = pmr->jar / fabs(pmr->mres);
@@ -3038,11 +3037,11 @@ static void
*/
if (pmr->urip && initcall == false)
{
long status;
long rtnstat;
old_drbv = pmr->drbv;
status = dbGetLink(&(pmr->rdbl), DBR_DOUBLE, &(pmr->drbv), NULL, NULL);
if (!RTN_SUCCESS(status))
rtnstat = dbGetLink(&(pmr->rdbl), DBR_DOUBLE, &(pmr->drbv), NULL, NULL);
if (!RTN_SUCCESS(rtnstat))
pmr->drbv = old_drbv;
else
{