From bebaf292ace3885eba5309aebb6b8af496033054 Mon Sep 17 00:00:00 2001 From: gitea Date: Wed, 9 Oct 2024 16:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B6=E5=8A=A8=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E6=B5=8B=E8=AF=95=EF=BC=8C=E9=87=87=E9=9B=86=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=80=9F=E5=BA=A6=E6=9C=AA=E9=99=8D=E4=B8=BA?= =?UTF-8?q?0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aio/README.md | 3 +++ aio/assets/file_version_info.txt | 8 ++++---- aio/assets/templates/heartbeat | 2 +- aio/assets/vers | 2 +- aio/code/aio.py | 2 +- aio/code/automatic_test/do_brake.py | 1 + 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/aio/README.md b/aio/README.md index 5adc60c..9869708 100644 --- a/aio/README.md +++ b/aio/README.md @@ -627,3 +627,6 @@ v0.2.0.8(2024/08/20) 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)` + +v0.2.0.9(2024/10/09) +1. [main: do_brake.py] 采集完成后，pending 1s，使速度完全将为 0 \ No newline at end of file diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index 24d94f9..4ccbb4a 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, 2, 0, 8), - prodvers=(0, 2, 0, 8), + filevers=(0, 2, 0, 9), + prodvers=(0, 2, 0, 9), # 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.2.0.8 (2024-08-20)'), + StringStruct('FileVersion', '0.2.0.9 (2024-10-09)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.2.0.8 (2024-08-20)')]) + StringStruct('ProductVersion', '0.2.0.9 (2024-10-09)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/templates/heartbeat b/aio/assets/templates/heartbeat index c227083..56a6051 100644 --- a/aio/assets/templates/heartbeat +++ b/aio/assets/templates/heartbeat @@ -1 +1 @@ -0 \ No newline at end of file +1 \ No newline at end of file diff --git a/aio/assets/vers b/aio/assets/vers index b6884c7..f8fc40e 100644 --- a/aio/assets/vers +++ b/aio/assets/vers @@ -1 +1 @@ -0.2.0.8 @ 08/20/2024 \ No newline at end of file +0.2.0.9 @ 10/09/2024 \ No newline at end of file diff --git a/aio/code/aio.py b/aio/code/aio.py index c9e6d1a..40ef618 100644 --- a/aio/code/aio.py +++ b/aio/code/aio.py @@ -96,7 +96,7 @@ class App(customtkinter.CTk): btns_func['log']['btn'].configure(command=lambda: self.thread_it(self.func_log_callback)) btns_func['end']['btn'].configure(command=lambda: self.thread_it(self.func_end_callback)) # 1.3 create version info - self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.2.0.8\nDate: 08/20/2024", font=self.my_font, text_color="#4F4F4F") + self.label_version = customtkinter.CTkLabel(self.frame_func, justify='left', text="Vers: 0.2.0.9\nDate: 10/09/2024", font=self.my_font, text_color="#4F4F4F") self.frame_func.rowconfigure(6, weight=1) self.label_version.grid(row=6, column=0, padx=20, pady=20, sticky='s') # ===================================================================== diff --git a/aio/code/automatic_test/do_brake.py b/aio/code/automatic_test/do_brake.py index 8a4bf26..3a2d603 100644 --- a/aio/code/automatic_test/do_brake.py +++ b/aio/code/automatic_test/do_brake.py @@ -269,6 +269,7 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t): sleep(1) # 6. 保留数据并处理输出 + sleep(1) # 为了让速度降为 0，1s 足够 curve_data = [] _c_msg = hr.c_msg.copy() for _msg in _c_msg: