From 9766c2f6205514d52487e873dcd7baaf11c403cb Mon Sep 17 00:00:00 2001 From: gitea Date: Thu, 13 Feb 2025 14:45:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=B5=E6=9C=BA=E7=94=B5?= =?UTF-8?q?=E6=B5=81=E8=87=AA=E5=8A=A8=E5=8C=96=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/files/version/file_version_info.txt | 8 ++++---- assets/files/version/release_change.md | 2 ++ assets/files/version/vers | 2 +- code/automatic_test/do_current.py | 14 +++++++------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/assets/files/version/file_version_info.txt b/assets/files/version/file_version_info.txt index a42583f..137a215 100644 --- a/assets/files/version/file_version_info.txt +++ b/assets/files/version/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, 3, 1, 3), - prodvers=(0, 3, 1, 3), + filevers=(0, 3, 1, 4), + prodvers=(0, 3, 1, 4), # 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.3.1.3 (2025-02-12)'), + StringStruct('FileVersion', '0.3.1.4 (2025-02-13)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2025 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.3.1.3 (2025-02-12)')]) + StringStruct('ProductVersion', '0.3.1.4 (2025-02-13)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/assets/files/version/release_change.md b/assets/files/version/release_change.md index 75e3d49..5ed4541 100644 --- a/assets/files/version/release_change.md +++ b/assets/files/version/release_change.md @@ -479,3 +479,5 @@ v0.3.1.2(2025/02/11) v0.3.1.3(2025/02/12) 1. 修改自动测试（制动）的打开关闭曲线逻辑，开始时打开，完整测试结束时关闭 +v0.3.1.3(2025/02/13) +1. 修改自动测试（电机电流）的数据处理方法，从以前的Multiprocessing->threading，因为Intel CPU遇到Multiprocessing会重新打开一个AIO实例 \ No newline at end of file diff --git a/assets/files/version/vers b/assets/files/version/vers index 8d9c917..640f16d 100644 --- a/assets/files/version/vers +++ b/assets/files/version/vers @@ -1 +1 @@ -0.3.1.3@02/12/2025 \ No newline at end of file +0.3.1.4@02/13/2025 \ No newline at end of file diff --git a/code/automatic_test/do_current.py b/code/automatic_test/do_current.py index 9677faa..f757485 100644 --- a/code/automatic_test/do_current.py +++ b/code/automatic_test/do_current.py @@ -1,5 +1,5 @@ import os -import multiprocessing +import threading import time import paramiko import pandas @@ -118,14 +118,14 @@ def gen_result_file(path, number, start_time, end_time, scenario_time): if number < 12: records = get_records(start_time, end_time) - p = multiprocessing.Process(target=single_axis_proc, args=(path, records, number)) - p.daemon = True - p.start() + t = threading.Thread(target=single_axis_proc, args=(path, records, number)) + t.daemon = True + t.start() elif number < 15: records = get_records(start_time, end_time) - p = multiprocessing.Process(target=scenario_proc, args=(path, records, number, scenario_time)) - p.daemon = True - p.start() + t = threading.Thread(target=scenario_proc, args=(path, records, number, scenario_time)) + t.daemon = True + t.start() def change_curve_state(hr, stat):