xiongyi/AutoControlSystem-git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 更新回复原点比较方式

Browse Source
This commit is contained in:
FrankCV2048
2024-12-21 16:26:47 +08:00
parent c7edb09b08
commit f2f97f4edf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CU/Feeding.py
View File

@ -266,7 +266,7 @@ class Feeding(QObject):
if self.feedConfig == None: if self.feedConfig == None:
self.feedStatus = FeedStatus.FNone self.feedStatus = FeedStatus.FNone
if self.feedConfig !=None and self.feedConfig.num == 0 and self.is_reverse and self.robotClient.origin_position.compare(real_position): if self.feedConfig !=None and self.feedConfig.num == 0 and self.is_reverse and self.robotClient.origin_position.compare(real_position,is_action=True):
self.feedStatus = FeedStatus.FNone self.feedStatus = FeedStatus.FNone
self.is_reverse = False self.is_reverse = False
self.log_signal.emit(logging.INFO, Constant.str_feed_reverse) self.log_signal.emit(logging.INFO, Constant.str_feed_reverse)
@ -562,7 +562,7 @@ class Feeding(QObject):
self.reset_status = ResetStatus.RRunging self.reset_status = ResetStatus.RRunging
if self.reset_status == ResetStatus.RRunging: if self.reset_status == ResetStatus.RRunging:
if not real_position.compare(self.current_position.get_position()): if not real_position.compare(self.current_position.get_position(),is_action=True):
return return
pos_model = self.reversed_positions[self.reverse_index] pos_model = self.reversed_positions[self.reverse_index]
if pos_model.status == FeedStatus.FTake.value: # 跳过取袋节点 if pos_model.status == FeedStatus.FTake.value: # 跳过取袋节点