Compare commits
6 Commits
fix_hw_err
...
1.6.4
| Author | SHA1 | Date | |
|---|---|---|---|
| 08ce0999a3 | |||
| 1d662ecd43 | |||
| bea68c807b | |||
| 01a04d3b24 | |||
| 76cc48a49c | |||
| a9f623ba1d |
2
Makefile
2
Makefile
@@ -10,7 +10,7 @@ ARCH_FILTER=RHEL%
|
|||||||
REQUIRED+=motorBase
|
REQUIRED+=motorBase
|
||||||
|
|
||||||
# Specify the version of motorBase we want to build against
|
# Specify the version of motorBase we want to build against
|
||||||
motorBase_VERSION=7.2.2
|
motorBase_VERSION=7.3.2
|
||||||
|
|
||||||
# These headers allow to depend on this library for derived drivers.
|
# These headers allow to depend on this library for derived drivers.
|
||||||
HEADERS += src/pmacAsynIPPort.h
|
HEADERS += src/pmacAsynIPPort.h
|
||||||
|
|||||||
Submodule sinqMotor updated: 4e30331c92...95bc899114
@@ -218,7 +218,7 @@ asynStatus turboPmacAxis::init() {
|
|||||||
// here to mm/s^2.
|
// here to mm/s^2.
|
||||||
motorAccel = motorAccel * 1000;
|
motorAccel = motorAccel * 1000;
|
||||||
|
|
||||||
if (nvals != 8) {
|
if (nvals != 7) {
|
||||||
return pC_->couldNotParseResponse(command, response, axisNo_,
|
return pC_->couldNotParseResponse(command, response, axisNo_,
|
||||||
__PRETTY_FUNCTION__, __LINE__);
|
__PRETTY_FUNCTION__, __LINE__);
|
||||||
}
|
}
|
||||||
@@ -582,8 +582,10 @@ asynStatus turboPmacAxis::doPoll(bool *moving) {
|
|||||||
getAxisParamChecked(this, limFromHardware, &limFromHardware);
|
getAxisParamChecked(this, limFromHardware, &limFromHardware);
|
||||||
|
|
||||||
if (limFromHardware != 0) {
|
if (limFromHardware != 0) {
|
||||||
setAxisParamChecked(this, motorHighLimitFromDriver, highLimit);
|
status = setLimits(highLimit, lowLimit);
|
||||||
setAxisParamChecked(this, motorLowLimitFromDriver, lowLimit);
|
if (status != asynSuccess) {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
status = setMotorPosition(currentPosition);
|
status = setMotorPosition(currentPosition);
|
||||||
|
|||||||
Reference in New Issue
Block a user