Binary-Coalescence/motorDSM
2
0
Fork 0
mirror of https://github.com/Binary-Coalescence/motorDSM.git synced 2025-08-04 21:55:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added call to parseReply in remaining command methods.

Browse Source
This commit is contained in:
Daniel Sissom
2024-06-25 11:09:08 -05:00
parent f73608c596
commit 7b9f2870ca
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dsmApp/src/MD90Driver.cpp
View File

@@ -179,7 +179,7 @@ asynStatus MD90Axis::sendAccelAndVelocity(double acceleration, double velocity)
{ {
asynStatus status; asynStatus status;
int freq; int freq;
// static const char *functionName = "MD90::sendAccelAndVelocity"; static const char *functionName = "MD90::sendAccelAndVelocity";
// Send the velocity // Send the velocity
// Velocity provided in steps/sec // Velocity provided in steps/sec
@@ -188,6 +188,9 @@ asynStatus MD90Axis::sendAccelAndVelocity(double acceleration, double velocity)
freq = NINT(fabs(velocity / 500.)); freq = NINT(fabs(velocity / 500.));
sprintf(pC_->outString_, "SSF %d", freq); sprintf(pC_->outString_, "SSF %d", freq);
status = pC_->writeReadController(); status = pC_->writeReadController();
if (!status) {
status = parseReply(functionName, pC_->inString_);
}
return status; return status;
} }
@@ -217,12 +220,15 @@ asynStatus MD90Axis::move(double position, int relative, double minVelocity, dou
asynStatus MD90Axis::home(double minVelocity, double maxVelocity, double acceleration, int forwards) asynStatus MD90Axis::home(double minVelocity, double maxVelocity, double acceleration, int forwards)
{ {
asynStatus status; asynStatus status;
// static const char *functionName = "MD90Axis::home"; static const char *functionName = "MD90Axis::home";
status = sendAccelAndVelocity(acceleration, maxVelocity); status = sendAccelAndVelocity(acceleration, maxVelocity);
sprintf(pC_->outString_, "HOM"); sprintf(pC_->outString_, "HOM");
status = pC_->writeReadController(); status = pC_->writeReadController();
if (!status) {
status = parseReply(functionName, pC_->inString_);
}
return status; return status;
} }
@@ -248,16 +254,22 @@ asynStatus MD90Axis::moveVelocity(double minVelocity, double maxVelocity, double
sprintf(pC_->outString_, "ESB"); sprintf(pC_->outString_, "ESB");
} }
status = pC_->writeReadController(); status = pC_->writeReadController();
if (!status) {
status = parseReply(functionName, pC_->inString_);
}
return status; return status;
} }
asynStatus MD90Axis::stop(double acceleration ) asynStatus MD90Axis::stop(double acceleration )
{ {
asynStatus status; asynStatus status;
//static const char *functionName = "MD90Axis::stop"; static const char *functionName = "MD90Axis::stop";
sprintf(pC_->outString_, "STP"); sprintf(pC_->outString_, "STP");
status = pC_->writeReadController(); status = pC_->writeReadController();
if (!status) {
status = parseReply(functionName, pC_->inString_);
}
return status; return status;
} }
@@ -267,7 +279,7 @@ asynStatus MD90Axis::stop(double acceleration )
asynStatus MD90Axis::setClosedLoop(bool closedLoop) asynStatus MD90Axis::setClosedLoop(bool closedLoop)
{ {
asynStatus status; asynStatus status;
//static const char *functionName = "MD90Axis::setClosedLoop"; static const char *functionName = "MD90Axis::setClosedLoop";
if (closedLoop == 1) { if (closedLoop == 1) {
sprintf(pC_->outString_, "EPM"); sprintf(pC_->outString_, "EPM");
@@ -275,6 +287,9 @@ asynStatus MD90Axis::setClosedLoop(bool closedLoop)
sprintf(pC_->outString_, "DPM"); sprintf(pC_->outString_, "DPM");
} }
status = pC_->writeReadController(); status = pC_->writeReadController();
if (!status) {
status = parseReply(functionName, pC_->inString_);
}
return status; return status;
} }
@@ -285,23 +300,29 @@ asynStatus MD90Axis::setClosedLoop(bool closedLoop)
asynStatus MD90Axis::setIGain(double iGain) asynStatus MD90Axis::setIGain(double iGain)
{ {
asynStatus status; asynStatus status;
//static const char *functionName = "MD90Axis::setIGain"; static const char *functionName = "MD90Axis::setIGain";
iGain = iGain * 1000; iGain = iGain * 1000;
if (iGain < 1) iGain = 1.0; if (iGain < 1) iGain = 1.0;
if (iGain > 1000) iGain = 1000.0; if (iGain > 1000) iGain = 1000.0;
sprintf(pC_->outString_, "SGN %d", NINT(iGain)); sprintf(pC_->outString_, "SGN %d", NINT(iGain));
status = pC_->writeReadController(); status = pC_->writeReadController();
if (!status) {
status = parseReply(functionName, pC_->inString_);
}
return status; return status;
} }
asynStatus MD90Axis::doMoveToHome() asynStatus MD90Axis::doMoveToHome()
{ {
asynStatus status; asynStatus status;
//static const char *functionName = "MD90Axis::doMoveToHome"; static const char *functionName = "MD90Axis::doMoveToHome";
sprintf(pC_->outString_, "CLM 0"); sprintf(pC_->outString_, "CLM 0");
status = pC_->writeReadController(); status = pC_->writeReadController();
if (!status) {
status = parseReply(functionName, pC_->inString_);
}
return status; return status;
} }