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

v0.1.7.1(2024/06/29)

Browse Source 
1. [APIs: aio.py]
   - 修改detect_network函数中sleep语句放到最后，重新生成HmiRequest实例中增加sleep(4)，这个停顿时间一定是比openapi中heartbeat函数的sleep要长1s以上才能正常工作
   - 修改write2textbox函数，新增默认参数tab_name，只有当该值与当前tab一致时，函数才会有输出
   - 第二条改动影响到了automatic_test文件夹下所有的文件
2. [APIs: openapi.py]
   - 规定了所有的网络异常均由heartbeat函数来定义，其他异常不做中断处理
   - execution函数中合并了case条件
   - 增加了N多指令，多为诊断曲线和rl程序相关
3. [APIs: do_brake.py]
   - 实现自动推送工程到xCore并自动运行
   - 初步实现了Modbus发送消息和检测状态
4. [APIs: do_current.py]
   - 将do_brake.py的内容完全拷贝到此文件，待修改
This commit is contained in:
gitea
2024-06-29 20:40:17 +08:00
parent 802ccd8e97
commit 611d848b41
13 changed files with 398 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
aio/code/automatic_test/openapi.py
View File

@ -1,13 +1,13 @@
import json
import socket
import threading
from json import load, dumps
from socket import socket, setdefaulttimeout, AF_INET, SOCK_STREAM
from threading import Thread
import selectors
import time
import os
from time import time, sleep
from os.path import dirname
MAX_FRAME_SIZE = 1024
socket.setdefaulttimeout(2)
current_path = os.path.dirname(__file__)
setdefaulttimeout(2)
current_path = dirname(__file__)
class HmiRequest(object):
@ -24,15 +24,16 @@ class HmiRequest(object):
self.flag_xs = 0
self.response_xs = ''
self.t_bool = True
self.tab_name = 'Automatic Test'
self.sock_conn()
self.t_heartbeat = threading.Thread(target=self.heartbeat)
self.t_heartbeat = Thread(target=self.heartbeat)
self.t_heartbeat.daemon = True
self.t_heartbeat.start()
self.t_unpackage = threading.Thread(target=self.unpackage, args=(self.c, ))
self.t_unpackage = Thread(target=self.unpackage, args=(self.c, ))
self.t_unpackage.daemon = True
self.t_unpackage.start()
self.t_unpackage_xs = threading.Thread(target=self.unpackage_xs, args=(self.c_xs, ))
self.t_unpackage_xs = Thread(target=self.unpackage_xs, args=(self.c_xs, ))
self.t_unpackage_xs.daemon = True
self.t_unpackage_xs.start()
@ -42,21 +43,21 @@ class HmiRequest(object):
c_state = f_hb.read().strip()
if c_state == '0':
try:
self.c = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.c = socket(AF_INET, SOCK_STREAM)
self.c.connect(('192.168.0.160', 5050))
# self.c.connect(('192.168.84.129', 5050))
self.c.setblocking(False)
self.c_xs = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.c_xs = socket(AF_INET, SOCK_STREAM)
self.c_xs.connect(('192.168.0.160', 6666))
# self.c_xs.connect(('192.168.84.129', 6666))
self.c_xs.setblocking(False)
self.w2t("Connection success", 0, 0, 'green')
self.w2t("Connection success", 0, 0, 'green', tab_name=self.tab_name)
with open(f"{current_path}/../../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb:
f_hb.write('1')
except Exception as Err:
self.w2t("Connection failed...", 0, 0, 'red')
self.w2t("Connection failed...", 0, 0, 'red', tab_name=self.tab_name)
with open(f"{current_path}/../../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb:
f_hb.write('0')
@ -81,20 +82,24 @@ class HmiRequest(object):
while self.t_bool:
_id = self.excution('controller.heart')
_flag = '0' if self.get_from_id(_id) is None else '1'
print(f"hb = {_flag}", end=' ')
with open(f"{current_path}/../../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb:
f_hb.write(_flag)
time.sleep(3)
# with open('log.txt', 'w') as f:
if _flag == '0':
self.w2t(f"心跳丢失，连接失败，重新连接中...", 0, 0, 'red', tab_name=self.tab_name)
sleep(2)
print(len(self.c_msg), end=' ')
# with open(f"{current_path}/../../assets/templates/c_msg.log", "w", encoding='utf-8') as f:
# for msg in self.c_msg:
# f.write(msg + '\n')
def msg_storage(self, response, flag=0):
messages = self.c_msg if flag == 0 else self.c_msg_xs
if len(messages) < 1000:
if len(messages) < 20000:
messages.insert(0, response)
else:
messages.insert(0, response)
while len(messages) > 1000:
while len(messages) > 20000:
messages.pop()
def get_response(self, data):
@ -187,10 +192,10 @@ class HmiRequest(object):
for i in range(3):
for msg in messages:
if msg_id is None:
self.w2t("未能成功获取到 message id...", 0, 10, 'red')
self.w2t("未能成功获取到 message id...", 0, 10, 'red', tab_name=self.tab_name)
if msg_id in msg:
return msg
time.sleep(1)
sleep(1)
else:
return None
@ -202,7 +207,7 @@ class HmiRequest(object):
return _frame_head + _pkg_head + _protocol + _reserved + cmd.encode()
def package_xs(self, cmd):
return f"{json.dumps(cmd, separators=(',', ':'))}\r".encode()
return f"{dumps(cmd, separators=(',', ':'))}\r".encode()
def unpackage(self, sock):
def to_read(conn):
@ -245,7 +250,7 @@ class HmiRequest(object):
callback(key.fileobj)
def gen_id(self, command):
_now = time.time()
_now = time()
_id = f"{command}-{_now}"
return _id
@ -254,7 +259,7 @@ class HmiRequest(object):
req = None
try:
with open(f'{current_path}/../../assets/templates/{command}.json', encoding='utf-8', mode='r') as f_json:
req = json.load(f_json)
req = load(f_json)
except:
print(f"暂不支持 {command} 功能，或确认该功能存在...")
return 'NOT SUPPORT'
@ -267,15 +272,24 @@ class HmiRequest(object):
case 'overview.reload':
req['data']['prj_path'] = kwargs['prj_path']
req['data']['tasks'] = kwargs['tasks']
case 'rl_task.pp_to_main' | 'rl_task.run' | 'rl_task.stop':
req['data']['tasks'] = kwargs['tasks']
case 'diagnosis.set_params':
req['data']['display_pdo_params'] = kwargs['display_pdo_params']
case 'diagnosis.open':
req['data']['open'] = kwargs['open']
req['data']['display_open'] = kwargs['display_open']
case _:
pass
req['id'] = self.gen_id(command)
print(f"req = {req}")
cmd = json.dumps(req, separators=(',', ':'))
cmd = dumps(req, separators=(',', ':'))
try:
self.c.send(self.package(cmd))
time.sleep(2)
sleep(2)
except Exception as Err:
self.w2t(f"{cmd}\n请求发送失败...\n{Err}", 0, 11)
self.w2t(f"{cmd}\n请求发送失败...{Err}", 0, 0, 'red', tab_name=self.tab_name)
return req['id']