btl143/project_main
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复跳过任务时等待所有nexec执行完毕后才开始巡线的问题

Browse Source
This commit is contained in:
bmy
2024-06-15 11:04:39 +08:00
parent d9a68d408d
commit db6ec06441
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
subtask.py
View File

@@ -258,11 +258,18 @@ class task_queuem(task):
self.status = task_queuem_status.EXECUTING self.status = task_queuem_status.EXECUTING
# 执行任务函数 # 执行任务函数
elif self.status is task_queuem_status.EXECUTING: elif self.status is task_queuem_status.EXECUTING:
if self.task_now.enable is True:
logger.info(f"[TaskM]# Start execute task function") logger.info(f"[TaskM]# Start execute task function")
self.task_now.exec() # 执行当前任务函数 self.task_now.exec() # 执行当前任务函数
self.queue.task_done() # 弹出已执行的任务 self.queue.task_done() # 弹出已执行的任务
self.status = task_queuem_status.IDEL # self.status = task_queuem_status.IDEL #
logger.info(f"[TaskM]# <<<<----------------------") logger.info(f"[TaskM]# <<<<----------------------")
else:
logger.info(f"[TaskM]# Start execute task function (nexec)")
self.status = task_queuem_status.IDEL # 空动作不需要阻塞巡线，直接置位
self.task_now.exec() # 执行当前任务函数
self.queue.task_done() # 弹出已执行的任务
logger.info(f"[TaskM]# <<<<----------------------")
return True return True
# 人员施救 # 人员施救