diff --git a/assets/files/version/file_version_info.txt b/assets/files/version/file_version_info.txt index aa27a6e..3ab7ea5 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, 6), - prodvers=(0, 3, 1, 6), + filevers=(0, 3, 1, 7), + prodvers=(0, 3, 1, 7), # 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.6 (2025-03-21)'), + StringStruct('FileVersion', '0.3.1.7 (2025-03-24)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2025 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.3.1.6 (2025-03-21)')]) + StringStruct('ProductVersion', '0.3.1.7 (2025-03-24)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/assets/files/version/version b/assets/files/version/version index 245a459..bd78cb6 100644 --- a/assets/files/version/version +++ b/assets/files/version/version @@ -1 +1 @@ -0.3.1.6@03/21/2025 \ No newline at end of file +0.3.1.7@03/24/2025 \ No newline at end of file diff --git a/code/aio.py b/code/aio.py index 15603d8..85dd69e 100644 --- a/code/aio.py +++ b/code/aio.py @@ -639,10 +639,10 @@ class App: @staticmethod def __goto_update(event): - webbrowser.open("https://10.2.20.216:10008/aio.zip") + webbrowser.open("当前是最新版本,继续保持!") def __auth_and_vercheck(self): - url_vers = "http://10.2.20.216:10008/version" + url_vers = "http://10.2.21.27:10008/version" try: self.server_vers = request.urlopen(url_vers, timeout=2).read().decode("utf-8").strip() except Exception: diff --git a/code/automatic_test/do_brake.py b/code/automatic_test/do_brake.py index a89bb93..20efdee 100644 --- a/code/automatic_test/do_brake.py +++ b/code/automatic_test/do_brake.py @@ -153,7 +153,7 @@ def run_rl(path, sub, hr, md, config_file, prj_file, result_dirs, avs, w2t): get_init_speed = float(ws.cell(row=3, column=2).value) single_brake = str(ws.cell(row=4, column=2).value) pon = ws.cell(row=5, column=2).value - io_name = ws.cell(row=6, column=2).value.upper() + io_name = ws.cell(row=6, column=2).value.upper().strip() wb.close() w2t(f"基本参数配置:write_diagnosis(废弃) = {write_diagnosis}, get_init_speed = {get_init_speed}, single_brake = {single_brake}, pon = {pon}\n") diff --git a/code/durable_docs/factory_test.py b/code/durable_docs/factory_test.py index 4d7ba17..0d26e86 100644 --- a/code/durable_docs/factory_test.py +++ b/code/durable_docs/factory_test.py @@ -2,6 +2,7 @@ import json import threading import time import pandas +import numpy import math import csv from common import clibs @@ -201,7 +202,7 @@ def proc_device_servo_trq_feedback(records, params, w2t): for axis in range(6): df = pandas.DataFrame.from_dict({"device_servo_trq_feedback": d_trq[axis]}) - _ = math.sqrt((df[df.columns[0]] * rcs[axis] / 1000).pow(2).sum() / len(df)) + _ = math.sqrt(numpy.square(df[df.columns[0]].values * 1.27 / 1000).sum() / len(df)) results.append(_) path = "/".join(params["prj_file"].split("/")[:-1])