优化电机电流自动化采集

This commit is contained in:
gitea 2025-02-13 14:45:18 +08:00
parent ab00c564bd
commit 9766c2f620
4 changed files with 14 additions and 12 deletions

View File

@ -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])])
]

View File

@ -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实例

View File

@ -1 +1 @@
0.3.1.3@02/12/2025
0.3.1.4@02/13/2025

View File

@ -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):