Compare commits
2 Commits
5298b5ef69
...
0.13.5
Author | SHA1 | Date | |
---|---|---|---|
a3319352d5 | |||
63a5fcd518 |
2
Makefile
2
Makefile
@ -14,7 +14,7 @@ REQUIRED+=sinqMotor
|
|||||||
motorBase_VERSION=7.2.2
|
motorBase_VERSION=7.2.2
|
||||||
|
|
||||||
# Specify the version of sinqMotor we want to build against
|
# Specify the version of sinqMotor we want to build against
|
||||||
sinqMotor_VERSION=mathis_s
|
sinqMotor_VERSION=0.14
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -392,13 +392,7 @@ asynStatus turboPmacAxis::doPoll(bool *moving) {
|
|||||||
switch (axStatus) {
|
switch (axStatus) {
|
||||||
case -6:
|
case -6:
|
||||||
// Axis is stopping
|
// Axis is stopping
|
||||||
|
|
||||||
// If the axis was already idle during the last poll, it is not moving
|
|
||||||
if (previousStatusDone == 0) {
|
|
||||||
*moving = true;
|
*moving = true;
|
||||||
} else {
|
|
||||||
*moving = false;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case -5:
|
case -5:
|
||||||
// Axis is deactivated
|
// Axis is deactivated
|
||||||
@ -1277,11 +1271,14 @@ asynStatus turboPmacAxis::enable(bool on) {
|
|||||||
// Status of parameter library operations
|
// Status of parameter library operations
|
||||||
asynStatus pl_status = asynSuccess;
|
asynStatus pl_status = asynSuccess;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Continue regardless of the status returned by the poll; we just want to
|
||||||
|
find out whether the motor is currently moving or not. If the poll
|
||||||
|
function fails before it can determine that, it is assumed that the motor
|
||||||
|
is not moving.
|
||||||
|
*/
|
||||||
bool moving = false;
|
bool moving = false;
|
||||||
rw_status = doPoll(&moving);
|
doPoll(&moving);
|
||||||
if (rw_status != asynSuccess) {
|
|
||||||
return rw_status;
|
|
||||||
}
|
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user