final commit

This commit is contained in:
gitea 2025-03-27 19:17:46 +08:00
parent 62200a9fe4
commit 14c08cca31
5 changed files with 10 additions and 9 deletions

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, 3, 1, 6), filevers=(0, 3, 1, 7),
prodvers=(0, 3, 1, 6), prodvers=(0, 3, 1, 7),
# 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.3.1.6 (2025-03-21)'), StringStruct('FileVersion', '0.3.1.7 (2025-03-24)'),
StringStruct('InternalName', 'AIO.exe'), StringStruct('InternalName', 'AIO.exe'),
StringStruct('LegalCopyright', '© 2024-2025 Manford Fan'), StringStruct('LegalCopyright', '© 2024-2025 Manford Fan'),
StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('OriginalFilename', 'AIO.exe'),
StringStruct('ProductName', 'AIO'), 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])]) VarFileInfo([VarStruct('Translation', [1033, 1200])])
] ]

View File

@ -1 +1 @@
0.3.1.6@03/21/2025 0.3.1.7@03/24/2025

View File

@ -639,10 +639,10 @@ class App:
@staticmethod @staticmethod
def __goto_update(event): def __goto_update(event):
webbrowser.open("https://10.2.20.216:10008/aio.zip") webbrowser.open("当前是最新版本,继续保持!")
def __auth_and_vercheck(self): def __auth_and_vercheck(self):
url_vers = "http://10.2.20.216:10008/version" url_vers = "http://10.2.21.27:10008/version"
try: try:
self.server_vers = request.urlopen(url_vers, timeout=2).read().decode("utf-8").strip() self.server_vers = request.urlopen(url_vers, timeout=2).read().decode("utf-8").strip()
except Exception: except Exception:

View File

@ -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) get_init_speed = float(ws.cell(row=3, column=2).value)
single_brake = str(ws.cell(row=4, column=2).value) single_brake = str(ws.cell(row=4, column=2).value)
pon = ws.cell(row=5, 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() wb.close()
w2t(f"基本参数配置write_diagnosis(废弃) = {write_diagnosis}, get_init_speed = {get_init_speed}, single_brake = {single_brake}, pon = {pon}\n") w2t(f"基本参数配置write_diagnosis(废弃) = {write_diagnosis}, get_init_speed = {get_init_speed}, single_brake = {single_brake}, pon = {pon}\n")

View File

@ -2,6 +2,7 @@ import json
import threading import threading
import time import time
import pandas import pandas
import numpy
import math import math
import csv import csv
from common import clibs from common import clibs
@ -201,7 +202,7 @@ def proc_device_servo_trq_feedback(records, params, w2t):
for axis in range(6): for axis in range(6):
df = pandas.DataFrame.from_dict({"device_servo_trq_feedback": d_trq[axis]}) 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(_) results.append(_)
path = "/".join(params["prj_file"].split("/")[:-1]) path = "/".join(params["prj_file"].split("/")[:-1])