v0.2.0.5(2024/07/31)
此版本改动较大,公共部分做了规整,放置到新建文件夹 commons 当中,并所有自定义模块引入 logging 模块,记录重要信息 1. [t_change_ui: clibs.py] - 调整代码组织结构,新增模块,将公共函数以及类合并入此 - 将一些常量放入该模块 - 引入logging/concurrent_log_handler模块,并作初始化操作,供其他模块使用,按50M切割,最多保留10份 - prj_to_xcore函数设置工程名部分重写,修复了多个prj工程可能不能执行的问题 2. [t_change_ui: openapi.py] - 完全重写了 get_from_id 函数,使更精准 - 在 msg_storage 函数中,增加 logger,保留所有响应消息 - 删除 heartbeat 函数中的日志保存功能部分 - 心跳再次修改为 2s... 3. [t_change_ui: aio.py] - 增加了日志初始化部分 - detect_network 函数中修改重新实例化HR间隔为 4s,对应心跳 4. [t_change_ui: do_brake.py] - 使用一直打开曲线的方法规避解决了 OOM 的问题,同时修改数据处理方式,只取最后 12s 5. [t_change_ui: do_current.py] - 保持电流,只取最后 15s 6. [t_change_ui: all the part]: 引入 commons 包,并定制了 logging 输出,后续持续优化
This commit is contained in:
@ -1,30 +1,15 @@
|
||||
from time import sleep, time, strftime, localtime
|
||||
from sys import argv
|
||||
from os import scandir, mkdir
|
||||
from os.path import exists
|
||||
from os import mkdir
|
||||
from paramiko import SSHClient, AutoAddPolicy
|
||||
from json import loads
|
||||
from openpyxl import load_workbook
|
||||
import pandas
|
||||
from pandas import DataFrame, concat
|
||||
from logging import getLogger
|
||||
from commons import clibs
|
||||
|
||||
RADIAN = 57.3 # 180 / 3.1415926
|
||||
tab_name = 'Automatic Test'
|
||||
|
||||
|
||||
def traversal_files(path, w2t):
|
||||
if not exists(path):
|
||||
msg = f'数据文件夹{path}不存在,请确认后重试......'
|
||||
w2t(msg, 0, 1, 'red', tab_name)
|
||||
else:
|
||||
dirs = []
|
||||
files = []
|
||||
for item in scandir(path):
|
||||
if item.is_dir():
|
||||
dirs.append(item.path)
|
||||
elif item.is_file():
|
||||
files.append(item.path)
|
||||
|
||||
return dirs, files
|
||||
tab_name = clibs.tab_names['at']
|
||||
logger = getLogger(__file__)
|
||||
|
||||
|
||||
def check_files(path, loadsel, data_dirs, data_files, w2t):
|
||||
@ -72,51 +57,11 @@ def check_files(path, loadsel, data_dirs, data_files, w2t):
|
||||
w2t(' 1. configs.xlsx\n 2. reach33/reach66/reach100_xxxx.xlsx\n 3. xxxx.zip', 0, 1, 'red', tab_name)
|
||||
|
||||
|
||||
def prj_to_xcore(prj_file):
|
||||
ssh = SSHClient()
|
||||
ssh.set_missing_host_key_policy(AutoAddPolicy())
|
||||
ssh.connect('192.168.0.160', 22, username='luoshi', password='luoshi2019')
|
||||
sftp = ssh.open_sftp()
|
||||
sftp.put(prj_file, '/tmp/target.zip')
|
||||
cmd = 'cd /tmp; rm -rf target/; mkdir target; unzip -d target/ -q target.zip; '
|
||||
cmd += 'chmod 777 -R target/; rm target.zip'
|
||||
ssh.exec_command(cmd)
|
||||
|
||||
cmd = 'sudo rm -rf /home/luoshi/bin/controller/projects/target; '
|
||||
cmd += 'sudo mv /tmp/target/ /home/luoshi/bin/controller/projects/'
|
||||
stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True)
|
||||
stdin.write('luoshi2019' + '\n')
|
||||
stdin.flush()
|
||||
print(stdout.read().decode()) # 必须得输出一下stdout,才能正确执行sudo
|
||||
print(stderr.read().decode()) # 顺便也执行以下stderr
|
||||
|
||||
cmd = 'cd /home/luoshi/bin/controller/; '
|
||||
cmd += 'sudo mv projects/target/_build/*.prj projects/target/_build/target.prj'
|
||||
stdin, stdout, stderr = ssh.exec_command(cmd, get_pty=True)
|
||||
stdin.write('luoshi2019' + '\n')
|
||||
stdin.flush()
|
||||
print(stdout.read().decode()) # 必须得输出一下stdout,才能正确执行sudo
|
||||
print(stderr.read().decode()) # 顺便也执行以下stderr
|
||||
ssh.close()
|
||||
|
||||
|
||||
def execution(cmd, hr, w2t, **kwargs):
|
||||
_id = hr.execution(cmd, **kwargs)
|
||||
_msg = hr.get_from_id(_id)
|
||||
if not _msg:
|
||||
w2t(f"无法获取{_id}请求的响应信息", 0, 6, 'red', tab_name)
|
||||
else:
|
||||
_response = loads(_msg)
|
||||
if not _response:
|
||||
w2t(f"无法获取{id}请求的响应信息", 0, 1, 'red', tab_name)
|
||||
return _response
|
||||
|
||||
|
||||
def gen_result_file(path, curve_data, axis, _reach, _load, _speed, count):
|
||||
_d2d_vel = {'hw_joint_vel_feedback': []}
|
||||
_d2d_trq = {'device_servo_trq_feedback': []}
|
||||
_d2d_stop = {'device_safety_estop': []}
|
||||
for data in curve_data:
|
||||
for data in curve_data[-240:]:
|
||||
dict_results = data['data']
|
||||
for item in dict_results:
|
||||
try:
|
||||
@ -129,13 +74,11 @@ def gen_result_file(path, curve_data, axis, _reach, _load, _speed, count):
|
||||
_d2d_trq['device_servo_trq_feedback'].extend(item['value'])
|
||||
elif item.get('channel', None) == 0 and item.get('name', None) == 'device_safety_estop':
|
||||
_d2d_stop['device_safety_estop'].extend(item['value'])
|
||||
if len(_d2d_trq['device_servo_trq_feedback']) / 1000 > 10:
|
||||
break
|
||||
|
||||
df1 = pandas.DataFrame.from_dict(_d2d_vel)
|
||||
df2 = pandas.DataFrame.from_dict(_d2d_trq)
|
||||
df3 = pandas.DataFrame.from_dict(_d2d_stop)
|
||||
df = pandas.concat([df1, df2, df3], axis=1)
|
||||
df1 = DataFrame.from_dict(_d2d_vel)
|
||||
df2 = DataFrame.from_dict(_d2d_trq)
|
||||
df3 = DataFrame.from_dict(_d2d_stop)
|
||||
df = concat([df1, df2, df3], axis=1)
|
||||
_filename = f"{path}\\j{axis}\\reach{_reach}_load{_load}_speed{_speed}\\reach{_reach}_load{_load}_speed{_speed}_{count}.data"
|
||||
df.to_csv(_filename, sep='\t', index=False)
|
||||
|
||||
@ -168,14 +111,13 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
|
||||
else:
|
||||
w2t("configs.xlsx中Target页面A1单元格填写不正确,检查后重新运行...", 0, 111, 'red', tab_name)
|
||||
|
||||
_response = execution('diagnosis.open', hr, w2t, open=True, display_open=True)
|
||||
_response = execution('diagnosis.set_params', hr, w2t, display_pdo_params=display_pdo_params)
|
||||
clibs.execution('diagnosis.open', hr, w2t, tab_name, open=True, display_open=True)
|
||||
clibs.execution('diagnosis.set_params', hr, w2t, tab_name, display_pdo_params=display_pdo_params)
|
||||
for condition in result_dirs:
|
||||
_reach = condition.split('_')[0].removeprefix('reach')
|
||||
_load = condition.split('_')[1].removeprefix('load')
|
||||
_speed = condition.split('_')[2].removeprefix('speed')
|
||||
# if _speed != '100' or _reach != '100':
|
||||
# continue
|
||||
|
||||
for axis in range(1, 4):
|
||||
md.write_axis(axis)
|
||||
speed_max = 0
|
||||
@ -224,11 +166,11 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
|
||||
print(stderr.read().decode()) # 顺便也执行以下stderr
|
||||
|
||||
# 3. reload工程后,pp2main,并且自动模式和上电,最后运行程序
|
||||
_response = execution('overview.reload', hr, w2t, prj_path=prj_path, tasks=['brake', 'stop0_related'])
|
||||
_response = execution('rl_task.pp_to_main', hr, w2t, tasks=['brake', 'stop0_related'])
|
||||
_response = execution('state.switch_auto', hr, w2t)
|
||||
_response = execution('state.switch_motor_on', hr, w2t)
|
||||
_response = execution('rl_task.run', hr, w2t, tasks=['brake', 'stop0_related'])
|
||||
clibs.execution('overview.reload', hr, w2t, tab_name, prj_path=prj_path, 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_motor_on', hr, w2t, tab_name)
|
||||
clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['brake', 'stop0_related'])
|
||||
_t_start = time()
|
||||
while True:
|
||||
if md.read_ready_to_go() == 1:
|
||||
@ -241,8 +183,7 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
|
||||
sleep(1)
|
||||
# 4. 打开诊断曲线,并执行采集,之后触发软急停,关闭曲线采集,找出最大速度,传递给RL程序,最后清除相关记录
|
||||
sleep(get_init_speed) # 获取实际最大速度,可通过configs.xlsx配置
|
||||
_response = execution('rl_task.stop', hr, w2t, tasks=['brake'])
|
||||
# sleep(1)
|
||||
clibs.execution('rl_task.stop', hr, w2t, tab_name, tasks=['brake'])
|
||||
# 找出最大速度
|
||||
_c_msg = hr.c_msg.copy()
|
||||
for _msg in _c_msg:
|
||||
@ -250,7 +191,7 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
|
||||
dict_results = loads(_msg)['data']
|
||||
for item in dict_results:
|
||||
if item.get('channel', None) == axis-1 and item.get('name', None) == 'hw_joint_vel_feedback':
|
||||
_ = RADIAN * sum(item['value']) / len(item['value'])
|
||||
_ = clibs.RADIAN * sum(item['value']) / len(item['value'])
|
||||
if ws.cell(row=1, column=1).value == 'positive':
|
||||
speed_max = max(_, speed_max)
|
||||
elif ws.cell(row=1, column=1).value == 'negative':
|
||||
@ -264,8 +205,8 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
|
||||
md.write_speed_max(speed_max)
|
||||
|
||||
hr.c_msg_xs.clear()
|
||||
if len(hr.c_msg) > 240:
|
||||
del hr.c_msg[240:]
|
||||
if len(hr.c_msg) > 270:
|
||||
del hr.c_msg[270:]
|
||||
|
||||
if speed_max < 10:
|
||||
md.clear_alarm()
|
||||
@ -278,11 +219,11 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
|
||||
md.reset_estop() # 其实没必要
|
||||
md.clear_alarm()
|
||||
|
||||
_response = execution('overview.reload', hr, w2t, prj_path=prj_path, tasks=['brake', 'stop0_related'])
|
||||
_response = execution('rl_task.pp_to_main', hr, w2t, tasks=['brake', 'stop0_related'])
|
||||
_response = execution('state.switch_auto', hr, w2t)
|
||||
_response = execution('state.switch_motor_on', hr, w2t)
|
||||
_response = execution('rl_task.run', hr, w2t, tasks=['brake', 'stop0_related'])
|
||||
clibs.execution('overview.reload', hr, w2t, tab_name, prj_path=prj_path, 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_motor_on', hr, w2t, tab_name)
|
||||
clibs.execution('rl_task.run', hr, w2t, tab_name, tasks=['brake', 'stop0_related'])
|
||||
for i in range(3):
|
||||
if md.read_ready_to_go() == 1:
|
||||
md.write_act(1)
|
||||
@ -316,8 +257,8 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
|
||||
curve_data.insert(0, loads(_msg))
|
||||
else:
|
||||
hr.c_msg_xs.clear()
|
||||
if len(hr.c_msg) > 240:
|
||||
del hr.c_msg[240:]
|
||||
if len(hr.c_msg) > 270:
|
||||
del hr.c_msg[270:]
|
||||
gen_result_file(path, curve_data, axis, _reach, _load, _speed, count)
|
||||
else:
|
||||
w2t(f"\n{loadsel.removeprefix('tool')}%负载的制动性能测试执行完毕,如需采集其他负载,须切换负载类型,并更换其他负载,重新执行。", 0, 0, 'green', tab_name)
|
||||
@ -325,9 +266,9 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
|
||||
|
||||
def main(path, hr, md, loadsel, w2t):
|
||||
_s_time = time()
|
||||
data_dirs, data_files = traversal_files(path, w2t)
|
||||
data_dirs, data_files = clibs.traversal_files(path, w2t)
|
||||
config_file, reach33, reach66, reach100, prj_file, result_dirs = check_files(path, loadsel, data_dirs, data_files, w2t)
|
||||
prj_to_xcore(prj_file)
|
||||
clibs.prj_to_xcore(prj_file)
|
||||
run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t)
|
||||
_e_time = time()
|
||||
time_total = _e_time - _s_time
|
||||
|
Reference in New Issue
Block a user