From 2ceabc5693c7fdb9b673686c6d784ff593896686 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Fri, 7 Jan 2011 16:03:04 +0000 Subject: [PATCH] Home search can not be aborted from EPICS. Commented out home search command until an Ensemble firmware update resolves this problem. --- motorApp/AerotechSrc/drvEnsembleAsyn.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/motorApp/AerotechSrc/drvEnsembleAsyn.cc b/motorApp/AerotechSrc/drvEnsembleAsyn.cc index bd3ebca1..5c77ebba 100644 --- a/motorApp/AerotechSrc/drvEnsembleAsyn.cc +++ b/motorApp/AerotechSrc/drvEnsembleAsyn.cc @@ -24,6 +24,10 @@ Synapps Versions 4-5 and higher are distributed subject to a Software License Agreement found in file LICENSE that is included with this distribution. ----------------------------------------------------------------------------- +* NOTES +* ----- +* Verified with firmware: +* - 2.54.003 * * Modification Log: * ----------------- @@ -44,7 +48,8 @@ in file LICENSE that is included with this distribution. * .09 09-13-10 rls - Bug fix from Wang Xiaoqiang (PSI); remove redundant EOS * append in sendAndReceive(). Fixes comm. problem with * Ensemble firmware 2.54.004 and above. -* +* .10 09-29-10 rls - Commented out home search until firmware upgrade that +* allows aborting home search from ASCII protocol. */ @@ -89,7 +94,7 @@ motorAxisDrvSET_t motorEnsemble = motorAxisSetInteger, /**< Pointer to function to set an integer value */ motorAxisGetDouble, /**< Pointer to function to get a double value */ motorAxisGetInteger, /**< Pointer to function to get an integer value */ - motorAxisHome, /**< Pointer to function to execute a more to reference or home */ + motorAxisHome, /**< Pointer to function to execute a move to reference or home */ motorAxisMove, /**< Pointer to function to execute a position move */ motorAxisVelocityMove, /**< Pointer to function to execute a velocity mode move */ motorAxisStop, /**< Pointer to function to stop motion */ @@ -505,7 +510,9 @@ static int motorAxisHome(AXIS_HDL pAxis, double min_velocity, double max_velocit epicsUInt32 hparam; int axis; + /* Return ERROR until Ensemble firmware upgrade. if (pAxis == NULL || pAxis->pController == NULL) + */ return (MOTOR_AXIS_ERROR); axis = pAxis->axis;