diff --git a/Makefile b/Makefile index 4bbf8c3..e93cf38 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,6 @@ ARCH_FILTER=RHEL% # Specify the version of asynMotor we want to build against motorBase_VERSION=7.2.2 -LIBVERSION=homeerror - # These headers allow to depend on this library for derived drivers. HEADERS += src/masterMacsAxis.h HEADERS += src/masterMacsController.h diff --git a/sinqMotor b/sinqMotor index 95bc899..e234d05 160000 --- a/sinqMotor +++ b/sinqMotor @@ -1 +1 @@ -Subproject commit 95bc899114f90fa0b5925054d1eb374db9678bd7 +Subproject commit e234d05815c9a8e0e1165d7b6fad87be7b17e46d diff --git a/src/masterMacsAxis.cpp b/src/masterMacsAxis.cpp index cc14997..8220181 100644 --- a/src/masterMacsAxis.cpp +++ b/src/masterMacsAxis.cpp @@ -317,10 +317,6 @@ asynStatus masterMacsAxis::init() { __PRETTY_FUNCTION__, __LINE__); } - // If the readback value from the controller is 3, it is in velocity mode, - // which sinqMotor encodes as a 1. Otherwise, it is in position mode. - setAxisParamChecked(this, motorMode, motMode == 3); - // Check if the motor can switch its mode status = pC_->read(axisNo_, 31, response); if (status != asynSuccess) { @@ -332,11 +328,6 @@ asynStatus masterMacsAxis::init() { __PRETTY_FUNCTION__, __LINE__); } - // If the readback value from the controller is 3, the motor supports both - // velocity and position mode, otherwise just one of them (the one read out - // with motMode). - setAxisParamChecked(this, motorCanSetMode, motCanSetMode == 3); - status = readEncoderType(); if (status != asynSuccess) { return status;