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-10-09 22:36:30 +08:00
parent 2fd734562d
commit 9a70f9c850
6 changed files with 756 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
CU/Feeding.py
View File

@ -14,13 +14,14 @@ from Util.util_log import log
class FeedStatus(IntEnum):
FNone = 0
FStart = 1
FSafeP = 2
FPhoto = 3
FTake = 4
FSafeF = 5
FFeedP = 6
FBroken = 7
FFinished = 8
FCheck = 2
FSafeP = 3
FPhoto = 4
FTake = 5
FSafeF = 6
FFeedP = 7
FBroken = 8
FFinished = 9
class FeedLine:
def __init__(self,name,safe_position:Real_Position,photo_position:Real_Position,mid_position:Real_Position,broken_position:Real_Position,feed_position:Real_Position):
@ -76,16 +77,24 @@ class Feeding():
self.feedStatus = FeedStatus.FNone
elif self.feedConfig.num == 0:
self.feedStatus = FeedStatus.FNone
if self.feedStatus==FeedStatus.FNone or self.pause:
if self.feedStatus == FeedStatus.FNone or self.pause:
return
elif self.feedStatus==FeedStatus.FStart:
log.log_message(logging.INFO,Constant.str_feed_start)
if self.feedConfig.num != 0:
self.feedStatus = FeedStatus.FSafeP
self.sendTargPosition(self.feedConfig.feedLine.safe_position)
# print(request_command)
elif self.feedStatus == FeedStatus.FStart:
log.log_message(logging.INFO, Constant.str_feed_start)
self.feedStatus = FeedStatus.FCheck
pass
elif self.feedStatus == FeedStatus.FCheck:
log.log_message(logging.INFO, Constant.str_feed_check)
# 1, 检查是否是三列
# 2, 检查是否有人
if self.safe_check_columns() and self.safe_check_person():
pass
else:
if self.feedConfig.num != 0:
self.feedStatus = FeedStatus.FSafeP
self.sendTargPosition(self.feedConfig.feedLine.safe_position)
elif self.feedStatus==FeedStatus.FSafeP:
log.log_message(logging.INFO,Constant.str_feed_safe)
if self.feedConfig.feedLine.safe_position.compare(real_position):
@ -187,3 +196,11 @@ class Feeding():
self.robotClient.add_sendQuene(request_command)
pass
def safe_check_columns(self):
return True
pass
def safe_check_person(self):
return True
pass