diff --git a/aio.py b/aio.py index f459c6a..475a975 100644 --- a/aio.py +++ b/aio.py @@ -1037,7 +1037,7 @@ class SplashScreen(QApplication): if __name__ == '__main__': - if time.time() > 1757486841: + if time.time() > 1767196800: exit(9) app = SplashScreen(sys.argv) diff --git a/assets/files/version/file_version_info.txt b/assets/files/version/file_version_info.txt index ab2bd75..3dd6eaf 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, 4, 0, 8), - prodvers=(0, 4, 0, 8), + filevers=(0, 4, 0, 9), + prodvers=(0, 4, 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.4.0.8 (2025-06-10)'), + StringStruct('FileVersion', '0.4.0.9 (2025-08-01)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2025 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.4.0.8 (2025-06-10)')]) + StringStruct('ProductVersion', '0.4.0.9 (2025-08-01)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/assets/files/version/local_vers b/assets/files/version/local_vers index 756ae22..4cebb8c 100644 --- a/assets/files/version/local_vers +++ b/assets/files/version/local_vers @@ -1 +1 @@ -0.4.0.8@06/10/2025 \ No newline at end of file +0.4.0.9@08/01/2025 \ No newline at end of file diff --git a/assets/files/version/server_vers b/assets/files/version/server_vers index 756ae22..4cebb8c 100644 --- a/assets/files/version/server_vers +++ b/assets/files/version/server_vers @@ -1 +1 @@ -0.4.0.8@06/10/2025 \ No newline at end of file +0.4.0.9@08/01/2025 \ No newline at end of file diff --git a/codes/analysis/current.py b/codes/analysis/current.py index dc78b8a..8935e2a 100644 --- a/codes/analysis/current.py +++ b/codes/analysis/current.py @@ -1,4 +1,5 @@ import json +import os import openpyxl import pandas import re @@ -189,7 +190,7 @@ class CurrentDataProcess(QThread): continue else: # one more time,如果连续两次 200 个点的平均值都小于 threshold,说明已经到了临界点了(其实也不一定,只不过相对遇到一次就判定临界点更安全一点点) - # 从实际数据看,这开逻辑很小概率能触发到 + # 从实际数据看,这个逻辑很小概率能触发到 speed_avg = df.iloc[row_s-end_point*skip_scale:row_e-end_point*skip_scale].abs().mean() if speed_avg > threshold: clibs.logger("WARNING", "current", f"【gt】{axis} 轴第 {seq} 次查找数据可能有异常,row_s = {row_s}, row_e = {row_e}!", "purple") @@ -422,7 +423,12 @@ class CurrentDataProcess(QThread): r_max_t = configs["TRANSMISSION"]["MAX_PEAK_TORQUE"] # 减速器瞬时最大转矩 r_avg_t = configs["TRANSMISSION"]["MAX_AVERAGE_TORQUE"] # 减速器平均负载转矩允许最大值 - clibs.logger("INFO", "current", f"get_configs: 机型文件版本 {config_file}_{version}") + m_params = [r_rrs, m_avs, m_stall_ts, m_rts, m_max_ts, m_r_rpms, m_max_rpms, r_max_sst, r_max_t, r_avg_t] + for _ in m_params: + if len(_) < 6: + for idx in range(6-len(_)): + _.append(1000) + clibs.logger("INFO", "current", f"get_configs: 机型文件版本 {os.path.basename(config_file.removesuffix('.cfg'))}_{version}") clibs.logger("INFO", "current", f"get_configs: 减速比 {r_rrs}") clibs.logger("INFO", "current", f"get_configs: 额定转矩 {m_rts}") clibs.logger("INFO", "current", f"get_configs: 最大角速度 {m_avs}")