diff -rc trunk_2012_02_17_exported/motorApp/Db/XPS_extra.db trunk_2012_02_17_exported-patch/motorApp/Db/XPS_extra.db *** trunk_2012_02_17_exported/motorApp/Db/XPS_extra.db 2011-03-31 14:10:18.000000000 -0700 --- trunk_2012_02_17_exported-patch/motorApp/Db/XPS_extra.db 2012-02-17 15:38:01.000000000 -0800 *************** *** 31,33 **** --- 31,43 ---- field(SCAN, "I/O Intr") field(INP,"@asyn($(PORT),$(ADDR))XPS_STATUS") } + + record(waveform,"$(P)$(R)XPS_STATUS_STRING") { + field(DESC,"XPS Group Status String") + field(DTYP, "asynInt8ArrayIn") + field(FTVL, "CHAR") + field(NELM, "100") + field(PINI, "1") + field(SCAN, "I/O Intr") + field(INP,"@asyn($(PORT),$(ADDR))XPS_STATUS_STRING") + } Only in trunk_2012_02_17_exported-patch/motorApp/Db: XPS_extra.db~ diff -rc trunk_2012_02_17_exported/motorApp/NewportSrc/XPSAxis.cpp trunk_2012_02_17_exported-patch/motorApp/NewportSrc/XPSAxis.cpp *** trunk_2012_02_17_exported/motorApp/NewportSrc/XPSAxis.cpp 2011-09-16 13:42:54.000000000 -0700 --- trunk_2012_02_17_exported-patch/motorApp/NewportSrc/XPSAxis.cpp 2012-02-17 15:46:01.000000000 -0800 *************** *** 543,548 **** --- 543,551 ---- asynPrint(pasynUser_, ASYN_TRACE_ERROR, "%s:%s: [%s,%d]: error calling GroupStatusGet status=%d\n", driverName, functionName, pC_->portName, axisNo_, status); + /* Update axis status and status string with error */ + axisStatus_ = status; + sprintf(axisStatusString_, "%d",axisStatus_); goto done; } asynPrint(pasynUser_, ASYN_TRACE_FLOW, *************** *** 557,570 **** /* These states mean it is moving/homeing/jogging etc*/ axisDone = 0; } - /* Set the status */ - setIntegerParam(pC_->XPSStatus_, axisStatus_); /* Set the axis done parameter */ /* AND the done flag with the inverse of deferred_move.*/ axisDone &= !deferredMove_; *moving = axisDone ? false : true; setIntegerParam(pC_->motorStatusDone_, axisDone); /*Read the controller software limits in case these have been changed by a TCL script.*/ status = PositionerUserTravelLimitsGet(pollSocket_, positionerName_, &lowLimit_, &highLimit_); if (status == 0) { --- 560,574 ---- /* These states mean it is moving/homeing/jogging etc*/ axisDone = 0; } /* Set the axis done parameter */ /* AND the done flag with the inverse of deferred_move.*/ axisDone &= !deferredMove_; *moving = axisDone ? false : true; setIntegerParam(pC_->motorStatusDone_, axisDone); + /* Get the XPS status string */ + status = GroupStatusStringGet(pollSocket_, axisStatus_, axisStatusString_); + /*Read the controller software limits in case these have been changed by a TCL script.*/ status = PositionerUserTravelLimitsGet(pollSocket_, positionerName_, &lowLimit_, &highLimit_); if (status == 0) { *************** *** 683,688 **** --- 687,694 ---- setIntegerParam(pC_->motorStatusMoving_, (fabs(currentVelocity_) > XPS_VELOCITY_DEADBAND)); done: + setIntegerParam(pC_->XPSStatus_, axisStatus_); + pC_->doCallbacksInt8Array(axisStatusString_, strlen(axisStatusString_), pC_->XPSStatusString_, axisNo_); setIntegerParam(pC_->motorStatusCommsError_, status ? 1 : 0); callParamCallbacks(); return status ? asynError : asynSuccess; Only in trunk_2012_02_17_exported-patch/motorApp/NewportSrc: XPSAxis.cpp~ diff -rc trunk_2012_02_17_exported/motorApp/NewportSrc/XPSAxis.h trunk_2012_02_17_exported-patch/motorApp/NewportSrc/XPSAxis.h *** trunk_2012_02_17_exported/motorApp/NewportSrc/XPSAxis.h 2011-07-29 10:41:30.000000000 -0700 --- trunk_2012_02_17_exported-patch/motorApp/NewportSrc/XPSAxis.h 2012-02-17 15:46:41.000000000 -0800 *************** *** 77,82 **** --- 77,83 ---- char *groupName_; int positionerError_; int axisStatus_; + char axisStatusString_[100]; double profilePreDistance_; double profilePostDistance_; xpsCorrectorInfo_t xpsCorrectorInfo_; Only in trunk_2012_02_17_exported-patch/motorApp/NewportSrc: XPSAxis.h~ diff -rc trunk_2012_02_17_exported/motorApp/NewportSrc/XPSController.cpp trunk_2012_02_17_exported-patch/motorApp/NewportSrc/XPSController.cpp *** trunk_2012_02_17_exported/motorApp/NewportSrc/XPSController.cpp 2012-02-10 16:01:30.000000000 -0800 --- trunk_2012_02_17_exported-patch/motorApp/NewportSrc/XPSController.cpp 2012-02-17 15:39:58.000000000 -0800 *************** *** 139,146 **** int numAxes, double movingPollPeriod, double idlePollPeriod, int enableSetPosition, double setPositionSettlingTime) : asynMotorController(portName, numAxes, NUM_XPS_PARAMS, ! 0, // No additional interfaces ! 0, // No addition interrupt interfaces ASYN_CANBLOCK | ASYN_MULTIDEVICE, 1, // autoconnect 0, 0), // Default priority and stack size --- 139,146 ---- int numAxes, double movingPollPeriod, double idlePollPeriod, int enableSetPosition, double setPositionSettlingTime) : asynMotorController(portName, numAxes, NUM_XPS_PARAMS, ! asynInt8ArrayMask, // additional interfaces ! asynInt8ArrayMask, // addition interrupt interfaces ASYN_CANBLOCK | ASYN_MULTIDEVICE, 1, // autoconnect 0, 0), // Default priority and stack size *************** *** 164,169 **** --- 164,170 ---- createParam(XPSProfileGroupNameString, asynParamOctet, &XPSProfileGroupName_); createParam(XPSTrajectoryFileString, asynParamOctet, &XPSTrajectoryFile_); createParam(XPSStatusString, asynParamInt32, &XPSStatus_); + createParam(XPSStatusStringString, asynParamInt8Array, &XPSStatusString_); // This socket is used for polling by the controller and all axes pollSocket_ = TCP_ConnectToServer((char *)IPAddress, IPPort, XPS_POLL_TIMEOUT); Only in trunk_2012_02_17_exported-patch/motorApp/NewportSrc: XPSController.cpp~ diff -rc trunk_2012_02_17_exported/motorApp/NewportSrc/XPSController.h trunk_2012_02_17_exported-patch/motorApp/NewportSrc/XPSController.h *** trunk_2012_02_17_exported/motorApp/NewportSrc/XPSController.h 2011-09-18 15:35:25.000000000 -0700 --- trunk_2012_02_17_exported-patch/motorApp/NewportSrc/XPSController.h 2012-02-17 15:39:10.000000000 -0800 *************** *** 25,30 **** --- 25,31 ---- #define XPSProfileGroupNameString "XPS_PROFILE_GROUP_NAME" #define XPSTrajectoryFileString "XPS_TRAJECTORY_FILE" #define XPSStatusString "XPS_STATUS" + #define XPSStatusStringString "XPS_STATUS_STRING" class XPSController : public asynMotorController { *************** *** 74,80 **** int XPSProfileGroupName_; int XPSTrajectoryFile_; int XPSStatus_; ! #define LAST_XPS_PARAM XPSStatus_ private: bool enableSetPosition_; /**< Enable/disable setting the position from EPICS */ --- 75,82 ---- int XPSProfileGroupName_; int XPSTrajectoryFile_; int XPSStatus_; ! int XPSStatusString_; ! #define LAST_XPS_PARAM XPSStatusString_ private: bool enableSetPosition_; /**< Enable/disable setting the position from EPICS */ Only in trunk_2012_02_17_exported-patch/motorApp/NewportSrc: XPSController.h~