pref: 修改子任务为类

This commit is contained in:
bmy
2024-05-22 12:37:15 +08:00
parent 2f500c89ee
commit 169aa0022b
5 changed files with 145 additions and 50 deletions

25
main.py
View File

@@ -8,19 +8,19 @@ import subtask as sb
cfg_main = toml.load('cfg_main.toml')
# 配置日志输出
logger.add(cfg_main['debug'].get('logger_filename'), format=cfg_main['debug'].get('logger_format'), level="INFO")
logger.add(cfg_main['debug']['logger_filename'], format=cfg_main['debug']['logger_format'], retention = 5, level="INFO")
task_queue = queue.Queue()
task_queue = queue.Queue()
task_queue.put(sb.task(sb.get_block, cfg_main['task'].get('GetBlock_enable')))
task_queue.put(sb.task(sb.put_block, cfg_main['task'].get('PutBlock_enable')))
task_queue.put(sb.task(sb.get_bball, cfg_main['task'].get('GetBBall_enable')))
task_queue.put(sb.task(sb.up_tower, cfg_main['task'].get('UpTower_enable')))
task_queue.put(sb.task(sb.get_rball, cfg_main['task'].get('GetRBall_enable')))
task_queue.put(sb.task(sb.put_bball, cfg_main['task'].get('PutBBall_enable')))
task_queue.put(sb.task(sb.put_hanoi, cfg_main['task'].get('PutHanoi_enable')))
task_queue.put(sb.task(sb.move_area, cfg_main['task'].get('MoveArea_enable')))
task_queue.put(sb.task(sb.kick_ass, cfg_main['task'].get('KickAss_enable')))
task_queue.put(sb.task(sb.get_block.exec, sb.get_block.find, cfg_main['task']['GetBlock_enable']))
task_queue.put(sb.task(sb.put_block.exec, sb.put_block.find, cfg_main['task']['PutBlock_enable']))
task_queue.put(sb.task(sb.get_bball.exec, sb.get_bball.find, cfg_main['task']['GetBBall_enable']))
task_queue.put(sb.task(sb.up_tower.exec, sb.up_tower.find, cfg_main['task']['UpTower_enable']))
task_queue.put(sb.task(sb.get_rball.exec, sb.get_rball.find, cfg_main['task']['GetRBall_enable']))
task_queue.put(sb.task(sb.put_bball.exec, sb.put_bball.find, cfg_main['task']['PutBBall_enable']))
task_queue.put(sb.task(sb.put_hanoi.exec, sb.put_hanoi.find, cfg_main['task']['PutHanoi_enable']))
task_queue.put(sb.task(sb.move_area.exec, sb.move_area.find, cfg_main['task']['MoveArea_enable']))
task_queue.put(sb.task(sb.kick_ass.exec, sb.kick_ass.find, cfg_main['task']['KickAss_enable']))
task_queuem_t = sb.task_queuem(task_queue)
@@ -37,6 +37,7 @@ while task_queuem_t.busy is True:
pass
else:
# 模拟执行回归任务
logger.info("***** sim huigui task *****")
# logger.info("***** sim huigui task *****")
pass
logger.info("Main thread exit")