diff --git a/motorApp/CommSrc/serialIOMPF.cc b/motorApp/CommSrc/serialIOMPF.cc index ab8396f6..1edf5280 100644 --- a/motorApp/CommSrc/serialIOMPF.cc +++ b/motorApp/CommSrc/serialIOMPF.cc @@ -2,9 +2,9 @@ FILENAME... serialIOMPF.cc USAGE... Interface between MPF and motor record device drivers. -Version: $Revision: 1.8 $ +Version: $Revision: 1.9 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-27 21:56:44 $ +Last Modified: $Date: 2003-06-16 15:06:24 $ */ /* @@ -22,6 +22,9 @@ Last Modified: $Date: 2003-05-27 21:56:44 $ * - Increased timeout from 2 to 10 seconds in call to * msgQReceive() from serialIO(). This prevents timeouts * if a satellite CPU board is slow to boot. + * .02 02-13-03 MLR - Added serialIOSendRecv for atomic send/receive functions + * .02 04-14-03 MLR - Modified debugging, added timestamps to debug statements. + * .03 06-11-03 RLS - Converted to R3.14.x. * */ @@ -177,7 +180,7 @@ int serialIO::serialIORecv(char *buffer, int buffer_len, char *terminator, status); goto done; } - Debug(2, "serialIORecv: sent message status = %d, timeout=%d\n", status, timeout); + Debug(5, "serialIORecv: sent message status = %d, timeout=%d\n", status, timeout); /* Wait for 2x the timeout or MIN_MSGQ_WAIT; which ever is greater. */ timeout_itera = psm->timeout * 20; diff --git a/motorApp/MotorSrc/motordevCom.cc b/motorApp/MotorSrc/motordevCom.cc index a980cb23..5dedd656 100644 --- a/motorApp/MotorSrc/motordevCom.cc +++ b/motorApp/MotorSrc/motordevCom.cc @@ -3,9 +3,9 @@ FILENAME: motordevCom.c USAGE... This file contains device functions that are common to all motor record device support modules. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-06-06 21:09:10 $ +Last Modified: $Date: 2003-06-16 15:08:24 $ */ /* @@ -41,6 +41,7 @@ Last Modified: $Date: 2003-06-06 21:09:10 $ * .03 03-19-96 tmm v1.10: modified encoder-ratio calculation * .04 11-26-96 jps allow for bumpless-reboot on position * .04a 02-19-97 tmm fixed for EPICS 3.13 + * .05 06/13/03 rls Ported to R3.14. */ diff --git a/motorApp/MotorSrc/motordrvCom.cc b/motorApp/MotorSrc/motordrvCom.cc index c8eca2a0..bf49e04e 100644 --- a/motorApp/MotorSrc/motordrvCom.cc +++ b/motorApp/MotorSrc/motordrvCom.cc @@ -3,9 +3,9 @@ FILENAME... motordrvCom.c USAGE... This file contains driver functions that are common to all motor record driver modules. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-23 19:48:44 $ +Last Modified: $Date: 2003-06-16 15:08:23 $ */ /* @@ -52,6 +52,7 @@ Last Modified: $Date: 2003-05-23 19:48:44 $ * .21 03-01-02 rls Eliminated support for the "ASCII record separator * (IS2) = /x1E". * .22 07-05-02 rls Seperate +/- limit switch status bits. + * .23 06/13/03 rls Ported to R3.14. */ diff --git a/motorApp/NewportSrc/drvMMCom.h b/motorApp/NewportSrc/drvMMCom.h index c743307f..b892c0eb 100644 --- a/motorApp/NewportSrc/drvMMCom.h +++ b/motorApp/NewportSrc/drvMMCom.h @@ -3,9 +3,9 @@ FILENAME... drvMMCom.h USAGE... This file contains Newport Motion Master (MM) driver "include" information that is specific to Motion Master models 3000/4000. -Version: $Revision: 1.7 $ +Version: $Revision: 1.8 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-28 14:58:16 $ +Last Modified: $Date: 2003-06-16 15:04:45 $ */ /* @@ -36,7 +36,8 @@ Last Modified: $Date: 2003-05-28 14:58:16 $ * * Modification Log: * ----------------- - * .01 01-18-93 mlr initialized from drvOms58 + * .01 01-18-93 mlr initialized from drvOms58 + * .02 06-16-03 rls Converted to R3.14.x. */ #ifndef INCdrvMMComh diff --git a/motorApp/OmsSrc/devOms.cc b/motorApp/OmsSrc/devOms.cc index a809bbe4..64c8525b 100644 --- a/motorApp/OmsSrc/devOms.cc +++ b/motorApp/OmsSrc/devOms.cc @@ -2,9 +2,9 @@ FILENAME... devOms.c USAGE... Device level support for OMS VME8 and VME44 models. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-22 17:23:22 $ +Last Modified: $Date: 2003-06-16 15:04:11 $ */ /* @@ -35,11 +35,12 @@ Last Modified: $Date: 2003-05-22 17:23:22 $ * * Modification Log: * ----------------- - * .01 01-18-93 jbk initialized + * .01 01-18-93 jbk initialized * ... - * .03 03-19-96 tmm v1.10: modified encoder-ratio calculation - * .04 11-26-96 jps allow for bumpless-reboot on position - * .04a 02-19-97 tmm fixed for EPICS 3.13 + * .03 03-19-96 tmm v1.10: modified encoder-ratio calculation + * .04 11-26-96 jps allow for bumpless-reboot on position + * .04a 02-19-97 tmm fixed for EPICS 3.13 + * .05 06-16-03 rls Converted to R3.14.x. */ diff --git a/motorApp/OmsSrc/devOms58.cc b/motorApp/OmsSrc/devOms58.cc index 77151a81..04ada24d 100644 --- a/motorApp/OmsSrc/devOms58.cc +++ b/motorApp/OmsSrc/devOms58.cc @@ -2,9 +2,9 @@ FILENAME... devOms58.c USAGE... Motor record device level support for OMS VME58. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-22 17:23:47 $ +Last Modified: $Date: 2003-06-16 15:04:11 $ */ /* @@ -35,12 +35,12 @@ Last Modified: $Date: 2003-05-22 17:23:47 $ * * Modification Log: * ----------------- - * .01 01-18-93 jbk initialized - * .02 11-14-94 jps copy devOMS.c and modify to point to vme58 driver - * .03 03-19-96 tmm v1.10: modified encoder-ratio calculation - * .04 06-20-96 jps allow for bumpless-reboot on position - * .04a 02-19-97 tmm fixed for EPICS 3.13 - * ... + * .01 01-18-93 jbk initialized + * .02 11-14-94 jps copy devOMS.c and modify to point to vme58 driver + * .03 03-19-96 tmm v1.10: modified encoder-ratio calculation + * .04 06-20-96 jps allow for bumpless-reboot on position + * .04a 02-19-97 tmm fixed for EPICS 3.13 + * .05 06-16-03 rls Converted to R3.14.x. */ diff --git a/motorApp/OmsSrc/devOmsCom.cc b/motorApp/OmsSrc/devOmsCom.cc index f2d52c10..6077c64e 100644 --- a/motorApp/OmsSrc/devOmsCom.cc +++ b/motorApp/OmsSrc/devOmsCom.cc @@ -2,9 +2,9 @@ FILENAME... devOmsCom.cc USAGE... Data and functions common to all OMS device level support. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-06-05 16:38:27 $ +Last Modified: $Date: 2003-06-16 15:04:11 $ */ /* @@ -36,21 +36,22 @@ Last Modified: $Date: 2003-06-05 16:38:27 $ * * Modification Log: * ----------------- - * .01 01-18-93 jbk initialized - * .02 11-14-94 jps copy devOMS.c and modify to point to vme58 driver - * .03 03-19-96 tmm v1.10: modified encoder-ratio calculation - * .04 06-20-96 jps allow for bumpless-reboot on position - * .04a 02-19-97 tmm fixed for EPICS 3.13 - * .05 05-14-01 rls Support for jog velocity and acceleration commands. - * Added "CA" to home and jog commands so JVEL does not - * see done flag from previous operation. - * .06 03-27-02 rls Eliminated RES. All input positions, velocities and - * accelerations are in motor steps. - * .07 07-05-02 rls Work around for OMS bug that ignores MR+/-1. - * Use OMS UU command to support reference is always in - * motor steps. - * .08 06-04-03 rls Convert to R3.14.x. - * .09 06-04-03 rls extended device directive support PREM and POST. + * .01 01-18-93 jbk initialized + * .02 11-14-94 jps copy devOMS.c and modify to point to vme58 driver + * .03 03-19-96 tmm v1.10: modified encoder-ratio calculation + * .04 06-20-96 jps allow for bumpless-reboot on position + * .04a 02-19-97 tmm fixed for EPICS 3.13 + * .05 05-14-01 rls Support for jog velocity and acceleration commands. + * Added "CA" to home and jog commands so JVEL does not + * see done flag from previous operation. + * .06 03-27-02 rls Eliminated RES. All input positions, velocities and + * accelerations are in motor steps. + * .07 07-05-02 rls Work around for OMS bug that ignores MR+/-1. + * Use OMS UU command to support reference is always in + * motor steps. + * .08 06-04-03 rls Convert to R3.14.x. + * .09 06-04-03 rls extended device directive support PREM and POST. + * .10 06-16-03 rls Converted to R3.14.x. */ #include