lin-epics-modules/mastermacs
0
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Updated sinqMotor to fix segfault and improved docs

Browse Source
This commit is contained in:
mathis_s
2025-12-23 11:47:12 +01:00
parent 6adca95ade
commit 7e7b8f486c
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sinqMotor

Submodule sinqMotor updated: 59a5ba452f...e234d05815

6
src/masterMacsAxis.cpp
View File

@@ -327,7 +327,7 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
// ========================================================================= // =========================================================================
// Does the axis need to be intialized? // Does the axis need to be initialized?
if (needInit()) { if (needInit()) {
// Perform the rest of the poll, but remember if sth. failed in the init. // Perform the rest of the poll, but remember if sth. failed in the init.
poll_status = init(); poll_status = init();
@@ -953,9 +953,7 @@ asynStatus masterMacsAxis::enable(bool on) {
doPoll(&moving); doPoll(&moving);
// If the axis is currently moving, it cannot be disabled. Ignore the // If the axis is currently moving, it cannot be disabled. Ignore the
// command and inform the user. We check the last known status of the // command and inform the user.
// axis instead of "moving", since status -6 is also moving, but the
// motor can actually be disabled in this state!
if (moving) { if (moving) {
asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR, asynPrint(pC_->pasynUser(), ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d:\nAxis is not " "Controller \"%s\", axis %d => %s, line %d:\nAxis is not "