From 39f3cb836bb068b2d20b06894a791a0309f1751d Mon Sep 17 00:00:00 2001 From: gitea Date: Thu, 13 Jun 2024 19:58:34 +0800 Subject: [PATCH] =?UTF-8?q?v0.1.5.2(2024/06/13)=20[brake.py/aio.py]:=20?= =?UTF-8?q?=E5=B0=86sto=E4=BF=AE=E6=94=B9=E4=B8=BAestop=20[brake.py]:=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=80=9F=E5=BA=A6=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84?= =?UTF-8?q?vel=E5=88=97=E6=95=B0=E6=8D=AE=E9=81=B5=E5=BE=AA=E5=A6=82?= =?UTF-8?q?=E4=B8=8B=E8=A7=84=E5=88=99=EF=BC=8Cav=20=3D=20vel=20*=20180=20?= =?UTF-8?q?/=20pi=EF=BC=8C=E6=A0=B9=E6=8D=AEav=E5=86=8D=E8=AE=A1=E7=AE=97s?= =?UTF-8?q?peed=20[brake.py]:=20=E5=B0=86threshold=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=B8=B8=E9=87=8F50=20[brake.py]:=20=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E4=BA=86=E8=BE=93=E5=87=BA=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E7=9A=84=E6=98=8E=E7=A1=AE=E6=80=A7=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E7=9C=81=E7=95=A5?= =?UTF-8?q?=E5=8F=B7=20[brake.py]:=20=E6=9B=B4=E6=AD=A3=E4=BA=86=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=95=B0=E6=8D=AEcopy=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E6=96=B0=E4=BC=98=E5=8C=96=E4=BA=86estop?= =?UTF-8?q?=E5=A4=84=E6=98=AF=E5=90=A6=E8=BE=BE=E5=88=B0=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E7=9A=84=E5=88=A4=E5=AE=9A=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aio/README.md | 9 ++++++- aio/aio.py | 20 ++++++++-------- aio/brake.py | 66 +++++++++++++++++++++++++++------------------------ 3 files changed, 53 insertions(+), 42 deletions(-) diff --git a/aio/README.md b/aio/README.md index de86518..5d1d216 100644 --- a/aio/README.md +++ b/aio/README.md @@ -202,4 +202,11 @@ v0.1.5.1(2024/06/12) [current.py]: 修改位置超限提示，使更清楚了解问题原因 [current.py]: 修改find_point函数中错误提示，增加定位信息 [README.md]: 精简打包命令 -[requirements.txt]: 新增必要库配置文件 \ No newline at end of file +[requirements.txt]: 新增必要库配置文件 + +v0.1.5.2(2024/06/13) +[brake.py/aio.py]: 将sto修改为estop +[brake.py]: 修改了速度计算逻辑，新版本的vel列数据遵循如下规则，av = vel * 180 / pi，根据av再计算speed +[brake.py]: 将threshold修改为常量50 +[brake.py]: 提高了输出提示语的明确性，删除了不必要的省略号 +[brake.py]: 更正了之前的数据copy错误，重新优化了estop处是否达到指定百分比的判定逻辑 \ No newline at end of file diff --git a/aio/aio.py b/aio/aio.py index f96dcb7..607e96c 100644 --- a/aio/aio.py +++ b/aio/aio.py @@ -31,7 +31,7 @@ widgits = { 'vel': {'label': '', 'optionmenu': '', 'row': 3, 'col': 4, 'text': ''}, 'trq': {'label': '', 'optionmenu': '', 'row': 3, 'col': 6, 'text': ''}, 'trqh': {'label': '', 'optionmenu': '', 'row': 3, 'col': 8, 'text': ''}, - 'sto': {'label': '', 'optionmenu': '', 'row': 3, 'col': 10, 'text': ''}, + 'estop': {'label': '', 'optionmenu': '', 'row': 3, 'col': 10, 'text': ''}, 'rc1': {'label': '', 'entry': '', 'row': 4, 'col': 2, 'text': '额定电流'}, 'rc2': {'label': '', 'entry': '', 'row': 4, 'col': 4, 'text': '额定电流'}, 'rc3': {'label': '', 'entry': '', 'row': 4, 'col': 6, 'text': '额定电流'}, @@ -50,12 +50,12 @@ class App(customtkinter.CTk): # configure window self.title("AIO - All in one automatic toolbox") # self.iconbitmap('./icon.ico') - self.geometry("1180x550+30+30") + self.geometry("1200x550+30+30") self.protocol("WM_DELETE_WINDOW", self.func_end_callback) self.config(bg='#E9E9E9') self.grid_rowconfigure(5, weight=1) self.grid_columnconfigure((1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13), weight=1) - self.minsize(1180, 550) + self.minsize(1200, 550) # ===================================================================== # create frame sidebar(left) self.frame_func = customtkinter.CTkFrame(self, width=120, corner_radius=0, fg_color='#E9E9E9') @@ -102,7 +102,7 @@ class App(customtkinter.CTk): widgits[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Data Process'), width=self.w_param, placeholder_text=f"{widgits[widgit]['text']}", font=self.my_font) widgits[widgit]['entry'].grid(row=widgits[widgit]['row'], column=widgits[widgit]['col']+1, padx=(5, 10), pady=5, sticky='w') widgits[widgit]['entry'].configure(state='disabled') - elif widgit in ['axis', 'vel', 'trq', 'trqh', 'sto']: + elif widgit in ['axis', 'vel', 'trq', 'trqh', 'estop']: widgits[widgit]['label'] = customtkinter.CTkLabel(self.tabview.tab('Data Process'), text=f"{widgit.upper()}", font=self.my_font) widgits[widgit]['label'].grid(row=widgits[widgit]['row'], column=widgits[widgit]['col'], sticky='e', pady=5) widgits[widgit]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Data Process'), button_color='#708090', fg_color='#778899', values=["1", "2", "3", "4", "5", "6", "7"], width=self.w_param, font=self.my_font) @@ -136,7 +136,7 @@ class App(customtkinter.CTk): if widgit in ['path', 'av', 'rc', 'rpm', 'rr', 'dur', 'rc1', 'rc2', 'rc3', 'rc4', 'rc5', 'rc6']: widgits[widgit]['label'].configure(text=f'{widgit.upper()}', text_color='black') widgits[widgit]['entry'].configure(placeholder_text=widgits[widgit]['text'], state='disabled') - elif widgit in ['axis', 'vel', 'trq', 'trqh', 'sto']: + elif widgit in ['axis', 'vel', 'trq', 'trqh', 'estop']: widgits[widgit]['label'].configure(text=f'{widgit.upper()}', text_color="black") widgits[widgit]['optionmenu'].configure(state='disabled') @@ -152,7 +152,7 @@ class App(customtkinter.CTk): if widgit in ['path', 'av', 'rr']: widgits[widgit]['label'].configure(text_color='red') widgits[widgit]['entry'].configure(state='normal') - elif widgit in ['axis', 'vel', 'trq', 'sto']: + elif widgit in ['axis', 'vel', 'trq', 'estop']: widgits[widgit]['label'].configure(text_color="red") widgits[widgit]['optionmenu'].configure(state='normal') elif func_name == 'current': @@ -245,14 +245,14 @@ class App(customtkinter.CTk): axis = widgits['axis']['optionmenu'].get() vel = widgits['vel']['optionmenu'].get() trq = widgits['trq']['optionmenu'].get() - sto = widgits['sto']['optionmenu'].get() + estop = widgits['estop']['optionmenu'].get() c1 = exists(path) c2 = self.is_float('required', av, rr) - c3 = True if len({vel, trq, sto}) == 3 else False + c3 = True if len({vel, trq, estop}) == 3 else False if c1 and c2 and c3: - return 1, path, float(av), float(rr), int(axis), int(vel), int(trq), int(sto) + return 1, path, float(av), float(rr), int(axis), int(vel), int(trq), int(estop) else: return 0, 0 # ======================================================= @@ -311,7 +311,7 @@ class App(customtkinter.CTk): flag, *args = self.check_param() func_dict = {1: brake.main, 2: current.main, 3: iso.main} if flag == 1: - func_dict[flag](path=args[0], av=args[1], rr=args[2], axis=args[3], vel=args[4], trq=args[5], sto=args[6], w2t=self.write2textbox) + func_dict[flag](path=args[0], av=args[1], rr=args[2], axis=args[3], vel=args[4], trq=args[5], estop=args[6], w2t=self.write2textbox) elif flag == 2: func_dict[flag](path=args[0], sub=args[1], rcs=args[2], vel=args[3], trq=args[4], trqh=args[5], dur=args[6], rpm=args[7], w2t=self.write2textbox) elif flag == 3: diff --git a/aio/brake.py b/aio/brake.py index 9183f51..8a905dc 100644 --- a/aio/brake.py +++ b/aio/brake.py @@ -27,12 +27,12 @@ class GetThreadResult(Thread): return None -def data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, sto): +def data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, estop): # 功能：完成一个结果文件的数据处理 # 参数：结果文件，数据目录，以及预读取的参数 # 返回值：- file_name = result_file.split('\\')[-1] - w2t(f"打开文件 {file_name} 需要 1min 左右", 1, 0, 'orange') + w2t(f"正在打开文件 {file_name} 需要 1min 左右", 1, 0, 'orange') global stop stop = 0 @@ -55,21 +55,21 @@ def data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, sto): # count = 1 # for data_file in data_files: # now_doing_msg(data_file, 'start', w2t) - # single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t, sto) + # single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t, estop) # count += 1 # now_doing_msg(data_file, 'done', w2t) # --------------------------------------------------- # 数据文件并行处理模式--------------------------------- - threads = [Thread(target=single_file_process, args=(data_files[0], wb_result, 1, av, rr, axis, vel, trq, w2t, sto)), - Thread(target=single_file_process, args=(data_files[1], wb_result, 2, av, rr, axis, vel, trq, w2t, sto)), - Thread(target=single_file_process, args=(data_files[2], wb_result, 3, av, rr, axis, vel, trq, w2t, sto))] + threads = [Thread(target=single_file_process, args=(data_files[0], wb_result, 1, av, rr, axis, vel, trq, w2t, estop)), + Thread(target=single_file_process, args=(data_files[1], wb_result, 2, av, rr, axis, vel, trq, w2t, estop)), + Thread(target=single_file_process, args=(data_files[2], wb_result, 3, av, rr, axis, vel, trq, w2t, estop))] [t.start() for t in threads] [t.join() for t in threads] # --------------------------------------------------- now_doing_msg(raw_data_dir, 'done', w2t) now_doing_msg(result_file, 'done', w2t) - w2t(f"保存文件 {file_name} 需要 1min 左右", 1, 0, 'orange') + w2t(f"正在保存文件 {file_name} 需要 1min 左右", 1, 0, 'orange') stop = 0 t_excel = Thread(target=wb_result.save, args=(result_file, )) t_wait = Thread(target=w2t_local, args=('.', 1, w2t)) @@ -138,9 +138,9 @@ def now_doing_msg(docs, flag, w2t): elif flag == 'start' and file_type == 'file': w2t(f"[{now}] 正在处理文件 {docs} 中的数据......") elif flag == 'done' and file_type == 'dir': - w2t(f"[{now}] 目录 {docs} 数据文件已处理完毕......") + w2t(f"[{now}] 目录 {docs} 数据文件已处理完毕") elif flag == 'done' and file_type == 'file': - w2t(f"[{now}] 文件 {docs} 数据已处理完毕......") + w2t(f"[{now}] 文件 {docs} 数据已处理完毕") def w2t_local(msg, wait, w2t): @@ -153,7 +153,7 @@ def w2t_local(msg, wait, w2t): break -def single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t, sto): +def single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t, estop): # 功能：完成单个数据文件的处理 # 参数：如上 # 返回值：- @@ -163,11 +163,11 @@ def single_file_process(data_file, wb_result, count, av, rr, axis, vel, trq, w2t result_sheet_name = find_result_sheet_name(conditions, count) ws_result = wb_result[result_sheet_name] - row_start, row_end = find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, sto) - copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, sto) + row_start, row_end = find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, estop) + copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, estop) -def copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, sto): +def copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, estop): # 功能：将数据文件中有效数据拷贝至结果文件对应的 sheet # 参数：如上 # 返回值：- @@ -177,20 +177,20 @@ def copy_data_to_result(df, ws_result, row_start, row_end, vel, trq, sto): for _row in range(row_start, row_end + 1): data.append(df.iloc[_row, vel-1]) data.append(df.iloc[_row, trq-1]) - data.append(df.iloc[_row, trq-1]) + data.append(df.iloc[_row, estop-1]) i = 0 row_max = 2000 if row_end-row_start < 2000 else row_end-row_start+20 for _row in range(2, row_max): try: - ws_result.cell(row=_row, column=0).value = data[i] - ws_result.cell(row=_row, column=0).value = data[i+1] - ws_result.cell(row=_row, column=0).value = data[i+2] + ws_result.cell(row=_row, column=1).value = data[i] + ws_result.cell(row=_row, column=2).value = data[i+1] + ws_result.cell(row=_row, column=3).value = data[i+2] i += 3 except: - ws_result.cell(row=_row, column=0).value = None - ws_result.cell(row=_row, column=0).value = None - ws_result.cell(row=_row, column=0).value = None + ws_result.cell(row=_row, column=1).value = None + ws_result.cell(row=_row, column=2).value = None + ws_result.cell(row=_row, column=3).value = None def find_result_sheet_name(conditions, count): @@ -205,31 +205,35 @@ def find_result_sheet_name(conditions, count): return result_sheet_name -def find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, sto): +def find_row_start(data_file, df, conditions, av, rr, axis, vel, w2t, estop): # 功能：查找数据文件中有效数据的行号，也即最后一个速度下降的点位 # 参数：如上 # 返回值：速度下降点位，最后的数据点位 ratio = float(conditions[2].removeprefix('speed'))/100 speed_max = av * rr * ratio * 60 / 360 row_max = df.index[-1] - threshold = 30 if axis == 2 and conditions[0].removeprefix('load') == '100' else 10 + # threshold = 30 if axis == 2 and conditions[0].removeprefix('load') == '100' else 10 + threshold = 50 for _row in range(row_max, -1, -1): - if df.iloc[_row, sto-1] != 0: - row_start = _row-100 if _row-100 > 0 else 0 + if df.iloc[_row, estop-1] != 0: + row_start = _row-20 if _row-20 > 0 else 0 break else: - w2t(f"数据文件 {data_file} 采集的数据中没有 STO 为非 0 的情况，需要确认......", 0, 9, 'red') + w2t(f"数据文件 {data_file} 采集的数据中没有 ESTOP 为非 0 的情况，需要确认", 0, 9, 'red') for _row in range(row_start, row_max): - if abs(df.iloc[_row, vel-1]) < 1: + speed_row = (df.iloc[_row, vel-1] * 180) / 3.1415926 * rr * 60 / 360 + if abs(speed_row) < 1: row_end = _row+100 if _row+100 <= row_max else row_max break else: w2t(f"数据文件 {data_file} 最后的速度未降为零 ", 0, 10, 'red') - if abs(df.iloc[row_start+50]-speed_max) > threshold: - w2t(f"数据文件 {data_file} 未采集到指定百分比的最大速度，需要检查......") + speed_estop = abs((df.iloc[row_start-10:row_start+10, vel-1].abs().mean() * 180) / 3.1415926 * rr * 60 / 360) + if abs(speed_estop-speed_max) > threshold: + filename = data_file.split('\\')[-1] + w2t(f"[speed_estop: {speed_estop:.2f} | shouldbe: {speed_max:.2f}] 数据文件 {filename} 触发 ESTOP 时未采集到指定百分比的最大速度，需要检查", 0, 0, '#8A2BE2') return row_start, row_end @@ -253,7 +257,7 @@ def traversal_files(path, w2t): return dirs, files -def main(path, av, rr, axis, vel, trq, sto, w2t): +def main(path, av, rr, axis, vel, trq, estop, w2t): # 功能：执行处理所有数据文件 # 参数：initialization函数的返回值 # 返回值：- @@ -273,7 +277,7 @@ def main(path, av, rr, axis, vel, trq, sto, w2t): continue else: now_doing_msg(result_file, 'start', w2t) - data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, sto) + data_process(result_file, raw_data_dirs, av, rr, axis, vel, trq, w2t, estop) # threads.append(Thread(target=data_process, args=(result_file, raw_data_dirs, AV, RR, RC, AXIS))) # [t.start() for t in threads] # [t.join() for t in threads] @@ -291,4 +295,4 @@ def main(path, av, rr, axis, vel, trq, sto, w2t): if __name__ == "__main__": stop = 0 - main(path=argv[1], av=argv[2], rr=argv[3], axis=argv[4], vel=argv[5], trq=argv[6], sto=argv[7], w2t=argv[8]) + main(path=argv[1], av=argv[2], rr=argv[3], axis=argv[4], vel=argv[5], trq=argv[6], estop=argv[7], w2t=argv[8])