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

Eliminate compiler warnings.

Browse Source
This commit is contained in:
Ron Sluiter
2004-03-16 15:18:27 +00:00
parent 6307e4c300
commit d581657cfd
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/drvESP300.cc
+3 -3
View File
@@ -2,9 +2,9 @@
FILENAME... drvESP300.cc
USAGE... Motor record driver level support for Newport ESP300.
Version: $Revision: 1.7 $
Version: $Revision: 1.8 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-02-03 19:59:22 $
Last Modified: $Date: 2004-03-16 15:17:18 $
*/
/*
@@ -671,7 +671,7 @@ static int motor_init()
/* Set axis resolution. */
sprintf(buff, "%.2dSU?", motor_index + 1);
send_mess(card_index, buff, NULL);
send_mess(card_index, buff, (char) NULL);
recv_mess(card_index, buff, 1);
cntrl->drive_resolution[motor_index] = atof(&buff[0]);
motorApp/NewportSrc/drvMM4000.cc
+3 -3
View File
@@ -2,9 +2,9 @@
FILENAME... drvMM4000.cc
USAGE... Motor record driver level support for Newport MM4000.
Version: $Revision: 1.6 $
Version: $Revision: 1.7 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-02-03 19:59:21 $
Last Modified: $Date: 2004-03-16 15:17:39 $
*/
/*
@@ -375,7 +375,7 @@ STATIC int set_status(int card, int signal)
mstat.All = cntrl->status_string[pos];
if (mstat.Bits.inmotion == true)
status.Bits.RA_DONE = 0;
send_mess(card, READ_POSITION, NULL);
send_mess(card, READ_POSITION, (char) NULL);
recv_mess(card, cntrl->position_string, 1);
}
}
motorApp/PiSrc/drvPIC844.cc
+8 -2
View File
@@ -3,9 +3,9 @@ FILENAME... drvPIC844.cc
USAGE... Motor record driver level support for Physik Instrumente (PI)
GmbH & Co. C-844 motor controller.
Version: $Revision: 1.3 $
Version: $Revision: 1.4 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-02-03 20:00:00 $
Last Modified: $Date: 2004-03-16 15:18:27 $
*/
/*
@@ -282,6 +282,9 @@ static int set_status(int card, int signal)
break;
case 3:
inmotion = mstat.Bits.axis4IM;
default:
rtn_state = 1;
goto exit;
}
status.Bits.RA_DONE = (inmotion == YES) ? 0 : 1;
@@ -331,6 +334,9 @@ static int set_status(int card, int signal)
case 3:
plusLS = mstat.Bits.axis4PL;
minusLS = mstat.Bits.axis4ML;
default:
rtn_state = 1;
goto exit;
}
/* Set limit switch error indicators. */