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

v0.1.8.2(2024/07/08)

Browse Source 
1. [APIs: do_brake.py]: 完成了制动性能测试逻辑，只不过制动信号传递生效延迟不可控，暂时pending
2. [APIs: do_current.py]: 修改曲线数据时序，主要是value data取反即可，解决了波形锯齿明细的问题
3. [APIs: openapi.py]: modbus新增了触发急停信号的寄存器 stop0_signal，并重写了解除急停，socket新增了register.set_value协议
This commit is contained in:
gitea
2024-07-08 19:50:21 +08:00
parent 7b25b91c37
commit 2fbe500d1d
5 changed files with 189 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,11 +47,12 @@ class ModbusRequest(object):
def reset_estop(self):
try:
self.c.write_register(40012, 1)
# self.c.write_register(40001, 1)
# sleep(0.2)
# self.c.write_register(40001, 1)
# sleep(0.2)
# self.c.write_register(40001, 0)
sleep(0.2)
self.c.write_register(40001, 0)
sleep(0.2)
self.c.write_register(40001, 1)
sleep(0.2)
self.c.write_register(40001, 0)
except Exception as Err:
self.w2t(f"{Err}")
self.w2t("无法重置软急停，连接Modbus失败，需要确认网络是否通畅，或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name)
@ -124,6 +125,13 @@ class ModbusRequest(object):
self.w2t(f"{Err}")
self.w2t("无法读取准备信号，连接Modbus失败，需要确认网络是否通畅，或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name)
def set_stop0(self, number):
try:
self.c.write_register(41004, number)
except Exception as Err:
self.w2t(f"{Err}")
self.w2t("无法通过IO操作stop0急停，连接Modbus失败，需要确认网络是否通畅，或是未正确导入寄存器文件...", 0, 100, 'red', self.tab_name)
class HmiRequest(object):
def __init__(self, w2t):
@ -180,6 +188,7 @@ class HmiRequest(object):
md.reset_estop()
md.clear_alarm()
md.write_act(False)
md.set_stop0(1)
except Exception as Err:
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:
@ -559,6 +568,11 @@ class HmiRequest(object):
case 'diagnosis.open':
req['data']['open'] = kwargs['open']
req['data']['display_open'] = kwargs['display_open']
case 'register.set_value':
req['data']['name'] = kwargs['name']
req['data']['type'] = kwargs['type']
req['data']['bias'] = kwargs['bias']
req['data']['value'] = kwargs['value']
case _:
pass