Merge pull request #34 from icshwi/anders_autoEnableDisable

anderssandstrom · web-flow · commit 44c6f622d8e2 · 2020-08-27T12:08:48.000+02:00
Fix moving bit in ecmcMotorRecordAxis::poll(*moving)
diff --git a/devEcmcSup/motor/ecmcMotorRecordAxis.cpp b/devEcmcSup/motor/ecmcMotorRecordAxis.cpp
@@ -992,8 +992,11 @@ asynStatus ecmcMotorRecordAxis::poll(bool *moving)
   if (drvlocal.waitNumPollsBeforeReady) {
     *moving = true;
   }
+  else
 #endif
-  
+{
+  *moving = drvlocal.moveNotReadyNext ? true : false;
+}
   if (drvlocal.moveNotReadyNext){
     drvlocal.nCommandActive = drvlocal.statusBinData.onChangeData.command;
   }

Original file line number	Diff line number	Diff line change
`@@ -992,8 +992,11 @@ asynStatus ecmcMotorRecordAxis::poll(bool *moving)`
`992`	`992`	`if (drvlocal.waitNumPollsBeforeReady) {`
`993`	`993`	`*moving = true;`
`994`	`994`	`}`
	`995`	`+ else`
`995`	`996`	`#endif`
`996`		`-`
	`997`	`+{`
	`998`	`+ *moving = drvlocal.moveNotReadyNext ? true : false;`
	`999`	`+}`
`997`	`1000`	`if (drvlocal.moveNotReadyNext){`
`998`	`1001`	`drvlocal.nCommandActive = drvlocal.statusBinData.onChangeData.command;`
`999`	`1002`	`}`