修正震动点不动的bug
This commit is contained in:
@ -485,19 +485,16 @@ class Feeding(QObject):
|
||||
if self.get_current_position().get_position().compare(real_position,is_action=True):
|
||||
# TODO 震动方案
|
||||
self.log_signal.emit(logging.INFO, Constant.str_feed_shake)
|
||||
|
||||
if self.catch.catch_status == CatchStatus.COk:
|
||||
self.catch.catch_status = CatchStatus.CNone
|
||||
self.next_position()
|
||||
if self.catch.catch_status == CatchStatus.CNone:
|
||||
self.catch.catch_status = CatchStatus.CShake
|
||||
return
|
||||
if self.catch.catch_status == CatchStatus.CShake:
|
||||
return
|
||||
|
||||
if self.feedConfig.feedLine.start_to_take[self.feedConfig.feedLine.feeding2end_pos_index+1].status != FeedStatus.FShake:
|
||||
self.catch.catch_status = CatchStatus.COk
|
||||
|
||||
if self.catch.catch_status == CatchStatus.COk:
|
||||
self.catch.catch_status = CatchStatus.CNone
|
||||
self.next_position()
|
||||
|
||||
elif self.feedStatus == FeedStatus.FDropBag:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user