From 3010cb893141a1053659d1fc8b862d1a98401bc9 Mon Sep 17 00:00:00 2001 From: gitea Date: Wed, 17 Jul 2024 14:17:00 +0800 Subject: [PATCH] =?UTF-8?q?v0.2.0.0(2024/07/17)=201.=20[profile:=20aio.py]?= =?UTF-8?q?=20=20=20=20-=20=E5=A2=9E=E5=8A=A0velocity=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=BB=E8=BE=91=20=20=20=20-=20=E4=BF=AE=E6=94=B9=E8=B4=9F?= =?UTF-8?q?=E8=BD=BD=E4=BF=A1=E6=81=AF=E4=B8=BA=E6=9B=B2=E7=BA=BF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=202.=20[profile:=20factory=5Ftest.py]=20=20=20=20-=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0velocity=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?= =?UTF-8?q?=203.=20[profile:=20current.py]=20=20=20=20-=20=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E5=87=8F=E9=80=9F=E6=AF=94=E8=8E=B7=E5=8F=96=E7=9A=84?= =?UTF-8?q?=E8=A7=84=E5=88=99=204.=20[profile:=20openapi.py]=20=20=20=20-?= =?UTF-8?q?=20HmiRequest=E6=A8=A1=E5=9D=97=EF=BC=9A=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=B0=E5=BD=95move.monitor=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=20=20=20=20-=20HmiRequest=E6=A8=A1=E5=9D=97=EF=BC=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86durable=5Flock=E5=8F=98=E9=87=8F?= =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E6=96=87=E4=BB=B6=E8=AF=BB=E5=86=99?= =?UTF-8?q?=E4=BA=92=E6=96=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aio/README.md | 12 ++++ aio/assets/file_version_info.txt | 8 +-- .../durable/durable_data_current.xlsx | Bin 6796 -> 5773 bytes .../durable/durable_data_velocity.xlsx | Bin 6796 -> 5777 bytes aio/assets/vers | 2 +- aio/code/aio.py | 59 +++++++++++------- aio/code/data_process/current.py | 4 +- aio/code/durable_action/factory_test.py | 47 +++++++++++--- aio/code/openapi.py | 8 ++- 9 files changed, 100 insertions(+), 40 deletions(-) diff --git a/aio/README.md b/aio/README.md index 294c7a2..1b75caf 100644 --- a/aio/README.md +++ b/aio/README.md @@ -499,3 +499,15 @@ v0.1.9.4(2024/07/15) 4. [profile: openapi.py]：多次合并遗留问题处理 5. templates文件夹组织架构调整 +v0.2.0.0(2024/07/17) +1. [profile: aio.py] + - 增加velocity相关逻辑 + - 修改负载信息为曲线信息 +2. [profile: factory_test.py] + - 增加velocity相关逻辑 +3. [profile: current.py] + - 修正减速比获取的规则 +4. [profile: openapi.py] + - HmiRequest模块：日志取消记录move.monitor相关 + - HmiRequest模块：增加了durable_lock变量，控制文件读写互斥 + diff --git a/aio/assets/file_version_info.txt b/aio/assets/file_version_info.txt index 5f58e11..e1ab27a 100644 --- a/aio/assets/file_version_info.txt +++ b/aio/assets/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, 1, 9, 2), - prodvers=(0, 1, 9, 2), + filevers=(0, 2, 0, 0), + prodvers=(0, 2, 0, 0), # 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.1.9.2 (2024-07-13)'), + StringStruct('FileVersion', '0.2.0.0 (2024-07-17)'), StringStruct('InternalName', 'AIO.exe'), StringStruct('LegalCopyright', '© 2024-2024 Manford Fan'), StringStruct('OriginalFilename', 'AIO.exe'), StringStruct('ProductName', 'AIO'), - StringStruct('ProductVersion', '0.1.9.2 (2024-07-13)')]) + StringStruct('ProductVersion', '0.2.0.0 (2024-07-17)')]) ]), VarFileInfo([VarStruct('Translation', [1033, 1200])]) ] diff --git a/aio/assets/templates/durable/durable_data_current.xlsx b/aio/assets/templates/durable/durable_data_current.xlsx index f438a2ad364c7fd7e5be6d73da826901e3ad0a49..1d18002d239aa2d0537ea2ee66251bde7f961ed7 100644 GIT binary patch delta 1876 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 N!*tQA$CLtqzX02;J+J@( delta 2839 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 scenario_time + 1: _df = pd.DataFrame(_d2d_trq) for i in range(6): _ = sqrt(_df[f'device_servo_trq_feedback_{i}'].apply(lambda x: (rcs[i]*x/1000)**2).sum()/len(_df[f'device_servo_trq_feedback_{i}'])) - del data[f"axis{i + 1}"][0] - data[f"axis{i + 1}"].append(_) + del data[0][f"axis{i + 1}"][0] + data[0][f"axis{i + 1}"].append(_) + _df = pd.DataFrame(data[0]) + while True: + if not hr.durable_lock: + hr.durable_lock = 1 + _df.to_excel(durable_data_current_xlsx, index=False) + hr.durable_lock = 0 + break + else: + sleep(1) + + _df = pd.DataFrame(_d2d_vel) + for i in range(6): + _ = sqrt(_df[f'hw_joint_vel_feedback_{i}'].apply(lambda x: (rcs[i]*x/1000)**2).sum()/len(_df[f'hw_joint_vel_feedback_{i}'])) + del data[1][f"axis{i + 1}"][0] + data[1][f"axis{i + 1}"].append(_) + _df = pd.DataFrame(data[1]) + while True: + if not hr.durable_lock: + hr.durable_lock = 1 + _df.to_excel(durable_data_velocity_xlsx, index=False) + hr.durable_lock = 0 + break + else: + sleep(1) break else: with open(f'{path}\\device_servo_trq_feedback_0.txt', 'w', encoding='utf-8') as f_obj: @@ -238,8 +267,6 @@ def get_durable_data(path, config_file, data, scenario_time, hr, w2t): f_obj.write(f"{_}\n") w2t("采集的数据时间长度不够，需要确认。", 0, 2, 'red', tab_name) - return data - def main(path, hr, md, w2t): data_dirs, data_files = traversal_files(path, w2t) diff --git a/aio/code/openapi.py b/aio/code/openapi.py index 4ca716b..9da630e 100644 --- a/aio/code/openapi.py +++ b/aio/code/openapi.py @@ -1,4 +1,4 @@ -from json import load, dumps +from json import load, dumps, loads from socket import socket, setdefaulttimeout, AF_INET, SOCK_STREAM from threading import Thread import selectors @@ -171,6 +171,7 @@ class HmiRequest(object): self.half_length = 0 self.index = 0 self.reset_index = 0 + self.durable_lock = 0 self.sock_conn() self.t_heartbeat = Thread(target=self.heartbeat) @@ -257,8 +258,11 @@ class HmiRequest(object): # f.write(str(loads(msg)) + '\n') def msg_storage(self, response, flag=0): + # response是解码后的字符串 messages = self.c_msg if flag == 0 else self.c_msg_xs - if len(messages) < 20000: + if 'move.monitor' in response: + pass + elif len(messages) < 20000: messages.insert(0, response) else: messages.insert(0, response)