gitea
802ccd8e97
1. [APIs: aio.py]
- 对于automatic test删除了输入框，使用configs.xlsx配置文件作为参数输入
- 完善initialization/param_check/func_start_callback函数中对于automatic test的处理
- 将textbox组件一直设置为normal状态，不再频繁切换disabled
- 将所有的f_h文件对象修改为f_hb，并将connection_state修改为c_state
- 在detect_network函数中，实例化HmiRequest，并在无限循环中检测心跳是否正常，如异常，则销毁hr，重新生成
- 取消在tabview切换时，检测心跳的逻辑，这样做无法保证实时性
2. [APIs: openapi.py]
- 将sock_conn函数移出__init__，单独作为连接函数存在
- 新增全局变量self.t_bool，控制所有的线程中无限循环的启停，也就是可以人为的退出线程
- 移除close_sock函数
- heartbeat函数中新增打印所有消息的代码，调试时打开，平常关闭
- execution函数中，新增对overview.set_autoload和overview.reload的支持
- execution函数中，对send动作增加异常处理逻辑
3. [APIs: do_brake.py]
- 新增文件，处理制动测试流程，建立连接，导入project，pp2main，run，采集并处理曲线数据，本地修改RL程序，推送至控制器等
- 目前完成：
- 文件合规性检查
- 导入工程并设置为运行工程
4. [APIs: current.py] 修改scenario/single电机电流最大长度为150s
5. 在本文件中更新关于制动自动化测试的相关内容
284 lines
11 KiB
Python
284 lines
11 KiB
Python
import json
|
||
import socket
|
||
import threading
|
||
import selectors
|
||
import time
|
||
import os
|
||
|
||
MAX_FRAME_SIZE = 1024
|
||
socket.setdefaulttimeout(2)
|
||
current_path = os.path.dirname(__file__)
|
||
|
||
|
||
class HmiRequest(object):
|
||
def __init__(self, w2t):
|
||
super().__init__()
|
||
self.w2t = w2t
|
||
self.c = None
|
||
self.c_xs = None
|
||
self.c_msg = []
|
||
self.c_msg_xs = []
|
||
self.flag = 0
|
||
self.response = ''
|
||
self.leftover = 0
|
||
self.flag_xs = 0
|
||
self.response_xs = ''
|
||
self.t_bool = True
|
||
|
||
self.sock_conn()
|
||
self.t_heartbeat = threading.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.daemon = True
|
||
self.t_unpackage.start()
|
||
self.t_unpackage_xs = threading.Thread(target=self.unpackage_xs, args=(self.c_xs, ))
|
||
self.t_unpackage_xs.daemon = True
|
||
self.t_unpackage_xs.start()
|
||
|
||
def sock_conn(self):
|
||
# while True:
|
||
with open(f"{current_path}/../../assets/templates/heartbeat", "r", encoding='utf-8') as f_hb:
|
||
c_state = f_hb.read().strip()
|
||
if c_state == '0':
|
||
try:
|
||
self.c = socket.socket(socket.AF_INET, socket.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.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')
|
||
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')
|
||
with open(f"{current_path}/../../assets/templates/heartbeat", "w", encoding='utf-8') as f_hb:
|
||
f_hb.write('0')
|
||
|
||
def header_check(self, index, data):
|
||
try:
|
||
_frame_size = int.from_bytes(data[index:index+2], byteorder='big')
|
||
_pkg_size = int.from_bytes(data[index+2:index+6], byteorder='big')
|
||
_protocol = int.from_bytes(data[index+6:index+7], byteorder='big')
|
||
_reserved = int.from_bytes(data[index+7:index+8], byteorder='big')
|
||
|
||
if _reserved == 0 and _protocol == 2:
|
||
return index+8, _frame_size, _pkg_size
|
||
else:
|
||
print("数据有误，需要确认")
|
||
return 'DATA ERR'
|
||
except Exception as Err:
|
||
print(f"Err = {Err}")
|
||
print("无法读取数据，需要确认")
|
||
return 'DATA READ ERR'
|
||
|
||
def heartbeat(self):
|
||
while self.t_bool:
|
||
_id = self.excution('controller.heart')
|
||
_flag = '0' if self.get_from_id(_id) is None else '1'
|
||
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:
|
||
# 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:
|
||
messages.insert(0, response)
|
||
else:
|
||
messages.insert(0, response)
|
||
while len(messages) > 1000:
|
||
messages.pop()
|
||
|
||
def get_response(self, data):
|
||
_index = 0
|
||
while _index < len(data):
|
||
if self.flag == 0:
|
||
_index, _frame_size, _pkg_size = self.header_check(_index, data)
|
||
if _pkg_size <= len(data) - _index:
|
||
# 说明剩余部分的数据正好就是完整的包数据
|
||
self.response = data[_index:_index+_pkg_size].decode()
|
||
self.msg_storage(flag=0, response=self.response)
|
||
_index += _pkg_size
|
||
self.flag = 0
|
||
self.response = ''
|
||
self.leftover = 0
|
||
elif _pkg_size > len(data) - _index:
|
||
# 说有有分包的情况发生了，需要flag=1的处理
|
||
self.flag = 1
|
||
self.response = data[_index:].decode()
|
||
self.leftover = _frame_size - 6 - (len(data) - _index) # 其实就是常量 2，其中 6 就是六个字节的包头
|
||
break
|
||
|
||
elif self.flag == 1:
|
||
# 处理完之后，将flag重置为0
|
||
_index = self.leftover
|
||
self.response += data[:_index].decode()
|
||
_index += 2
|
||
|
||
_frame_size = int.from_bytes(data[_index - 2:_index], byteorder='big')
|
||
if _frame_size == 0:
|
||
self.msg_storage(flag=0, response=self.response)
|
||
self.flag = 0
|
||
self.response = ''
|
||
self.leftover = 0
|
||
break
|
||
|
||
if _frame_size == MAX_FRAME_SIZE:
|
||
self.leftover = MAX_FRAME_SIZE - (len(data) - _index)
|
||
self.response += data[_index:].decode()
|
||
break
|
||
else:
|
||
if _index+_frame_size <= MAX_FRAME_SIZE:
|
||
self.response += data[_index:_index+_frame_size].decode()
|
||
self.msg_storage(flag=0, response=self.response)
|
||
self.flag = 0
|
||
self.response = ''
|
||
self.leftover = 0
|
||
break
|
||
else:
|
||
self.response += data[_index:].decode()
|
||
self.leftover = _index + _frame_size - MAX_FRAME_SIZE
|
||
break
|
||
|
||
def get_response_xs(self, data):
|
||
if self.flag_xs == 0:
|
||
if data[-1].decode() == '\r':
|
||
_responses = data.decode().split('\r')
|
||
for _response in _responses:
|
||
self.msg_storage(flag=1, response=_response)
|
||
|
||
else:
|
||
_responses = data.decode().split('\r')
|
||
for _response in _responses[:-1]:
|
||
if not _response:
|
||
break
|
||
self.msg_storage(flag=1, response=_response)
|
||
|
||
self.response_xs = _responses[-1]
|
||
self.flag_xs = 1
|
||
else:
|
||
if data[-1].decode() == '\r':
|
||
_responses = (self.response_xs.encode() + data).decode().split('\r')
|
||
for _response in _responses:
|
||
self.msg_storage(flag=1, response=_response)
|
||
|
||
self.response_xs = ''
|
||
self.flag_xs = 0
|
||
else:
|
||
_responses = (self.response_xs.encode() + data).decode().split('\r')
|
||
for _response in _responses[:-1]:
|
||
if not _response:
|
||
break
|
||
self.msg_storage(flag=1, response=_response)
|
||
|
||
self.response_xs = _responses[-1]
|
||
self.flag_xs = 1
|
||
|
||
def get_from_id(self, msg_id, flag=0):
|
||
messages = self.c_msg if flag == 0 else self.c_msg_xs
|
||
for i in range(3):
|
||
for msg in messages:
|
||
if msg_id is None:
|
||
self.w2t("未能成功获取到 message id...", 0, 10, 'red')
|
||
if msg_id in msg:
|
||
return msg
|
||
time.sleep(1)
|
||
else:
|
||
return None
|
||
|
||
def package(self, cmd):
|
||
_frame_head = (len(cmd)+6).to_bytes(length=2, byteorder='big')
|
||
_pkg_head = len(cmd).to_bytes(length=4, byteorder='big')
|
||
_protocol = int(2).to_bytes(length=1, byteorder='big')
|
||
_reserved = int(0).to_bytes(length=1, byteorder='big')
|
||
return _frame_head + _pkg_head + _protocol + _reserved + cmd.encode()
|
||
|
||
def package_xs(self, cmd):
|
||
return f"{json.dumps(cmd, separators=(',', ':'))}\r".encode()
|
||
|
||
def unpackage(self, sock):
|
||
def to_read(conn):
|
||
data = conn.recv(MAX_FRAME_SIZE)
|
||
if data:
|
||
# print(data)
|
||
self.get_response(data)
|
||
else:
|
||
print('closing', sock)
|
||
sel.unregister(conn)
|
||
conn.close()
|
||
|
||
sel = selectors.DefaultSelector()
|
||
sel.register(sock, selectors.EVENT_READ, to_read)
|
||
|
||
while self.t_bool:
|
||
events = sel.select()
|
||
for key, mask in events:
|
||
callback = key.data
|
||
callback(key.fileobj)
|
||
|
||
def unpackage_xs(self, sock):
|
||
def to_read(conn):
|
||
data = conn.recv(1024) # Should be ready
|
||
if data:
|
||
# print(data)
|
||
self.get_response_xs(data)
|
||
else:
|
||
print('closing', sock)
|
||
sel.unregister(conn)
|
||
conn.close()
|
||
|
||
sel = selectors.DefaultSelector()
|
||
sel.register(sock, selectors.EVENT_READ, to_read)
|
||
|
||
while self.t_bool:
|
||
events = sel.select()
|
||
for key, mask in events:
|
||
callback = key.data
|
||
callback(key.fileobj)
|
||
|
||
def gen_id(self, command):
|
||
_now = time.time()
|
||
_id = f"{command}-{_now}"
|
||
return _id
|
||
|
||
def excution(self, command, flg=0, **kwargs):
|
||
if flg == 0: # for old protocols
|
||
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)
|
||
except:
|
||
print(f"暂不支持 {command} 功能，或确认该功能存在...")
|
||
return 'NOT SUPPORT'
|
||
|
||
match command:
|
||
case 'state.set_tp_mode':
|
||
req['data']['tp_mode'] = kwargs['tp_mode']
|
||
case 'overview.set_autoload':
|
||
req['data']['autoload_prj_path'] = kwargs['autoload_prj_path']
|
||
case 'overview.reload':
|
||
req['data']['prj_path'] = kwargs['prj_path']
|
||
req['data']['tasks'] = kwargs['tasks']
|
||
|
||
req['id'] = self.gen_id(command)
|
||
print(f"req = {req}")
|
||
cmd = json.dumps(req, separators=(',', ':'))
|
||
try:
|
||
self.c.send(self.package(cmd))
|
||
time.sleep(2)
|
||
except Exception as Err:
|
||
self.w2t(f"{cmd}\n请求发送失败...\n{Err}", 0, 11)
|
||
|
||
return req['id']
|
||
|
||
else: # for xService
|
||
pass
|