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

Merge branch 'homing' into dev

Browse Source
This commit is contained in:
Daniel Sissom
2024-08-06 12:48:20 -05:00
parent d605ceceae 5e36582ecc
commit c4d9507f84
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dsmApp/src/MD90Driver.cpp
View File

@@ -230,8 +230,10 @@ asynStatus MD90Axis::home(double minVelocity, double maxVelocity, double acceler
// The MD-90 will start the home routine in the direction of the last move // The MD-90 will start the home routine in the direction of the last move
// Here we first make a small move to set the desired direction before homing // Here we first make a small move to set the desired direction before homing
sprintf(pC_->outString_, "SNS %d", SMALL_NSTEPS); if (!status) {
status = pC_->writeReadController(); sprintf(pC_->outString_, "SNS %d", SMALL_NSTEPS);
status = pC_->writeReadController();
}
if (!status) { if (!status) {
status = parseReply(functionName, pC_->inString_); status = parseReply(functionName, pC_->inString_);
} }
@@ -241,18 +243,21 @@ asynStatus MD90Axis::home(double minVelocity, double maxVelocity, double acceler
} else { } else {
sprintf(pC_->outString_, "ESB"); sprintf(pC_->outString_, "ESB");
} }
status = pC_->writeReadController(); if (!status) {
status = pC_->writeReadController();
}
if (!status) { if (!status) {
status = parseReply(functionName, pC_->inString_); status = parseReply(functionName, pC_->inString_);
} }
// Wait for the move to complete, then home if (!status) {
// Wait for the move to complete, then home
sleepTime = SLEEP_MARGIN * SMALL_NSTEPS * COUNTS_PER_STEP / maxVelocity;
std::this_thread::sleep_for(std::chrono::seconds(sleepTime));
sleepTime = SLEEP_MARGIN * SMALL_NSTEPS * COUNTS_PER_STEP / maxVelocity; sprintf(pC_->outString_, "HOM");
std::this_thread::sleep_for(std::chrono::seconds(sleepTime)); status = pC_->writeReadController();
}
sprintf(pC_->outString_, "HOM");
status = pC_->writeReadController();
if (!status) { if (!status) {
status = parseReply(functionName, pC_->inString_); status = parseReply(functionName, pC_->inString_);
} }