Fixed a bug in readInt32 and prepared the turboPmac library to serve the
detectorTower library
This commit is contained in:
@@ -109,9 +109,6 @@ turboPmacAxis::~turboPmacAxis(void) {
|
||||
// clean up the pointer pC here.
|
||||
}
|
||||
|
||||
/**
|
||||
Read the configuration at the first poll
|
||||
*/
|
||||
asynStatus turboPmacAxis::init() {
|
||||
|
||||
// Local variable declaration
|
||||
@@ -478,9 +475,11 @@ asynStatus turboPmacAxis::doPoll(bool *moving) {
|
||||
"state P%2.2d00 = %d\n",
|
||||
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_,
|
||||
axStatus);
|
||||
pl_status = setStringParam(
|
||||
pC_->motorMessageText_,
|
||||
"Unreachable state has been reached. Please call the support.");
|
||||
snprintf(userMessage, sizeof(userMessage),
|
||||
"Unknown state P%2.2d00 = %d has been reached. Please call "
|
||||
"the support.",
|
||||
axisNo_, error);
|
||||
pl_status = setStringParam(pC_->motorMessageText_, userMessage);
|
||||
if (pl_status != asynSuccess) {
|
||||
return pC_->paramLibAccessFailed(pl_status, "motorMessageText_",
|
||||
axisNo_, __PRETTY_FUNCTION__,
|
||||
@@ -675,11 +674,11 @@ asynStatus turboPmacAxis::doPoll(bool *moving) {
|
||||
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__, axisNo_,
|
||||
error);
|
||||
|
||||
snprintf(command, sizeof(command),
|
||||
snprintf(userMessage, sizeof(userMessage),
|
||||
"Move command exceeds hardware limits (P%2.2d01 = %d). Please "
|
||||
"call the support.",
|
||||
axisNo_, error);
|
||||
pl_status = setStringParam(pC_->motorMessageText_, command);
|
||||
pl_status = setStringParam(pC_->motorMessageText_, userMessage);
|
||||
if (pl_status != asynSuccess) {
|
||||
return pC_->paramLibAccessFailed(pl_status, "motorMessageText_",
|
||||
axisNo_, __PRETTY_FUNCTION__,
|
||||
@@ -695,9 +694,10 @@ asynStatus turboPmacAxis::doPoll(bool *moving) {
|
||||
pC_->portName, axisNo_, __PRETTY_FUNCTION__, __LINE__,
|
||||
axisNo_, error);
|
||||
|
||||
pl_status = setStringParam(
|
||||
pC_->motorMessageText_,
|
||||
"Unknown error P%2.2d01 = %d. Please call the support.");
|
||||
snprintf(userMessage, sizeof(userMessage),
|
||||
"Unknown error P%2.2d01 = %d. Please call the support.",
|
||||
axisNo_, error);
|
||||
pl_status = setStringParam(pC_->motorMessageText_, userMessage);
|
||||
if (pl_status != asynSuccess) {
|
||||
return pC_->paramLibAccessFailed(pl_status, "motorMessageText_",
|
||||
axisNo_, __PRETTY_FUNCTION__,
|
||||
|
||||
Reference in New Issue
Block a user