4. [main: openapi.py]:新增 rl_task.set_run_params 指令支持,可设定速度滑块以及是否重复运行

5. [main: do_brake/do_current/factory_test.py]:在初始化运动时增加 `clibs.execution('rl_task.set_run_params', hr, w2t, tab_name, loop_mode=True, override=1.0)`
This commit is contained in:
gitea 2024-08-20 18:03:44 +08:00
parent edafd91567
commit 59711d9c65
7 changed files with 18 additions and 1 deletions

View File

@ -146,7 +146,7 @@ pyinstaller --noconfirm --onedir --windowed --optimize 2 --contents-directory .
10. 由于xCore系统问题运行过程中可能会出现机器人宕机问题如果遇到可以手动重启控制柜重新运行 10. 由于xCore系统问题运行过程中可能会出现机器人宕机问题如果遇到可以手动重启控制柜重新运行
11. 务必正确填写configs.xlsx中的Target页面A1单元格可以选择正负方向急停 11. 务必正确填写configs.xlsx中的Target页面A1单元格可以选择正负方向急停
12. 工程文件可以手动重命名,按照机型存档,或者导出用于自动化测试 12. 工程文件可以手动重命名,按照机型存档,或者导出用于自动化测试
13. 自动化测试前需要将HMI程序速度设置为100%并同步至控制器,也即左下方速度滑条滑动至最大 13. (可废弃,但未验证)自动化测试前需要将HMI程序速度设置为100%并同步至控制器,也即左下方速度滑条滑动至最大
#### 6) 电机电流自动化测试 #### 6) 电机电流自动化测试
@ -625,3 +625,5 @@ v0.2.0.8(2024/08/20)
- 在 assets 目录新建 logs 目录,存放日志文件,并增加了相应的逻辑保证正常执行 - 在 assets 目录新建 logs 目录,存放日志文件,并增加了相应的逻辑保证正常执行
2. [t_change_ui: aio.py]:增加 App 窗口图标代码 2. [t_change_ui: aio.py]:增加 App 窗口图标代码
3. [t_change_ui: openapi.py]:将重复输出的网络错误提示,从 textbox 中转移到 debug.log 日志文件中 3. [t_change_ui: openapi.py]:将重复输出的网络错误提示,从 textbox 中转移到 debug.log 日志文件中
4. [main: openapi.py]:新增 rl_task.set_run_params 指令支持,可设定速度滑块以及是否重复运行
5. [main: do_brake/do_current/factory_test.py]:在初始化运动时增加 `clibs.execution('rl_task.set_run_params', hr, w2t, tab_name, loop_mode=True, override=1.0)`

View File

@ -0,0 +1,9 @@
{
"id": "xxxxxxxxxxx",
"module": "project",
"command": "rl_task.set_run_params",
"data": {
"loop_mode": true,
"override": 1.0
}
}

View File

@ -184,6 +184,7 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
clibs.execution('rl_task.pp_to_main', hr, w2t, tab_name, tasks=['brake', 'stop0_related']) clibs.execution('rl_task.pp_to_main', hr, w2t, tab_name, tasks=['brake', 'stop0_related'])
clibs.execution('state.switch_auto', hr, w2t, tab_name) clibs.execution('state.switch_auto', hr, w2t, tab_name)
clibs.execution('state.switch_motor_on', hr, w2t, tab_name) clibs.execution('state.switch_motor_on', hr, w2t, tab_name)
clibs.execution('rl_task.set_run_params', hr, w2t, tab_name, loop_mode=True, override=1.0)
clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['brake', 'stop0_related']) clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['brake', 'stop0_related'])
_t_start = time() _t_start = time()
while True: while True:

View File

@ -290,6 +290,7 @@ def run_rl(path, hr, md, loadsel, w2t):
clibs.execution('state.switch_motor_on', hr, w2t, tab_name) clibs.execution('state.switch_motor_on', hr, w2t, tab_name)
# 3. 开始运行程序单轴运行35s # 3. 开始运行程序单轴运行35s
clibs.execution('rl_task.set_run_params', hr, w2t, tab_name, loop_mode=True, override=1.0)
clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['current']) clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['current'])
_t_start = time() _t_start = time()
while True: while True:

View File

@ -599,6 +599,9 @@ class HmiRequest(object):
req['data']['tasks'] = kwargs['tasks'] req['data']['tasks'] = kwargs['tasks']
case 'rl_task.pp_to_main' | 'rl_task.run' | 'rl_task.stop': case 'rl_task.pp_to_main' | 'rl_task.run' | 'rl_task.stop':
req['data']['tasks'] = kwargs['tasks'] req['data']['tasks'] = kwargs['tasks']
case 'rl_task.set_run_params':
req['data']['loop_mode'] = kwargs['loop_mode']
req['data']['override'] = kwargs['override']
case 'diagnosis.set_params': case 'diagnosis.set_params':
req['data']['display_pdo_params'] = kwargs['display_pdo_params'] req['data']['display_pdo_params'] = kwargs['display_pdo_params']
case 'diagnosis.open': case 'diagnosis.open':

View File

@ -61,6 +61,7 @@ def run_rl(path, config_file, data_all, hr, md, w2t):
clibs.execution('state.switch_motor_on', hr, w2t, tab_name) clibs.execution('state.switch_motor_on', hr, w2t, tab_name)
# 3. 开始运行程序 # 3. 开始运行程序
clibs.execution('rl_task.set_run_params', hr, w2t, tab_name, loop_mode=True, override=1.0)
clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['current']) clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['current'])
_t_start = time() _t_start = time()
while True: while True:

0
main.py Normal file
View File