gitea/aio_first_edtion
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[current: current.py]: 在find_point函数种，当无法找到正确点位时，继续执行，而不是直接终止执行

Browse Source
This commit is contained in:
gitea 2024-07-13 13:32:57 +08:00
parent fe27dbf91f
commit addb123a8a
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aio/README.md
View File

@ -462,3 +462,6 @@ v0.1.9.1(2024/07/12)
3. [APIs: openapi.py] 3. [APIs: openapi.py]
- modbus类新增指示政府方向急停的信号pon，将modbus类入参中的tab_name删除，并修改tab_name的值为'openapi' - modbus类新增指示政府方向急停的信号pon，将modbus类入参中的tab_name删除，并修改tab_name的值为'openapi'
- socket类种修改tab_name的值为'openapi' - socket类种修改tab_name的值为'openapi'
v0.1.9.2(2024/07/13)
1. [current: current.py]: 在find_point函数种，当无法找到正确点位时，继续执行，而不是直接终止执行

8
aio/assets/file_version_info.txt
View File

@ -6,8 +6,8 @@ VSVersionInfo(
ffi=FixedFileInfo( ffi=FixedFileInfo(
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
# Set not needed items to zero 0. # Set not needed items to zero 0.
filevers=(0, 1, 9, 1), filevers=(0, 1, 9, 2),
prodvers=(0, 1, 9, 1), prodvers=(0, 1, 9, 2),
# Contains a bitmask that specifies the valid bits 'flags'r # Contains a bitmask that specifies the valid bits 'flags'r
mask=0x3f, mask=0x3f,
# Contains a bitmask that specifies the Boolean attributes of the file. # Contains a bitmask that specifies the Boolean attributes of the file.
@ -31,12 +31,12 @@ VSVersionInfo(
'040904b0', '040904b0',
[StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'), [StringStruct('CompanyName', 'Rokae - https://www.rokae.com/'),
StringStruct('FileDescription', 'All in one automatic toolbox'), 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('InternalName', 'AIO.exe'),
StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'),
StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('OriginalFilename', 'AIO.exe'),
StringStruct('ProductName', 'AIO'), 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])]) VarFileInfo([VarStruct('Translation', [1033, 1200])])
] ]

2
aio/assets/vers
View File

@ -1 +1 @@
0.1.9.1 @ 07/12/2024 0.1.9.2 @ 07/13/2024

6
aio/code/data_process/current.py
View File

@ -223,7 +223,8 @@ def find_point(data_file, pos, flag, df, _row_s, _row_e, w2t, exitcode, threshol
else: else:
return _row_s, _row_e return _row_s, _row_e
else: 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': elif flag == 'gt':
while _row_e > end_point: while _row_e > end_point:
speed_avg = df.iloc[_row_s:_row_e, 0].abs().mean() 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: else:
return _row_s, _row_e return _row_s, _row_e
else: 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): def p_single(wb, single, vel, trq, rpms, w2t):