From d76ee3d223f21e93594f6e05e50458f84fdf3ecb Mon Sep 17 00:00:00 2001 From: gitea Date: Sat, 13 Jul 2024 13:40:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=20[APIs:=20do=5Fbrake.py]=20=20=20=20-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9ready=5Fto=5Fgo=E4=BF=A1=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E9=80=BB=E8=BE=91=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=A4=A7=E8=B4=9F=E8=BD=BD=E6=9C=BA=E5=9E=8B=202.=20[APIs:=20d?= =?UTF-8?q?o=5Fcurrent.py]=20=20=20=20-=20=E4=BF=AE=E6=94=B9ready=5Fto=5Fg?= =?UTF-8?q?o=E4=BF=A1=E5=8F=B7=E7=9A=84=E6=8E=A5=E6=94=B6=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E9=80=82=E9=85=8D=E5=A4=A7=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=20=20=20=20-=20=E8=B0=83=E6=95=B4=E5=8D=95?= =?UTF-8?q?=E8=BD=B4=E6=B5=8B=E8=AF=95=E6=97=B6=E9=97=B4=E4=B8=BA35s?= =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8D=E5=A4=A7=E8=B4=9F=E8=BD=BD=E6=9C=BA?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E8=B0=83=E6=95=B4=E5=A0=B5=E8=BD=AC=E7=94=B5?= =?UTF-8?q?=E6=B5=81=E6=8C=81=E7=BB=AD=E6=97=B6=E9=97=B415s=EF=BC=8C?= =?UTF-8?q?=E9=80=82=E5=BD=93=E5=87=8F=E5=B0=91=E6=B5=8B=E8=AF=95=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20=20=20=20-=20=E5=B0=86act=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E7=BD=AE=E4=B8=BAFalse=E7=9A=84=E5=8A=A8=E4=BD=9C=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E5=88=9D=E5=A7=8B=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=81=A5=E5=A3=AE=E6=80=A7=20=20=20=20-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89=E8=BE=93=E5=87=BA=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=91=BD=E5=90=8D=EF=BC=8C=E5=9C=A8=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E5=90=8D=E4=B9=8B=E5=89=8D=E5=8A=A0=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aio/README.md | 2 ++ aio/assets/file_version_info.txt | 8 ++++---- aio/assets/vers | 2 +- aio/code/automatic_test/do_current.py | 18 +++++++++--------- aio/code/data_process/current.py | 6 ++++-- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/aio/README.md b/aio/README.md index 2e2c652..47d4631 100644 --- a/aio/README.md +++ b/aio/README.md @@ -472,4 +472,6 @@ v0.1.9.2(2024/07/13) - 修改ready_to_go信号的接收逻辑，适配大负载机型 - 调整单轴测试时间为35s，适配大负载机型，调整堵转电流持续时间15s，适当减少测试时间 - 将act信号置为False的动作放在初始化，增加程序健壮性 + - 修改所有输出文件的命名，在扩展名之前加入时间戳 +3. [current: current.py]: 在find_point函数种，当无法找到正确点位时，继续执行，而不是直接终止执行 diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index ca423d4..5f58e11 100644 --- a/aio/assets/file_version_info.txt +++ b/aio/assets/file_version_info.txt @@ -6,8 +6,8 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. - filevers=(0, 1, 9, 1), - prodvers=(0, 1, 9, 1), + filevers=(0, 1, 9, 2), + prodvers=(0, 1, 9, 2), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, # Contains a bitmask that specifies the Boolean attributes of the file. @@ -31,12 +31,12 @@ VSVersionInfo( '040904b0', [StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'), StringStruct('FileDescription', 'All in one automatic toolbox'), - StringStruct('FileVersion', '0.1.9.1 (2024-07-12)'), + StringStruct('FileVersion', '0.1.9.2 (2024-07-13)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.1.9.1 (2024-07-12)')]) + StringStruct('ProductVersion', '0.1.9.2 (2024-07-13)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/vers b/aio/assets/vers index 282634a..ea80ca6 100644 --- a/aio/assets/vers +++ b/aio/assets/vers @@ -1 +1 @@ -0.1.9.1 @ 07/12/2024 \ No newline at end of file +0.1.9.2 @ 07/13/2024 \ No newline at end of file diff --git a/aio/code/automatic_test/do_current.py b/aio/code/automatic_test/do_current.py index f57caf9..583f7ae 100644 --- a/aio/code/automatic_test/do_current.py +++ b/aio/code/automatic_test/do_current.py @@ -129,7 +129,7 @@ def data_proc_regular(path, filename, channel, scenario_time): df1 = pandas.DataFrame.from_dict(_d2d_vel) df2 = pandas.DataFrame.from_dict(_d2d_trq) df = pandas.concat([df1, df2], axis=1) - _filename = f'{path}\\single\\j{channel+1}_single.data' + _filename = f'{path}\\single\\j{channel+1}_single_{time()}.data' df.to_csv(_filename, sep='\t', index=False) elif channel in list(range(6, 9)): with open(filename, 'r', encoding='utf-8') as f_obj: @@ -178,37 +178,37 @@ def data_proc_regular(path, filename, channel, scenario_time): df_01 = pandas.DataFrame.from_dict(_d2d_vel_0) df_02 = pandas.DataFrame.from_dict(_d2d_trq_0) df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j1_s_{channel-5}_{scenario_time}.data' + _filename = f'{path}\\s_{channel-5}\\j1_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) df_01 = pandas.DataFrame.from_dict(_d2d_vel_1) df_02 = pandas.DataFrame.from_dict(_d2d_trq_1) df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j2_s_{channel-5}_{scenario_time}.data' + _filename = f'{path}\\s_{channel-5}\\j2_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) df_01 = pandas.DataFrame.from_dict(_d2d_vel_2) df_02 = pandas.DataFrame.from_dict(_d2d_trq_2) df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j3_s_{channel-5}_{scenario_time}.data' + _filename = f'{path}\\s_{channel-5}\\j3_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) df_01 = pandas.DataFrame.from_dict(_d2d_vel_3) df_02 = pandas.DataFrame.from_dict(_d2d_trq_3) df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j4_s_{channel-5}_{scenario_time}.data' + _filename = f'{path}\\s_{channel-5}\\j4_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) df_01 = pandas.DataFrame.from_dict(_d2d_vel_4) df_02 = pandas.DataFrame.from_dict(_d2d_trq_4) df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j5_s_{channel-5}_{scenario_time}.data' + _filename = f'{path}\\s_{channel-5}\\j5_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) df_01 = pandas.DataFrame.from_dict(_d2d_vel_5) df_02 = pandas.DataFrame.from_dict(_d2d_trq_5) df = pandas.concat([df_01, df_02], axis=1) - _filename = f'{path}\\s_{channel-5}\\j6_s_{channel-5}_{scenario_time}.data' + _filename = f'{path}\\s_{channel-5}\\j6_s_{channel-5}_{scenario_time}_{time()}.data' df.to_csv(_filename, sep='\t', index=False) elif channel in list(range(9, 15)): with open(filename, 'r', encoding='utf-8') as f_obj: @@ -227,7 +227,7 @@ def data_proc_regular(path, filename, channel, scenario_time): df1 = pandas.DataFrame.from_dict(_d2d_vel) df2 = pandas.DataFrame.from_dict(_d2d_trq) df = pandas.concat([df1, df2], axis=1) - _filename = f'{path}\\single\\j{channel-8}_hold.data' + _filename = f'{path}\\single\\j{channel-8}_hold_{time()}.data' df.to_csv(_filename, sep='\t', index=False) @@ -248,7 +248,7 @@ def data_proc_inertia(path, filename, channel): df1 = pandas.DataFrame.from_dict(_d2d_vel) df2 = pandas.DataFrame.from_dict(_d2d_trq) df = pandas.concat([df1, df2], axis=1) - _filename = f'{path}\\inertia\\j{channel+4}_inertia.data' + _filename = f'{path}\\inertia\\j{channel+4}_inertia_{time()}.data' df.to_csv(_filename, sep='\t', index=False) diff --git a/aio/code/data_process/current.py b/aio/code/data_process/current.py index 0fd3234..b7cd024 100644 --- a/aio/code/data_process/current.py +++ b/aio/code/data_process/current.py @@ -223,7 +223,8 @@ def find_point(data_file, pos, flag, df, _row_s, _row_e, w2t, exitcode, threshol else: return _row_s, _row_e else: - w2t(f"[{pos}] {data_file}数据有误，需要检查，无法找到第{exitcode}个有效点...", 0, exitcode, 'red') + # w2t(f"[{pos}] {data_file}数据有误，需要检查，无法找到第{exitcode}个有效点...", 0, exitcode, 'red') + w2t(f"[{pos}] {data_file}数据有误，需要检查，无法找到第{exitcode}个有效点...", 0, 0, 'red') elif flag == 'gt': while _row_e > end_point: speed_avg = df.iloc[_row_s:_row_e, 0].abs().mean() @@ -234,7 +235,8 @@ def find_point(data_file, pos, flag, df, _row_s, _row_e, w2t, exitcode, threshol else: return _row_s, _row_e else: - w2t(f"[{pos}] {data_file}数据有误，需要检查，无法找到有效起始点或结束点...", 0, exitcode, 'red') + # w2t(f"[{pos}] {data_file}数据有误，需要检查，无法找到有效起始点或结束点...", 0, exitcode, 'red') + w2t(f"[{pos}] {data_file}数据有误，需要检查，无法找到有效起始点或结束点...", 0, 0, 'red') def p_single(wb, single, vel, trq, rpms, w2t):