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

Specified new version for sinqMotor

Browse Source
This commit is contained in:
mathis_s
2025-05-12 12:02:43 +02:00
parent 468ca46010
commit c5f5cf3065
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sinqMotor

Submodule sinqMotor updated: 4d1c21fd74...5689402375

1
src/masterMacsAxis.cpp
View File

@@ -356,7 +356,6 @@ asynStatus masterMacsAxis::doPoll(bool *moving) {
// poll. This is already part of the movement procedure. // poll. This is already part of the movement procedure.
*moving = true; *moving = true;
setAxisParamChecked(this, motorStatusMoving, *moving);
pl_status = setIntegerParam(pC_->motorStatusMoving(), *moving); pl_status = setIntegerParam(pC_->motorStatusMoving(), *moving);
if (pl_status != asynSuccess) { if (pl_status != asynSuccess) {
return pC_->paramLibAccessFailed(pl_status, return pC_->paramLibAccessFailed(pl_status,

3
src/masterMacsController.cpp
View File

@@ -470,7 +470,8 @@ asynStatus masterMacsController::parseResponse(
return asynError; return asynError;
} }
asynStatus sinqController::readInt32(asynUser *pasynUser, epicsInt32 *value) { asynStatus masterMacsController::readInt32(asynUser *pasynUser,
epicsInt32 *value) {
// masterMacs can be disabled // masterMacs can be disabled
if (pasynUser->reason == motorCanDisable_) { if (pasynUser->reason == motorCanDisable_) {
*value = 1; *value = 1;

2
src/masterMacsController.h
View File

@@ -125,6 +125,8 @@ class masterMacsController : public sinqController {
*/ */
double comTimeout() { return comTimeout_; } double comTimeout() { return comTimeout_; }
asynStatus readInt32(asynUser *pasynUser, epicsInt32 *value);
private: private:
/* /*
Stores the constructor input comTimeout Stores the constructor input comTimeout